From def48c84bb57033a0f3cecba6693e99aa0ab573d Mon Sep 17 00:00:00 2001 From: Packet Please Date: Wed, 7 Jun 2023 16:11:13 +0200 Subject: [PATCH] packages: merge defaults packages into falter-common Signed-off-by: Packet Please --- packages/falter-berlin-dhcp-defaults/Makefile | 38 ---------------- .../falter-berlin-freifunk-defaults/Makefile | 36 --------------- .../falter-berlin-network-defaults/Makefile | 44 ------------------- .../falter-berlin-olsrd-defaults/Makefile | 36 --------------- .../Makefile | 37 ---------------- .../falter-berlin-system-defaults/Makefile | 36 --------------- .../falter-berlin-uhttpd-defaults/Makefile | 36 --------------- .../hotplug.d/iface/60-ffuplink_policyrouting | 0 .../files/etc/init.d/ff_dnsmasq_reload | 0 .../etc}/pingcheck/offline.d/60-freifunk-wan | 0 .../etc}/pingcheck/online.d/60-freifunk-wan | 0 .../freifunk-berlin-correct-nsm2-txpower | 0 .../freifunk-berlin-dhcp-defaults | 0 .../freifunk-berlin-ffuplink-defaults | 0 .../freifunk-berlin-freifunk-defaults | 0 .../freifunk-berlin-network-defaults | 0 .../freifunk-berlin-network-ip-route | 0 .../freifunk-berlin-olsrd-defaults | 0 .../freifunk-berlin-pingcheck-defaults | 0 .../freifunk-berlin-statistics-defaults | 0 .../freifunk-berlin-system-defaults | 0 .../freifunk-berlin-uhttpd-defaults | 0 .../freifunk-berlin-wireless-defaults | 0 .../lib/functions/freifunk-berlin-network.sh | 0 24 files changed, 263 deletions(-) delete mode 100644 packages/falter-berlin-dhcp-defaults/Makefile delete mode 100644 packages/falter-berlin-freifunk-defaults/Makefile delete mode 100644 packages/falter-berlin-network-defaults/Makefile delete mode 100644 packages/falter-berlin-olsrd-defaults/Makefile delete mode 100644 packages/falter-berlin-statistics-defaults/Makefile delete mode 100644 packages/falter-berlin-system-defaults/Makefile delete mode 100644 packages/falter-berlin-uhttpd-defaults/Makefile rename packages/{falter-berlin-network-defaults => falter-common/files/etc}/hotplug.d/iface/60-ffuplink_policyrouting (100%) rename packages/{falter-berlin-dhcp-defaults => falter-common}/files/etc/init.d/ff_dnsmasq_reload (100%) rename packages/{falter-berlin-network-defaults => falter-common/files/etc}/pingcheck/offline.d/60-freifunk-wan (100%) rename packages/{falter-berlin-network-defaults => falter-common/files/etc}/pingcheck/online.d/60-freifunk-wan (100%) rename packages/{falter-berlin-network-defaults => falter-common/files/etc}/uci-defaults/freifunk-berlin-correct-nsm2-txpower (100%) rename packages/{falter-berlin-dhcp-defaults => falter-common/files/etc}/uci-defaults/freifunk-berlin-dhcp-defaults (100%) rename packages/{falter-berlin-network-defaults => falter-common/files/etc}/uci-defaults/freifunk-berlin-ffuplink-defaults (100%) rename packages/{falter-berlin-freifunk-defaults => falter-common/files/etc}/uci-defaults/freifunk-berlin-freifunk-defaults (100%) rename packages/{falter-berlin-network-defaults => falter-common/files/etc}/uci-defaults/freifunk-berlin-network-defaults (100%) rename packages/{falter-berlin-network-defaults => falter-common/files/etc}/uci-defaults/freifunk-berlin-network-ip-route (100%) rename packages/{falter-berlin-olsrd-defaults => falter-common/files/etc}/uci-defaults/freifunk-berlin-olsrd-defaults (100%) rename packages/{falter-berlin-network-defaults => falter-common/files/etc}/uci-defaults/freifunk-berlin-pingcheck-defaults (100%) rename packages/{falter-berlin-statistics-defaults => falter-common/files/etc}/uci-defaults/freifunk-berlin-statistics-defaults (100%) rename packages/{falter-berlin-system-defaults => falter-common/files/etc}/uci-defaults/freifunk-berlin-system-defaults (100%) rename packages/{falter-berlin-uhttpd-defaults => falter-common/files/etc}/uci-defaults/freifunk-berlin-uhttpd-defaults (100%) rename packages/{falter-berlin-network-defaults => falter-common/files/etc}/uci-defaults/freifunk-berlin-wireless-defaults (100%) rename packages/{falter-berlin-network-defaults => falter-common/files}/lib/functions/freifunk-berlin-network.sh (100%) diff --git a/packages/falter-berlin-dhcp-defaults/Makefile b/packages/falter-berlin-dhcp-defaults/Makefile deleted file mode 100644 index ca776592..00000000 --- a/packages/falter-berlin-dhcp-defaults/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=falter-berlin-dhcp-defaults -PKG_VERSION:=2 - -include $(INCLUDE_DIR)/package.mk - -define Package/falter-berlin-dhcp-defaults - SECTION:=falter-berlin - CATEGORY:=falter-berlin - TITLE:=Freifunk Berlin dhcp default configuration - URL:=https://github.com/freifunk-berlin/falter-packages - EXTRA_DEPENDS:=dnsmasq - PKGARCH:=all -endef - -define Package/falter-berlin-dhcp-defaults/description - Freifunk Berlin configuration files for dhcp -endef - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/falter-berlin-dhcp-defaults/install - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(CP) ./uci-defaults/* $(1)/etc/uci-defaults - $(CP) ./files/* $(1)/ -endef - -$(eval $(call BuildPackage,falter-berlin-dhcp-defaults)) - diff --git a/packages/falter-berlin-freifunk-defaults/Makefile b/packages/falter-berlin-freifunk-defaults/Makefile deleted file mode 100644 index 00b1be18..00000000 --- a/packages/falter-berlin-freifunk-defaults/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=falter-berlin-freifunk-defaults -PKG_SOURCE_DATE:=2019-05-25 -PKG_VERSION:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/falter-berlin-freifunk-defaults - SECTION:=falter-berlin - CATEGORY:=falter-berlin - TITLE:=Freifunk Berlin freifunk default configuration - URL:=https://github.com/freifunk-berlin/falter-packages - PKGARCH:=all -endef - -define Package/falter-berlin-freifunk-defaults/description - Freifunk Berlin configuration files for freifunk -endef - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/falter-berlin-freifunk-defaults/install - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(CP) ./uci-defaults/* $(1)/etc/uci-defaults -endef - -$(eval $(call BuildPackage,falter-berlin-freifunk-defaults)) diff --git a/packages/falter-berlin-network-defaults/Makefile b/packages/falter-berlin-network-defaults/Makefile deleted file mode 100644 index 11c037a7..00000000 --- a/packages/falter-berlin-network-defaults/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=falter-berlin-network-defaults -PKG_VERSION:=4 - -include $(INCLUDE_DIR)/package.mk - -define Package/falter-berlin-network-defaults - SECTION:=falter-berlin - CATEGORY:=falter-berlin - TITLE:=Freifunk Berlin network default configuration - URL:=https://github.com/freifunk-berlin/falter-packages - EXTRA_DEPENDS:=pingcheck - PKGARCH:=all -endef - -define Package/falter-berlin-network-defaults/description - Freifunk Berlin configuration files for network -endef - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/falter-berlin-network-defaults/install - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(CP) ./uci-defaults/* $(1)/etc/uci-defaults - $(INSTALL_DIR) $(1)/etc/hotplug.d/iface - $(CP) ./hotplug.d/iface/* $(1)/etc/hotplug.d/iface/ - $(INSTALL_DIR) $(1)/lib/functions - $(CP) ./lib/functions/* $(1)/lib/functions/ - $(INSTALL_DIR) $(1)/etc/pingcheck/online.d - $(CP) ./pingcheck/online.d/* $(1)/etc/pingcheck/online.d/ - $(INSTALL_DIR) $(1)/etc/pingcheck/offline.d - $(CP) ./pingcheck/offline.d/* $(1)/etc/pingcheck/offline.d/ -endef - -$(eval $(call BuildPackage,falter-berlin-network-defaults)) diff --git a/packages/falter-berlin-olsrd-defaults/Makefile b/packages/falter-berlin-olsrd-defaults/Makefile deleted file mode 100644 index 91620dab..00000000 --- a/packages/falter-berlin-olsrd-defaults/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=falter-berlin-olsrd-defaults -PKG_VERSION:=2 - -include $(INCLUDE_DIR)/package.mk - -define Package/falter-berlin-olsrd-defaults - SECTION:=falter-berlin - CATEGORY:=falter-berlin - TITLE:=Freifunk Berlin olsrd default configuration - URL:=https://github.com/freifunk-berlin/falter-packages - EXTRA_DEPENDS+=olsrd - PKGARCH:=all -endef - -define Package/falter-berlin-olsrd-defaults/description - Freifunk Berlin configuration files for olsrd and olsrd6 -endef - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/falter-berlin-olsrd-defaults/install - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(CP) ./uci-defaults/* $(1)/etc/uci-defaults -endef - -$(eval $(call BuildPackage,falter-berlin-olsrd-defaults)) diff --git a/packages/falter-berlin-statistics-defaults/Makefile b/packages/falter-berlin-statistics-defaults/Makefile deleted file mode 100644 index 5f41cd90..00000000 --- a/packages/falter-berlin-statistics-defaults/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=falter-berlin-statistics-defaults -PKG_SOURCE_DATE:=2020-04-01 -PKG_VERSION:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/falter-berlin-statistics-defaults - SECTION:=falter-berlin - CATEGORY:=falter-berlin - TITLE:=Freifunk Berlin statistics default configuration - URL:=https://github.com/freifunk-berlin/falter-packages - EXTRA_DEPENDS:=olsrd-mod-txtinfo - PKGARCH:=all -endef - -define Package/falter-berlin-statistics-defaults/description - Freifunk Berlin configuration files for statistics -endef - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/falter-berlin-statistics-defaults/install - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(CP) ./uci-defaults/* $(1)/etc/uci-defaults -endef - -$(eval $(call BuildPackage,falter-berlin-statistics-defaults)) diff --git a/packages/falter-berlin-system-defaults/Makefile b/packages/falter-berlin-system-defaults/Makefile deleted file mode 100644 index e9038723..00000000 --- a/packages/falter-berlin-system-defaults/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=falter-berlin-system-defaults -PKG_SOURCE_DATE:=2020-03-01 -PKG_VERSION:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/falter-berlin-system-defaults - SECTION:=falter-berlin - CATEGORY:=falter-berlin - TITLE:=Freifunk Berlin system default configuration - URL:=https://github.com/freifunk-berlin/falter-packages - PKGARCH:=all -endef - -define Package/falter-berlin-system-defaults/description - Freifunk Berlin configuration files for basic system-files -endef - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/falter-berlin-system-defaults/install - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(CP) ./uci-defaults/* $(1)/etc/uci-defaults -endef - -$(eval $(call BuildPackage,falter-berlin-system-defaults)) diff --git a/packages/falter-berlin-uhttpd-defaults/Makefile b/packages/falter-berlin-uhttpd-defaults/Makefile deleted file mode 100644 index 150d2e37..00000000 --- a/packages/falter-berlin-uhttpd-defaults/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=falter-berlin-uhttpd-defaults -PKG_VERSION:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/falter-berlin-uhttpd-defaults - SECTION:=falter-berlin - CATEGORY:=falter-berlin - TITLE:=Freifunk Berlin uhttpd default configuration - URL:=https://github.com/freifunk-berlin/falter-packages - EXTRA_DEPENDS:=uhttpd - PKGARCH:=all -endef - -define Package/falter-berlin-uhttpd-defaults/description - Freifunk Berlin configuration files for uhttpd -endef - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/falter-berlin-uhttpd-defaults/install - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(CP) ./uci-defaults/* $(1)/etc/uci-defaults -endef - -$(eval $(call BuildPackage,falter-berlin-uhttpd-defaults)) diff --git a/packages/falter-berlin-network-defaults/hotplug.d/iface/60-ffuplink_policyrouting b/packages/falter-common/files/etc/hotplug.d/iface/60-ffuplink_policyrouting similarity index 100% rename from packages/falter-berlin-network-defaults/hotplug.d/iface/60-ffuplink_policyrouting rename to packages/falter-common/files/etc/hotplug.d/iface/60-ffuplink_policyrouting diff --git a/packages/falter-berlin-dhcp-defaults/files/etc/init.d/ff_dnsmasq_reload b/packages/falter-common/files/etc/init.d/ff_dnsmasq_reload similarity index 100% rename from packages/falter-berlin-dhcp-defaults/files/etc/init.d/ff_dnsmasq_reload rename to packages/falter-common/files/etc/init.d/ff_dnsmasq_reload diff --git a/packages/falter-berlin-network-defaults/pingcheck/offline.d/60-freifunk-wan b/packages/falter-common/files/etc/pingcheck/offline.d/60-freifunk-wan similarity index 100% rename from packages/falter-berlin-network-defaults/pingcheck/offline.d/60-freifunk-wan rename to packages/falter-common/files/etc/pingcheck/offline.d/60-freifunk-wan diff --git a/packages/falter-berlin-network-defaults/pingcheck/online.d/60-freifunk-wan b/packages/falter-common/files/etc/pingcheck/online.d/60-freifunk-wan similarity index 100% rename from packages/falter-berlin-network-defaults/pingcheck/online.d/60-freifunk-wan rename to packages/falter-common/files/etc/pingcheck/online.d/60-freifunk-wan diff --git a/packages/falter-berlin-network-defaults/uci-defaults/freifunk-berlin-correct-nsm2-txpower b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-correct-nsm2-txpower similarity index 100% rename from packages/falter-berlin-network-defaults/uci-defaults/freifunk-berlin-correct-nsm2-txpower rename to packages/falter-common/files/etc/uci-defaults/freifunk-berlin-correct-nsm2-txpower diff --git a/packages/falter-berlin-dhcp-defaults/uci-defaults/freifunk-berlin-dhcp-defaults b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-dhcp-defaults similarity index 100% rename from packages/falter-berlin-dhcp-defaults/uci-defaults/freifunk-berlin-dhcp-defaults rename to packages/falter-common/files/etc/uci-defaults/freifunk-berlin-dhcp-defaults diff --git a/packages/falter-berlin-network-defaults/uci-defaults/freifunk-berlin-ffuplink-defaults b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-ffuplink-defaults similarity index 100% rename from packages/falter-berlin-network-defaults/uci-defaults/freifunk-berlin-ffuplink-defaults rename to packages/falter-common/files/etc/uci-defaults/freifunk-berlin-ffuplink-defaults diff --git a/packages/falter-berlin-freifunk-defaults/uci-defaults/freifunk-berlin-freifunk-defaults b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-freifunk-defaults similarity index 100% rename from packages/falter-berlin-freifunk-defaults/uci-defaults/freifunk-berlin-freifunk-defaults rename to packages/falter-common/files/etc/uci-defaults/freifunk-berlin-freifunk-defaults diff --git a/packages/falter-berlin-network-defaults/uci-defaults/freifunk-berlin-network-defaults b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-network-defaults similarity index 100% rename from packages/falter-berlin-network-defaults/uci-defaults/freifunk-berlin-network-defaults rename to packages/falter-common/files/etc/uci-defaults/freifunk-berlin-network-defaults diff --git a/packages/falter-berlin-network-defaults/uci-defaults/freifunk-berlin-network-ip-route b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-network-ip-route similarity index 100% rename from packages/falter-berlin-network-defaults/uci-defaults/freifunk-berlin-network-ip-route rename to packages/falter-common/files/etc/uci-defaults/freifunk-berlin-network-ip-route diff --git a/packages/falter-berlin-olsrd-defaults/uci-defaults/freifunk-berlin-olsrd-defaults b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-olsrd-defaults similarity index 100% rename from packages/falter-berlin-olsrd-defaults/uci-defaults/freifunk-berlin-olsrd-defaults rename to packages/falter-common/files/etc/uci-defaults/freifunk-berlin-olsrd-defaults diff --git a/packages/falter-berlin-network-defaults/uci-defaults/freifunk-berlin-pingcheck-defaults b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-pingcheck-defaults similarity index 100% rename from packages/falter-berlin-network-defaults/uci-defaults/freifunk-berlin-pingcheck-defaults rename to packages/falter-common/files/etc/uci-defaults/freifunk-berlin-pingcheck-defaults diff --git a/packages/falter-berlin-statistics-defaults/uci-defaults/freifunk-berlin-statistics-defaults b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-statistics-defaults similarity index 100% rename from packages/falter-berlin-statistics-defaults/uci-defaults/freifunk-berlin-statistics-defaults rename to packages/falter-common/files/etc/uci-defaults/freifunk-berlin-statistics-defaults diff --git a/packages/falter-berlin-system-defaults/uci-defaults/freifunk-berlin-system-defaults b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-system-defaults similarity index 100% rename from packages/falter-berlin-system-defaults/uci-defaults/freifunk-berlin-system-defaults rename to packages/falter-common/files/etc/uci-defaults/freifunk-berlin-system-defaults diff --git a/packages/falter-berlin-uhttpd-defaults/uci-defaults/freifunk-berlin-uhttpd-defaults b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-uhttpd-defaults similarity index 100% rename from packages/falter-berlin-uhttpd-defaults/uci-defaults/freifunk-berlin-uhttpd-defaults rename to packages/falter-common/files/etc/uci-defaults/freifunk-berlin-uhttpd-defaults diff --git a/packages/falter-berlin-network-defaults/uci-defaults/freifunk-berlin-wireless-defaults b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-wireless-defaults similarity index 100% rename from packages/falter-berlin-network-defaults/uci-defaults/freifunk-berlin-wireless-defaults rename to packages/falter-common/files/etc/uci-defaults/freifunk-berlin-wireless-defaults diff --git a/packages/falter-berlin-network-defaults/lib/functions/freifunk-berlin-network.sh b/packages/falter-common/files/lib/functions/freifunk-berlin-network.sh similarity index 100% rename from packages/falter-berlin-network-defaults/lib/functions/freifunk-berlin-network.sh rename to packages/falter-common/files/lib/functions/freifunk-berlin-network.sh