[PATCH 1/3] kmod: update to 23

Marcel Lorenz marcel.lorenz at ipfire.org
Sun Sep 4 11:14:49 CEST 2016


Signed-off-by: Marcel Lorenz <marcel.lorenz at ipfire.org>
---
 config/rootfiles/common/kmod |  5 +++--
 lfs/kmod                     | 15 ++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod
index 14e7654..bb74986 100644
--- a/config/rootfiles/common/kmod
+++ b/config/rootfiles/common/kmod
@@ -1,4 +1,6 @@
 bin/kmod
+lib/libkmod.so.2
+lib/libkmod.so.2.3.1
 sbin/depmod
 sbin/insmod
 sbin/lsmod
@@ -8,6 +10,5 @@ sbin/rmmod
 #usr/include/libkmod.h
 #usr/lib/libkmod.la
 usr/lib/libkmod.so
-usr/lib/libkmod.so.2
-usr/lib/libkmod.so.2.2.3
 #usr/lib/pkgconfig/libkmod.pc
+usr/share/bash-completion/completions/kmod
diff --git a/lfs/kmod b/lfs/kmod
index dc2dc10..4495368 100644
--- a/lfs/kmod
+++ b/lfs/kmod
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2016  IPFire Team  <info at ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 13
+VER        = 23
 
 THISAPP    = kmod-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,6 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+export zlib_CFLAGS="-I/usr/include"
+export zlib_LIBS="-L/usr/lib -L/usr/lib -lz"
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d5aba43b9370cd52f3cb35e82a1aa595
+$(DL_FILE)_MD5 = 3cf469f40ec2ed51f56ba45ea03793e7
 
 install : $(TARGET)
 
@@ -74,11 +77,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--prefix=/usr \
 		--bindir=/bin \
 		--sysconfdir=/etc \
-		--enable-zlib \
+		--with-rootlibdir=/lib \
+		--with-zlib \
 		--disable-manpages
-
-#		--libdir=/lib \
-
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
-- 
2.9.3



More information about the Development mailing list