diff --git a/lua-json-generator/Makefile b/lua-json-generator/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..4100d57ecd3f7d7a2eb1066841fa86ba00b53803 --- /dev/null +++ b/lua-json-generator/Makefile @@ -0,0 +1,36 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=lua-json-generator +PKG_VERSION:=1 +PKG_RELEASE:=1 + +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) + +include $(INCLUDE_DIR)/package.mk + +define Package/lua-json-generator + SECTION:=libs + CATEGORY:=Freifunk Nordwest + TITLE:=json-generator for lua +endef + +define Package/lua-json-generator/description + This contains a purified version of the json-parser/-generator dkjson as a generating-only lua-library. By removing its json parsing abilities its filesize was reduced massively. +endef + +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) +endef + +define Build/Configure +endef + +define Build/Compile +endef + +define Package/lua-json-generator/install + $(INSTALL_DIR) $(1)/usr/lib/lua/ + $(INSTALL_DATA) files/usr/lib/lua/dkjson.lua $(1)/usr/lib/lua/ +endef + +$(eval $(call BuildPackage,lua-json-generator)) diff --git a/nodewatcher2/files/usr/lib/lua/dkjson.lua b/lua-json-generator/files/usr/lib/lua/dkjson.lua similarity index 100% rename from nodewatcher2/files/usr/lib/lua/dkjson.lua rename to lua-json-generator/files/usr/lib/lua/dkjson.lua diff --git a/nodewatcher2/Makefile b/nodewatcher2/Makefile index e4ebf87d4c779d36d86973c1f56d276a3d4678f0..afc6009357213e6e822d16d0228ce39032fe20fb 100644 --- a/nodewatcher2/Makefile +++ b/nodewatcher2/Makefile @@ -11,11 +11,12 @@ include $(INCLUDE_DIR)/package.mk define Package/ffnw-nodewatcher SECTION:=daemon CATEGORY:=Freifunk Nordwest + DEPENDS:=+lua-json-generator TITLE:=Provides status data for netmon endef define Package/ffnw-nodewatcher2/description - Provides an xml-File containing the most important + Provides various export-formats (json, xml, ...) the most important informations about the router. Nodewatcher2 is meant to be more expandable for other export-formats in the future by internally seperating retrieving and outputting the router-data @@ -31,14 +32,11 @@ endef define Build/Compile endef -define Package/ffnw-nodewatcher/install +define Package/ffnw-nodewatcher2/install $(INSTALL_DIR) $(1)/lib/gluon/cron/ $(INSTALL_DATA) files/lib/gluon/cron/nodewatcher2 $(1)/lib/gluon/cron/nodewatcher2 $(INSTALL_DIR) $(1)/lib/ffnw/nodewatcher2/ $(INSTALL_BIN) files/lib/ffnw/nodewatcher2/nodewatcher.sh $(1)/lib/ffnw/nodewatcher2/ - $(INSTALL_DIR) $(1)/usr/lib/lua/ - $(INSTALL_DATA) files/usr/lib/lua/dkjson.lua $(1)/usr/lib/lua/ - $(INSTALL_DATA) files/etc/config/nodewatcher2 $(1)/etc/config/nodewatcher2 endef $(eval $(call BuildPackage,ffnw-nodewatcher2))