From c88002c48b8011dfec3aefe66f66769e786db11b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 7 Nov 2015 09:11:27 +0100 Subject: [PATCH] ipset: fix build om arm. Never hardcode KVER-ipfire in any patches because on arm there is no KVER-ipfire kernel. Signed-off-by: Arne Fitzenreiter --- lfs/ipset | 3 +-- .../ipset-6.26_fix_kernel_dir_path.patch | 20 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 src/patches/ipset-6.26_fix_kernel_dir_path.patch diff --git a/lfs/ipset b/lfs/ipset index 0ee8c923c..254b1ec90 100644 --- a/lfs/ipset +++ b/lfs/ipset @@ -71,8 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./autogen.sh - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ipset-6.26_fix_kernel_dir_path.patch - cd $(DIR_APP) && ./configure \ + cd $(DIR_APP) && KSOURCEDIR=/usr/src/linux KBUILDDIR=/usr/src/linux ./configure \ --prefix=/usr \ --disable-static diff --git a/src/patches/ipset-6.26_fix_kernel_dir_path.patch b/src/patches/ipset-6.26_fix_kernel_dir_path.patch deleted file mode 100644 index 7c2044850..000000000 --- a/src/patches/ipset-6.26_fix_kernel_dir_path.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ipset-6.26_orig/configure 2015-10-11 06:57:32.659295626 +0000 -+++ ipset-6.26/configure 2015-10-11 06:58:21.935695339 +0000 -@@ -13079,7 +13079,7 @@ - then - kbuilddir="$KBUILDDIR" - else -- kbuilddir="/lib/modules/`uname -r`/build" -+ kbuilddir="/lib/modules/`uname -r`-ipfire/build" - fi - - if test -n "$KSOURCEDIR"; then -@@ -13087,7 +13087,7 @@ - elif test -e "$kbuilddir/include/linux/netfilter/nfnetlink.h"; then - ksourcedir="$kbuilddir" - else -- ksourcedir="/lib/modules/$(uname -r)/source" -+ ksourcedir="/lib/modules/$(uname -r)-ipfire/source" - fi - if test ! -e "$ksourcedir/include/linux/netfilter/nfnetlink.h" - then -- 2.39.2