From 431ac81407919f9e2a88ea1328cafaf3cdf30f2e Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Tue, 1 Sep 2015 20:08:13 +0200 Subject: [PATCH] gluon-status-page-api: split API from gluon-status-page This will make it easier to replace the API with C programs. --- package/gluon-status-page-api/Makefile | 31 +++++++++++++++++++ .../announce/nodeinfo.d/software/status-page | 0 .../www/cgi-bin/dyn/neighbours-batadv | 0 .../www/cgi-bin/dyn/neighbours-nodeinfo | 0 .../status-page/www/cgi-bin/dyn/stations | 0 .../status-page/www/cgi-bin/dyn/statistics | 0 .../gluon/status-page/www/cgi-bin/interfaces | 0 .../gluon/status-page/www/cgi-bin/nodeinfo | 0 .../lib/gluon/upgrade/500-status-page-api} | 0 package/gluon-status-page/Makefile | 4 +-- 10 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 package/gluon-status-page-api/Makefile rename package/{gluon-status-page => gluon-status-page-api}/files/lib/gluon/announce/nodeinfo.d/software/status-page (100%) rename package/{gluon-status-page => gluon-status-page-api}/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-batadv (100%) rename package/{gluon-status-page => gluon-status-page-api}/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-nodeinfo (100%) rename package/{gluon-status-page => gluon-status-page-api}/files/lib/gluon/status-page/www/cgi-bin/dyn/stations (100%) rename package/{gluon-status-page => gluon-status-page-api}/files/lib/gluon/status-page/www/cgi-bin/dyn/statistics (100%) rename package/{gluon-status-page => gluon-status-page-api}/files/lib/gluon/status-page/www/cgi-bin/interfaces (100%) rename package/{gluon-status-page => gluon-status-page-api}/files/lib/gluon/status-page/www/cgi-bin/nodeinfo (100%) rename package/{gluon-status-page/files/lib/gluon/upgrade/500-status-page => gluon-status-page-api/files/lib/gluon/upgrade/500-status-page-api} (100%) diff --git a/package/gluon-status-page-api/Makefile b/package/gluon-status-page-api/Makefile new file mode 100644 index 00000000..2b32a2ea --- /dev/null +++ b/package/gluon-status-page-api/Makefile @@ -0,0 +1,31 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=gluon-status-page-api +PKG_VERSION:=1 +PKG_RELEASE:=1 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) + +include $(INCLUDE_DIR)/package.mk + +define Package/gluon-status-page-api + SECTION:=gluon + CATEGORY:=Gluon + TITLE:=API for gluon-status-page + DEPENDS:=+gluon-core +uhttpd +gluon-neighbour-info +gluon-announced +libiwinfo-lua +luci-lib-jsonc +endef + +define Build/Prepare +endef + +define Build/Configure +endef + +define Build/Compile +endef + +define Package/gluon-status-page-api/install + $(CP) ./files/* $(1)/ +endef + +$(eval $(call BuildPackage,gluon-status-page-api)) diff --git a/package/gluon-status-page/files/lib/gluon/announce/nodeinfo.d/software/status-page b/package/gluon-status-page-api/files/lib/gluon/announce/nodeinfo.d/software/status-page similarity index 100% rename from package/gluon-status-page/files/lib/gluon/announce/nodeinfo.d/software/status-page rename to package/gluon-status-page-api/files/lib/gluon/announce/nodeinfo.d/software/status-page diff --git a/package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-batadv b/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-batadv similarity index 100% rename from package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-batadv rename to package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-batadv diff --git a/package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-nodeinfo b/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-nodeinfo similarity index 100% rename from package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-nodeinfo rename to package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-nodeinfo diff --git a/package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/dyn/stations b/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/stations similarity index 100% rename from package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/dyn/stations rename to package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/stations diff --git a/package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/dyn/statistics b/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/statistics similarity index 100% rename from package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/dyn/statistics rename to package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/statistics diff --git a/package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/interfaces b/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/interfaces similarity index 100% rename from package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/interfaces rename to package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/interfaces diff --git a/package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/nodeinfo b/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/nodeinfo similarity index 100% rename from package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/nodeinfo rename to package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/nodeinfo diff --git a/package/gluon-status-page/files/lib/gluon/upgrade/500-status-page b/package/gluon-status-page-api/files/lib/gluon/upgrade/500-status-page-api similarity index 100% rename from package/gluon-status-page/files/lib/gluon/upgrade/500-status-page rename to package/gluon-status-page-api/files/lib/gluon/upgrade/500-status-page-api diff --git a/package/gluon-status-page/Makefile b/package/gluon-status-page/Makefile index 2543ea2a..bfcdd91b 100644 --- a/package/gluon-status-page/Makefile +++ b/package/gluon-status-page/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-status-page -PKG_VERSION:=1 +PKG_VERSION:=2 PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) @@ -12,7 +12,7 @@ define Package/gluon-status-page SECTION:=gluon CATEGORY:=Gluon TITLE:=Adds a status page showing information about the node. - DEPENDS:=+gluon-core +uhttpd +gluon-neighbour-info +gluon-announce +libiwinfo-lua +luci-lib-jsonc + DEPENDS:=+gluon-status-page-api endef define Package/gluon-status-page/description