NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/xtables-addons: replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS

Browse Source 
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
53f2999edf:

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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2023-02-24 10:25:35 +01:00 committed by Thomas Petazzoni
parent 5215f56e5b
commit 7243e9394c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/xtables-addons/xtables-addons.mk
View File

@ -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)