Patchwork iptables: fix build after linux-headers changes

login
register
mail settings
Submitter Thomas Petazzoni
Date July 6, 2013, 3:18 p.m.
Message ID <1373123930-15389-1-git-send-email-thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/257284/
State Accepted
Commit 478f826518e1cf769abfb69da9361d931be15f8c
Headers show

Comments

Thomas Petazzoni - July 6, 2013, 3:18 p.m.
As reported by 'scanf' on IRC, the iptables now fails to build because
of a missing <asm/cache.h> header in the kernel headers. The package
directly uses $(LINUX_HEADERS_DIR), which is not correct: this is the
source directory of the kernel, not where they are installed, and in
addition, this directory is empty/does not exist when using external
toolchains.

Instead, we use $(STAGING_DIR)/usr, which contains the kernel headers,
as part of the toolchain headers.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/iptables/iptables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Peter Korsgaard - July 7, 2013, 7:36 p.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> As reported by 'scanf' on IRC, the iptables now fails to build
 Thomas> because of a missing <asm/cache.h> header in the kernel
 Thomas> headers. The package directly uses $(LINUX_HEADERS_DIR), which
 Thomas> is not correct: this is the source directory of the kernel, not
 Thomas> where they are installed, and in addition, this directory is
 Thomas> empty/does not exist when using external toolchains.

 Thomas> Instead, we use $(STAGING_DIR)/usr, which contains the kernel
 Thomas> headers, as part of the toolchain headers.

Committed, thanks.

Patch

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index cfb227a..f548cb9 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -12,7 +12,7 @@  IPTABLES_DEPENDENCIES = host-pkgconf
 IPTABLES_LICENSE = GPLv2
 IPTABLES_LICENSE_FILES = COPYING
 
-IPTABLES_CONF_OPT = --libexecdir=/usr/lib --with-kernel=$(LINUX_HEADERS_DIR)
+IPTABLES_CONF_OPT = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr
 
 define IPTABLES_TARGET_SYMLINK_CREATE
 	ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables