]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
kmod: Update to 26
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 27 Feb 2020 14:53:48 +0000 (14:53 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 1 Mar 2020 19:44:24 +0000 (19:44 +0000)
This patch links kmod against OpenSSL which is required to
decode the kernel modules' PKCS#7 signatures.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
config/rootfiles/common/kmod
lfs/kmod
make.sh

index 4c9b448f7c32f60419ac69c3776747dee11fa5b6..ff9cda26d91aa2f97ea5f83dbc0e4bd0c2847c37 100644 (file)
@@ -9,6 +9,6 @@ sbin/rmmod
 #usr/lib/libkmod.la
 #usr/lib/libkmod.so
 usr/lib/libkmod.so.2
-usr/lib/libkmod.so.2.3.3
+usr/lib/libkmod.so.2.3.4
 #usr/lib/pkgconfig/libkmod.pc
 #usr/share/bash-completion/completions/kmod
index 4ef2088fd2974f2de1785bf3af5f64643c443f0f..39e350c02c88de23291a872874db34b5c888f3de 100644 (file)
--- a/lfs/kmod
+++ b/lfs/kmod
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 25
+VER        = 26
 
 THISAPP    = kmod-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 34f325cab568f842fdde4f8b2182f220
+$(DL_FILE)_MD5 = 1129c243199bdd7db01b55a61aa19601
 
 install : $(TARGET)
 
@@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --bindir=/bin \
                --sysconfdir=/etc \
                --disable-manpages \
+               --with-openssl \
                --with-xz \
                --with-zlib
 
diff --git a/make.sh b/make.sh
index 07c0f52c20f8cb7c2723099168694b807cd3d579..b434e7188e0b06b67d0d0a8f56f696bfa709be19 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1111,7 +1111,6 @@ buildbase() {
        lfsmake2 pkg-config
        lfsmake2 make
        lfsmake2 man
-       lfsmake2 kmod
        lfsmake2 net-tools
        lfsmake2 patch
        lfsmake2 psmisc
@@ -1133,6 +1132,7 @@ buildipfire() {
   lfsmake2 backup
   lfsmake2 openssl
   [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
+  lfsmake2 kmod
   lfsmake2 popt
   lfsmake2 libedit
   lfsmake2 libusb