packages: merge lib-guard into falter-common

Signed-off-by: Packet Please <pktpls@systemli.org>
freifunk-berlin · Jun 7, 2023 · acb7c99 · acb7c99
1 parent 8a5939c
commit acb7c99
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 41 deletions.
diff --git a/packages/falter-berlin-dhcp-defaults/Makefile b/packages/falter-berlin-dhcp-defaults/Makefile
@@ -10,7 +10,7 @@ define Package/falter-berlin-dhcp-defaults
   CATEGORY:=falter-berlin
   TITLE:=Freifunk Berlin dhcp default configuration
   URL:=https://github.com/freifunk-berlin/falter-packages
-  EXTRA_DEPENDS:=dnsmasq, falter-berlin-lib-guard
+  EXTRA_DEPENDS:=dnsmasq
   PKGARCH:=all
 endef
 

diff --git a/packages/falter-berlin-firewall-defaults/Makefile b/packages/falter-berlin-firewall-defaults/Makefile
@@ -10,7 +10,7 @@ define Package/falter-berlin-firewall-defaults
   CATEGORY:=falter-berlin
   TITLE:=Freifunk Berlin firewall default configuration
   URL:=http://github.com/freifunk-berlin/packages_berlin
-  EXTRA_DEPENDS:=firewall4, falter-berlin-lib-guard
+  EXTRA_DEPENDS:=firewall4
   PKGARCH:=all
 endef
 

diff --git a/packages/falter-berlin-lib-guard/Makefile b/packages/falter-berlin-lib-guard/Makefile
diff --git a/packages/falter-berlin-network-defaults/Makefile b/packages/falter-berlin-network-defaults/Makefile
@@ -10,7 +10,7 @@ define Package/falter-berlin-network-defaults
   CATEGORY:=falter-berlin
   TITLE:=Freifunk Berlin network default configuration
   URL:=https://github.com/freifunk-berlin/falter-packages
-  EXTRA_DEPENDS:=falter-berlin-lib-guard, pingcheck
+  EXTRA_DEPENDS:=pingcheck
   PKGARCH:=all
 endef
 

diff --git a/packages/falter-berlin-olsrd-defaults/Makefile b/packages/falter-berlin-olsrd-defaults/Makefile
@@ -10,7 +10,7 @@ define Package/falter-berlin-olsrd-defaults
   CATEGORY:=falter-berlin
   TITLE:=Freifunk Berlin olsrd default configuration
   URL:=https://github.com/freifunk-berlin/falter-packages
-  EXTRA_DEPENDS+=olsrd, falter-berlin-lib-guard
+  EXTRA_DEPENDS+=olsrd
   PKGARCH:=all
 endef
 

diff --git a/packages/falter-berlin-statistics-defaults/Makefile b/packages/falter-berlin-statistics-defaults/Makefile
@@ -11,7 +11,7 @@ define Package/falter-berlin-statistics-defaults
   CATEGORY:=falter-berlin
   TITLE:=Freifunk Berlin statistics default configuration
   URL:=https://github.com/freifunk-berlin/falter-packages
-  EXTRA_DEPENDS:=olsrd-mod-txtinfo, falter-berlin-lib-guard
+  EXTRA_DEPENDS:=olsrd-mod-txtinfo
   PKGARCH:=all
 endef
 

diff --git a/packages/falter-berlin-system-defaults/Makefile b/packages/falter-berlin-system-defaults/Makefile
@@ -11,7 +11,6 @@ define Package/falter-berlin-system-defaults
   CATEGORY:=falter-berlin
   TITLE:=Freifunk Berlin system default configuration
   URL:=https://github.com/freifunk-berlin/falter-packages
-  EXTRA_DEPENDS:=falter-berlin-lib-guard
   PKGARCH:=all
 endef
 

diff --git a/packages/falter-berlin-uhttpd-defaults/Makefile b/packages/falter-berlin-uhttpd-defaults/Makefile
@@ -10,7 +10,7 @@ define Package/falter-berlin-uhttpd-defaults
   CATEGORY:=falter-berlin
   TITLE:=Freifunk Berlin uhttpd default configuration
   URL:=https://github.com/freifunk-berlin/falter-packages
-  EXTRA_DEPENDS:=uhttpd, falter-berlin-lib-guard
+  EXTRA_DEPENDS:=uhttpd
   PKGARCH:=all
 endef
 

diff --git a/...in-lib-guard/files/lib/functions/guard.sh → ...alter-common/files/lib/functions/guard.sh b/...in-lib-guard/files/lib/functions/guard.sh → ...alter-common/files/lib/functions/guard.sh