forked from freifunk-franken/firmware
packages/fff: introduce fff-defaults for selected packages
In principle, the uci-defaults files are meant for providing standard values for a specific package. Our firmware is effectively abusing this concept by using uci-defaults to set defaults for _other_ packages, e.g. fff-dhcp setting defaults for dnsmasq. While this works relatively well for the current firmware, it completely breaks apart if the packages are used as a feed for vanilla OpenWrt. Thus, in preparation for making the packages available for such a scenario (read: "use packages as packages"), this moves all custom defaults we set for other packages to a directory "fff-defaults". If the firmware is built with buildscript (and sets the new FFF_VARIANT variable), this is copied back to uci-defaults as usual. But without that script, we now have "our" config in a dedicated directory where we can use it otherwise as well. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
parent
e3954fddf5
commit
526b290103
|
@ -1,7 +1,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-babeld
|
||||
PKG_RELEASE:=6
|
||||
PKG_RELEASE:=7
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
@ -24,6 +24,9 @@ endef
|
|||
|
||||
define Package/fff-babeld/install
|
||||
$(CP) ./files/* $(1)/
|
||||
ifneq ($(FFF_VARIANT),)
|
||||
mv $(1)/etc/fff-defaults $(1)/etc/uci-defaults
|
||||
endif
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,fff-babeld))
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-dhcp
|
||||
PKG_RELEASE:=4
|
||||
PKG_RELEASE:=5
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
@ -24,6 +24,9 @@ endef
|
|||
|
||||
define Package/fff-dhcp/install
|
||||
$(CP) ./files/* $(1)/
|
||||
ifneq ($(FFF_VARIANT),)
|
||||
mv $(1)/etc/fff-defaults $(1)/etc/uci-defaults
|
||||
endif
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,fff-dhcp))
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-ra
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
@ -24,6 +24,9 @@ endef
|
|||
|
||||
define Package/fff-ra/install
|
||||
$(CP) ./files/* $(1)/
|
||||
ifneq ($(FFF_VARIANT),)
|
||||
mv $(1)/etc/fff-defaults $(1)/etc/uci-defaults
|
||||
endif
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,fff-ra))
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-wireguard
|
||||
PKG_RELEASE:=5
|
||||
PKG_RELEASE:=6
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
@ -28,6 +28,9 @@ endef
|
|||
|
||||
define Package/fff-wireguard/install
|
||||
$(CP) ./files/* $(1)/
|
||||
ifneq ($(FFF_VARIANT),)
|
||||
mv $(1)/etc/fff-defaults $(1)/etc/uci-defaults
|
||||
endif
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,fff-wireguard))
|
||||
|
|
Loading…
Reference in New Issue