From 466ed55d599c47a4f72cf6f96907fdfa5e9dcc79 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 19 Oct 2023 15:29:05 +0200 Subject: [PATCH] xtables-addons: fix broken compile with external Toolchain Fix broken compile with external Toolchain. Commit 32aaaaa7d379 ("xtables-addons: pass correct flags to compile and install") simplified and dropped the custom Compile/Install in favor of the default one. Problem is that it dropped DESTDIR resulting in the package having problem on finishing install. The commit then was reworked with c83b8787a5f8 ("xtables-addons: adapt build to EXTERNAL_TOOLCHAIN" that reintroduced DESTDIR and also introduced a useless custom flag to fix wrong ARCH. ARCH is fixed by kernel.mk and doesn't depend on external Toolchain or not. For ARCH that require fixing, kernel.mk should be fixed instead of adding custom function to packages Makefile. Drop the custom ARCH handling and use Compile/Install everytime. Fixes: 32aaaaa7d379 ("xtables-addons: pass correct flags to compile and install") Fixes: c83b8787a5f8 ("xtables-addons: adapt build to EXTERNAL_TOOLCHAIN") Signed-off-by: Christian Marangi --- net/xtables-addons/Makefile | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile index 272e95917c..cc14794802 100644 --- a/net/xtables-addons/Makefile +++ b/net/xtables-addons/Makefile @@ -41,15 +41,6 @@ CONFIGURE_ARGS+= \ --with-kbuild="$(LINUX_DIR)" \ --with-xtlibdir="/usr/lib/iptables" -ifdef CONFIG_EXTERNAL_TOOLCHAIN -MAKE_FLAGS:= \ - $(patsubst ARCH=%,ARCH=$(LINUX_KARCH),$(MAKE_FLAGS)) \ - DEPMOD="/bin/true" - -MAKE_INSTALL_FLAGS:= \ - $(patsubst ARCH=%,ARCH=$(LINUX_KARCH),$(MAKE_FLAGS)) \ - DEPMOD="/bin/true" -else define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(KERNEL_MAKE_FLAGS) \ @@ -65,7 +56,6 @@ define Build/Install DEPMOD="/bin/true" \ install endef -endif # 1: extension/module suffix used in package name # 2: extension/module display name used in package title/description