[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c88002c48b8011dfec3aefe66f66769e786db11b

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c88002c48b8011dfec3aefe66f66769e786db11b

[git]

[-- Attachment #1: Type: text/plain, Size: 2820 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  c88002c48b8011dfec3aefe66f66769e786db11b (commit)
      from  ea2b8089e69e3741ac3a3f3f24bc9f0b409d04d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c88002c48b8011dfec3aefe66f66769e786db11b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Nov 7 09:11:27 2015 +0100

    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 <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/ipset                                        |  3 +--
 src/patches/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

Difference in files:
diff --git a/lfs/ipset b/lfs/ipset
index 0ee8c92..254b1ec 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 7c20448..0000000
--- 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


hooks/post-receive
--
IPFire 2.x development tree