[Buildroot] [git commit branch/2020.11.x] package/ebtables: install symlink to ebtables-legacy
From: Peter Korsgaard <peter@korsgaard.com>
Date: 2021-02-17 07:15:16
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=5d3e919bfb11147d9bf648c9771aeb598f9747a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.11.x Since the upgrade of ebtables from 2.0.10-4 to 2.0.11, there no longer is an 'ebtables' binary. It has been renamed to 'ebtables-legacy' and moved from '/sbin' to '/usr/sbin'. This change is part of the upstream change to integrate the functionality of ebtables (and arptables) in the iptables package, using the nf_tables kernel backend [1]. Unfortunately, the renaming (and move) of the original 'ebtables' binary breaks existing scripts that are calling 'ebtables' or '/sbin/ebtables'. Therefore, add a symlink from the original path to 'ebtables-legacy'. However, do not provide this symlink if BR2_PACKAGE_IPTABLES_NFTABLES is enabled. In this case, the iptables package will build the new equivalent of ebtables -- a symlink to ebtables-legacy would cause conflicts. [1] https://wiki.nftables.org/wiki-nftables/index.php/Legacy_xtables_tools Signed-off-by: Thomas De Schampheleire <redacted> Acked-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit 938c0851093e9479380873c89f8e935a026b3cdf) Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- package/ebtables/ebtables.mk | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index e8b982206c..e19e2f2ec1 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk@@ -31,4 +31,11 @@ endef EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_REMOVE_UTILS_RESTORE endif +ifeq ($(BR2_PACKAGE_IPTABLES_NFTABLES),) +define EBTABLES_INSTALL_LEGACY_SYMLINK + ln -sf /usr/sbin/ebtables-legacy $(TARGET_DIR)/sbin/ebtables +endef +EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_INSTALL_LEGACY_SYMLINK +endif + $(eval $(autotools-package))