kmod: Update to 26

Message ID 20200227145348.22499-1-michael.tremer@ipfire.org
State Accepted
Commit 1ece41ec51680390ba895130e7aeab6a1cd3a458
Headers
Series kmod: Update to 26 |

Commit Message

Michael Tremer Feb. 27, 2020, 2:53 p.m. UTC
  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>
---
 config/rootfiles/common/kmod | 2 +-
 lfs/kmod                     | 5 +++--
 make.sh                      | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
  

Patch

diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod
index 4c9b448f7..ff9cda26d 100644
--- a/config/rootfiles/common/kmod
+++ b/config/rootfiles/common/kmod
@@ -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
diff --git a/lfs/kmod b/lfs/kmod
index 4ef2088fd..39e350c02 100644
--- 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 07c0f52c2..b434e7188 100755
--- 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