From 7fcf08970dcd1e1e15e61b4b458fbf9cf880f27e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20L=C3=BCssing?= Date: Tue, 27 Nov 2018 04:21:13 +0100 Subject: [PATCH] gluon-mesh-batman-adv: remove the compat version number from packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The internal batman-adv compat version numbers are just confusing for the user. Instead, let's just name things "batman-adv" when refering to compatibility version 15 and "batman-adv-legacy" when refering to compatibility version 14. Signed-off-by: Linus Lüssing --- docs/user/site.rst | 10 ++--- package/features | 4 +- package/gluon-alfred/Makefile | 2 +- .../gluon-ebtables-filter-multicast/Makefile | 2 +- .../gluon-ebtables-filter-ra-dhcp/Makefile | 2 +- package/gluon-ebtables-limit-arp/Makefile | 2 +- package/gluon-ebtables-source-filter/Makefile | 2 +- package/gluon-mesh-batman-adv/Makefile | 37 ++++++++----------- .../Makefile | 2 +- 9 files changed, 29 insertions(+), 34 deletions(-) diff --git a/docs/user/site.rst b/docs/user/site.rst index 91151c15..d7e71857 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -562,17 +562,17 @@ in the *GLUON_FEATURES* variable. These flags allow to specify a set of features on a higher level than individual package names. Most Gluon packages can simply be specified as feature flags by removing the ``gluon-`` -prefix: The feature flag corresponding to the package *gluon-mesh-batman-adv-15* is -*mesh-batman-adv-15*. +prefix: The feature flag corresponding to the package *gluon-mesh-batman-adv* is +*mesh-batman-adv*. The file ``package/features`` in the Gluon repository (or ``features`` in site feeds) can specify additional rules for deriving package lists -from feature flags, e.g. specifying both *status-page* and either *mesh-batman-adv-14* -or *mesh-batman-adv-15* will automatically select the additional package +from feature flags, e.g. specifying both *status-page* and either *mesh-batman-adv-legacy* +or *mesh-batman-adv* will automatically select the additional package *gluon-status-page-mesh-batman-adv*. In the future, selecting the flags *mesh-vpn-fastd* and *respondd* might automatically enable the additional package *gluon-mesh-vpn-fastd-respondd*, and enabling *status-page* and -*mesh-batman-adv-15* (or *-14*) with ``de`` in *GLUON_LANGS* could +*mesh-batman-adv* (or *-legacy*) with ``de`` in *GLUON_LANGS* could add the package *gluon-status-page-mesh-batman-adv-i18n-de*. In short, it is not necessary anymore to list all the individual packages that are diff --git a/package/features b/package/features index 8b44c82e..dcea4ac5 100644 --- a/package/features +++ b/package/features @@ -22,8 +22,8 @@ packages 'web-advanced' \ packages 'web-advanced & autoupdater' \ 'gluon-web-autoupdater' -packages 'status-page & (mesh-batman-adv-14 | mesh-batman-adv-15)' \ +packages 'status-page & (mesh-batman-adv-legacy | mesh-batman-adv)' \ 'gluon-status-page-mesh-batman-adv' -packages 'mesh-batman-adv-14 | mesh-batman-adv-15' \ +packages 'mesh-batman-adv-legacy | mesh-batman-adv' \ 'gluon-ebtables-limit-arp' diff --git a/package/gluon-alfred/Makefile b/package/gluon-alfred/Makefile index 7c173a77..633567af 100644 --- a/package/gluon-alfred/Makefile +++ b/package/gluon-alfred/Makefile @@ -7,7 +7,7 @@ PKG_RELEASE:=1 include ../gluon.mk define Package/gluon-alfred - DEPENDS:=+gluon-core +gluon-respondd +gluon-neighbour-info gluon-mesh-batman-adv +micrond +alfred + DEPENDS:=+gluon-core +gluon-respondd +gluon-neighbour-info gluon-mesh-batman-adv-common +micrond +alfred TITLE:=Configure alfred endef diff --git a/package/gluon-ebtables-filter-multicast/Makefile b/package/gluon-ebtables-filter-multicast/Makefile index dc579a2a..b54f2575 100644 --- a/package/gluon-ebtables-filter-multicast/Makefile +++ b/package/gluon-ebtables-filter-multicast/Makefile @@ -8,7 +8,7 @@ include ../gluon.mk define Package/gluon-ebtables-filter-multicast TITLE:=Ebtables filters for multicast packets - DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv + DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv-common endef define Package/gluon-ebtables-filter-multicast/description diff --git a/package/gluon-ebtables-filter-ra-dhcp/Makefile b/package/gluon-ebtables-filter-ra-dhcp/Makefile index c650bb89..8e991f89 100644 --- a/package/gluon-ebtables-filter-ra-dhcp/Makefile +++ b/package/gluon-ebtables-filter-ra-dhcp/Makefile @@ -8,7 +8,7 @@ include ../gluon.mk define Package/gluon-ebtables-filter-ra-dhcp TITLE:=Ebtables filters for Router Advertisement and DHCP packets - DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv + DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv-common endef define Package/gluon-ebtables-filter-ra-dhcp/description diff --git a/package/gluon-ebtables-limit-arp/Makefile b/package/gluon-ebtables-limit-arp/Makefile index f7bdc48d..09f83f94 100644 --- a/package/gluon-ebtables-limit-arp/Makefile +++ b/package/gluon-ebtables-limit-arp/Makefile @@ -8,7 +8,7 @@ include ../gluon.mk define Package/gluon-ebtables-limit-arp TITLE:=Ebtables limiter for ARP packets - DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv \ + DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv-common \ +@GLUON_SPECIALIZE_KERNEL:KERNEL_BRIDGE_EBT_LIMIT \ +@GLUON_SPECIALIZE_KERNEL:KERNEL_BRIDGE_EBT_MARK \ +@GLUON_SPECIALIZE_KERNEL:KERNEL_BRIDGE_EBT_MARK_T diff --git a/package/gluon-ebtables-source-filter/Makefile b/package/gluon-ebtables-source-filter/Makefile index 2c14a793..c6863b2b 100644 --- a/package/gluon-ebtables-source-filter/Makefile +++ b/package/gluon-ebtables-source-filter/Makefile @@ -8,7 +8,7 @@ include ../gluon.mk define Package/gluon-ebtables-source-filter TITLE:=Ebtables rules to filter unreasonable L2 traffic. - DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv + DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv-common endef define Package/gluon-ebtables-source-filter/description diff --git a/package/gluon-mesh-batman-adv/Makefile b/package/gluon-mesh-batman-adv/Makefile index b80f8634..d7293378 100644 --- a/package/gluon-mesh-batman-adv/Makefile +++ b/package/gluon-mesh-batman-adv/Makefile @@ -5,36 +5,31 @@ PKG_VERSION:=1 include ../gluon.mk -define Package/gluon-mesh-batman-adv/common - PROVIDES:=gluon-mesh-batman-adv - DEPENDS:=+gluon-core +libgluonutil +gluon-client-bridge +gluon-ebtables +firewall +libiwinfo +kmod-dummy +libnl-tiny +libbatadv +@GLUON_SPECIALIZE_KERNEL:KERNEL_DUMMY +@GLUON_SPECIALIZE_KERNEL:KERNEL_CRC16 +@GLUON_SPECIALIZE_KERNEL:KERNEL_LIBCRC32C +define Package/gluon-mesh-batman-adv-common + TITLE:=Gluon scripts for batman-adv and batman-adv-legacy + DEPENDS:=+gluon-core +libgluonutil +gluon-client-bridge +gluon-ebtables +firewall +libiwinfo +kmod-dummy +libnl-tiny +libbatadv +@GLUON_SPECIALIZE_KERNEL:KERNEL_DUMMY endef -define Package/gluon-mesh-batman-adv-14 -$(Package/gluon-mesh-batman-adv/common) - TITLE:=Support for batman-adv meshing (compat level 14) - DEPENDS+=+kmod-batman-adv-legacy +define Package/gluon-mesh-batman-adv-legacy + TITLE:=Support for batman-adv-legacy meshing (compat level 14) + DEPENDS+=+gluon-mesh-batman-adv-common +kmod-batman-adv-legacy +@GLUON_SPECIALIZE_KERNEL:KERNEL_CRC16 +@GLUON_SPECIALIZE_KERNEL:KERNEL_LIBCRC32C endef -define Package/gluon-mesh-batman-adv-15 -$(Package/gluon-mesh-batman-adv/common) +define Package/gluon-mesh-batman-adv TITLE:=Support for batman-adv meshing (compat level 15) - DEPENDS+=+kmod-batman-adv +batctl + DEPENDS+=+gluon-mesh-batman-adv-common +kmod-batman-adv +batctl +@GLUON_SPECIALIZE_KERNEL:KERNEL_CRC16 +@GLUON_SPECIALIZE_KERNEL:KERNEL_LIBCRC32C endef -define Package/gluon-mesh-batman-adv-14/install +define Package/gluon-mesh-batman-adv-common/install $(Gluon/Build/Install) - - $(INSTALL_DIR) $(1)/lib/gluon/mesh-batman-adv - echo 14 > $(1)/lib/gluon/mesh-batman-adv/compat endef -define Package/gluon-mesh-batman-adv-15/install - $(Gluon/Build/Install) - - $(INSTALL_DIR) $(1)/lib/gluon/mesh-batman-adv - echo 15 > $(1)/lib/gluon/mesh-batman-adv/compat +define Package/gluon-mesh-batman-adv-legacy/install endef -$(eval $(call BuildPackageGluon,gluon-mesh-batman-adv-14)) -$(eval $(call BuildPackageGluon,gluon-mesh-batman-adv-15)) +define Package/gluon-mesh-batman-adv/install +endef + +$(eval $(call BuildPackageGluon,gluon-mesh-batman-adv-common)) +$(eval $(call BuildPackageGluon,gluon-mesh-batman-adv-legacy)) +$(eval $(call BuildPackageGluon,gluon-mesh-batman-adv)) diff --git a/package/gluon-status-page-mesh-batman-adv/Makefile b/package/gluon-status-page-mesh-batman-adv/Makefile index 4d2ed8f0..fc911799 100644 --- a/package/gluon-status-page-mesh-batman-adv/Makefile +++ b/package/gluon-status-page-mesh-batman-adv/Makefile @@ -7,7 +7,7 @@ include ../gluon.mk define Package/gluon-status-page-mesh-batman-adv TITLE:=Batman-data provider for gluon-status-page - DEPENDS:=+gluon-status-page gluon-mesh-batman-adv +libnl-tiny +libbatadv +libjson-c + DEPENDS:=+gluon-status-page gluon-mesh-batman-adv-common +libnl-tiny +libbatadv +libjson-c endef define Package/gluon-status-page-mesh-batman-adv/install