Skip to content

Commit

Permalink
xtables-addons: fix broken compile with external Toolchain
Browse files Browse the repository at this point in the history
Fix broken compile with external Toolchain.

Commit 32aaaaa ("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 c83b878 ("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: 32aaaaa ("xtables-addons: pass correct flags to compile and install")
Fixes: c83b878 ("xtables-addons: adapt build to EXTERNAL_TOOLCHAIN")
Signed-off-by: Christian Marangi <[email protected]>
  • Loading branch information
Ansuel committed Apr 22, 2024
1 parent 3856074 commit 466ed55
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions net/xtables-addons/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand All @@ -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
Expand Down

0 comments on commit 466ed55

Please sign in to comment.