webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-14 04:52:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

ipset: fix build om arm.

Browse Source 
Never hardcode KVER-ipfire in any patches because on arm there is no KVER-ipfire kernel.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2015-11-07 09:11:27 +01:00
parent ea2b8089e6
commit c88002c48b
2 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lfs/ipset
View File

@@ -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

20
src/patches/ipset-6.26_fix_kernel_dir_path.patch
View File

@@ -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