From 1df6daf0839c264aedb38b89bdf1ccc3666da5e9 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Thu, 22 Sep 2016 20:43:53 +0200 Subject: [PATCH] Rename /lib/gluon/respondd/ to /lib/respondd/ respondd is supposed to be non-Gluon-specific, thus having its data direectory in /lib/gluon/ doesn't make sense. --- package/gluon-autoupdater/Makefile | 4 ++-- package/gluon-mesh-batman-adv-core/Makefile | 4 ++-- package/gluon-mesh-vpn-fastd/Makefile | 4 ++-- package/gluon-node-info/Makefile | 4 ++-- package/gluon-respondd/Makefile | 4 ++-- .../files/lib/{gluon => }/respondd/neighbours.cache | 0 .../files/lib/{gluon => }/respondd/nodeinfo.cache | 0 .../files/lib/{gluon => }/respondd/statistics.cache | 0 package/gluon-respondd/luasrc/lib/gluon/upgrade/400-respondd | 1 - package/gluon-status-page-api/Makefile | 4 ++-- 10 files changed, 12 insertions(+), 13 deletions(-) rename package/gluon-respondd/files/lib/{gluon => }/respondd/neighbours.cache (100%) rename package/gluon-respondd/files/lib/{gluon => }/respondd/nodeinfo.cache (100%) rename package/gluon-respondd/files/lib/{gluon => }/respondd/statistics.cache (100%) diff --git a/package/gluon-autoupdater/Makefile b/package/gluon-autoupdater/Makefile index baae06ba..c73d2bfa 100644 --- a/package/gluon-autoupdater/Makefile +++ b/package/gluon-autoupdater/Makefile @@ -31,8 +31,8 @@ define Package/gluon-autoupdater/install $(CP) ./files/* $(1)/ $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/ - $(INSTALL_DIR) $(1)/lib/gluon/respondd - $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/autoupdater.so + $(INSTALL_DIR) $(1)/lib/respondd + $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/respondd/autoupdater.so if [ '$(GLUON_BRANCH)' ]; then \ $(INSTALL_DIR) $(1)/lib/gluon/autoupdater; \ diff --git a/package/gluon-mesh-batman-adv-core/Makefile b/package/gluon-mesh-batman-adv-core/Makefile index efcf1698..68e1de4f 100644 --- a/package/gluon-mesh-batman-adv-core/Makefile +++ b/package/gluon-mesh-batman-adv-core/Makefile @@ -29,8 +29,8 @@ endef define Package/gluon-mesh-batman-adv-core/install $(CP) ./files/* $(1)/ $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/ - $(INSTALL_DIR) $(1)/lib/gluon/respondd - $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/mesh-batman-adv-core.so + $(INSTALL_DIR) $(1)/lib/respondd + $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/respondd/mesh-batman-adv-core.so endef define Package/gluon-mesh-batman-adv-core/postinst diff --git a/package/gluon-mesh-vpn-fastd/Makefile b/package/gluon-mesh-vpn-fastd/Makefile index 4d75116e..ec73a19e 100644 --- a/package/gluon-mesh-vpn-fastd/Makefile +++ b/package/gluon-mesh-vpn-fastd/Makefile @@ -29,8 +29,8 @@ endef define Package/gluon-mesh-vpn-fastd/install $(CP) ./files/* $(1)/ $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/ - $(INSTALL_DIR) $(1)/lib/gluon/respondd - $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/mesh-vpn-fastd.so + $(INSTALL_DIR) $(1)/lib/respondd + $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/respondd/mesh-vpn-fastd.so endef define Package/gluon-mesh-vpn-fastd/postinst diff --git a/package/gluon-node-info/Makefile b/package/gluon-node-info/Makefile index 8dd31553..89f809a5 100644 --- a/package/gluon-node-info/Makefile +++ b/package/gluon-node-info/Makefile @@ -25,8 +25,8 @@ endef define Package/gluon-node-info/install $(CP) ./files/* $(1)/ - $(INSTALL_DIR) $(1)/lib/gluon/respondd - $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/node-info.so + $(INSTALL_DIR) $(1)/lib/respondd + $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/respondd/node-info.so endef define Package/gluon-node-info/postinst diff --git a/package/gluon-respondd/Makefile b/package/gluon-respondd/Makefile index c6cc71e4..50c334b5 100644 --- a/package/gluon-respondd/Makefile +++ b/package/gluon-respondd/Makefile @@ -28,8 +28,8 @@ endef define Package/gluon-respondd/install $(CP) ./files/* $(1)/ $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/ - $(INSTALL_DIR) $(1)/lib/gluon/respondd - $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/respondd.so + $(INSTALL_DIR) $(1)/lib/respondd + $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/respondd/respondd.so endef $(eval $(call BuildPackage,gluon-respondd)) diff --git a/package/gluon-respondd/files/lib/gluon/respondd/neighbours.cache b/package/gluon-respondd/files/lib/respondd/neighbours.cache similarity index 100% rename from package/gluon-respondd/files/lib/gluon/respondd/neighbours.cache rename to package/gluon-respondd/files/lib/respondd/neighbours.cache diff --git a/package/gluon-respondd/files/lib/gluon/respondd/nodeinfo.cache b/package/gluon-respondd/files/lib/respondd/nodeinfo.cache similarity index 100% rename from package/gluon-respondd/files/lib/gluon/respondd/nodeinfo.cache rename to package/gluon-respondd/files/lib/respondd/nodeinfo.cache diff --git a/package/gluon-respondd/files/lib/gluon/respondd/statistics.cache b/package/gluon-respondd/files/lib/respondd/statistics.cache similarity index 100% rename from package/gluon-respondd/files/lib/gluon/respondd/statistics.cache rename to package/gluon-respondd/files/lib/respondd/statistics.cache diff --git a/package/gluon-respondd/luasrc/lib/gluon/upgrade/400-respondd b/package/gluon-respondd/luasrc/lib/gluon/upgrade/400-respondd index a35977cc..99a3a28d 100755 --- a/package/gluon-respondd/luasrc/lib/gluon/upgrade/400-respondd +++ b/package/gluon-respondd/luasrc/lib/gluon/upgrade/400-respondd @@ -32,6 +32,5 @@ uci:save('firewall') uci:foreach('respondd', 'respondd', function(section) uci:set('respondd', section['.name'], 'iface_list_file', '/var/run/gluon-respondd.devs') - uci:set('respondd', section['.name'], 'data_dir', '/lib/gluon/respondd/') end) uci:save('respondd') diff --git a/package/gluon-status-page-api/Makefile b/package/gluon-status-page-api/Makefile index ddad2cab..738ad045 100644 --- a/package/gluon-status-page-api/Makefile +++ b/package/gluon-status-page-api/Makefile @@ -32,8 +32,8 @@ define Package/gluon-status-page-api/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/neighbours-batadv $(1)/lib/gluon/status-page/providers/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations $(1)/lib/gluon/status-page/providers/ - $(INSTALL_DIR) $(1)/lib/gluon/respondd - $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/status-page-api.so + $(INSTALL_DIR) $(1)/lib/respondd + $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/respondd/status-page-api.so $(CP) ./files/* $(1)/ $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/