[Buildroot] [PATCH v2, 1/1] package/xtables-addons: replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS

[Buildroot] [PATCH v2, 1/1] package/xtables-addons: replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS

[Fabrice Fontaine]

Replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS by
XTABLES_ADDONS_REMOVE_GEOIP_HELPERS to avoid the following build failure
raised since bump to version 3.22 in commit
53f2999edfa5e67923d4d8a102c15fa3200e089c:

make[3]: *** No rule to make target '/xt_geoip_query', needed by 'all-am'.  Stop.

Fixes:
 - http://autobuild.buildroot.org/results/f2d596b510f027b94a6b1fad10c363922c50cbec

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
 - Add XTABLES_ADDONS_REMOVE_GEOIP_HELPERS

 package/xtables-addons/xtables-addons.mk | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk
index 77dcfd741c..e794538956 100644
--- a/package/xtables-addons/xtables-addons.mk
+++ b/package/xtables-addons/xtables-addons.mk
@@ -16,12 +16,6 @@ XTABLES_ADDONS_CONF_OPTS = \
 	--with-xtables="$(STAGING_DIR)/usr" \
 	--with-xtlibdir="/usr/lib/xtables"
 
-# geoip helpers need perl with modules and unzip so disable
-define XTABLES_ADDONS_DISABLE_GEOIP_HELPERS
-	$(SED) 's/ geoip//' $(@D)/Makefile.in
-endef
-XTABLES_ADDONS_POST_PATCH_HOOKS += XTABLES_ADDONS_DISABLE_GEOIP_HELPERS
-
 define XTABLES_ADDONS_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS)
 endef
@@ -30,6 +24,15 @@ define XTABLES_ADDONS_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install
 endef
 
+# geoip helpers need perl with modules and unzip so remove them
+define XTABLES_ADDONS_REMOVE_GEOIP_HELPERS
+	$(RM) $(TARGET_DIR)/usr/bin/xt_geoip*
+	$(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_asn*
+	$(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_geoip*
+endef
+
+XTABLES_ADDONS_POST_INSTALL_TARGET_HOOKS += XTABLES_ADDONS_REMOVE_GEOIP_HELPERS
+
 define XTABLES_ADDONS_LINUX_CONFIG_FIXUPS
 	$(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK)
-- 
2.39.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2, 1/1] package/xtables-addons: replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS

[Thomas Petazzoni via buildroot]

On Fri, 24 Feb 2023 10:25:35 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS by
> XTABLES_ADDONS_REMOVE_GEOIP_HELPERS to avoid the following build failure
> raised since bump to version 3.22 in commit
> 53f2999edfa5e67923d4d8a102c15fa3200e089c:
> 
> make[3]: *** No rule to make target '/xt_geoip_query', needed by 'all-am'.  Stop.
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/f2d596b510f027b94a6b1fad10c363922c50cbec
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Thomas Petazzoni):
>  - Add XTABLES_ADDONS_REMOVE_GEOIP_HELPERS

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot