kmod: update to 34.1

log: https://github.com/kmod-project/kmod/compare/v34...v34.1
This commit is contained in:
Rudi Heitbaum 2025-03-06 10:16:26 +00:00
parent 1214a305b6
commit c5b1c53f87
2 changed files with 2 additions and 57 deletions

View File

@ -2,8 +2,8 @@
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
PKG_NAME="kmod"
PKG_VERSION="34"
PKG_SHA256="12e7884484151fbd432b6a520170ea185c159f4393c7a2c2a886ab820313149a"
PKG_VERSION="34.1"
PKG_SHA256="125957c9125fc5db1bd6a2641a1c9a6a0b500882fb8ccf7fb6483fcae5309b17"
PKG_LICENSE="GPL"
PKG_SITE="https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git"
PKG_URL="https://www.kernel.org/pub/linux/utils/kernel/kmod/${PKG_NAME}-${PKG_VERSION}.tar.xz"

View File

@ -1,55 +0,0 @@
From 5bc0ef11b684393bd3727ea01495a61b791857cd Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.de.marchi@gmail.com>
Date: Tue, 25 Feb 2025 08:49:50 -0600
Subject: [PATCH] meson: Fix build with glibc 2.31
In order to use dlopen it may be required to link with libdl depending
on the libc. Add the proper dependency to fix the build in Debian
Bullseye.
Closes: https://github.com/kmod-project/kmod/issues/298
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---
meson.build | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 800b6e4c..f8f26aee 100644
--- a/meson.build
+++ b/meson.build
@@ -394,6 +394,11 @@ libkmod_files = files(
)
libkmod_deps = []
+cdeps = []
+
+if not cc.has_function('dlopen')
+ cdeps += cc.find_library('dl', required : true)
+endif
if dep_map.get('zstd').found()
libkmod_files += files('libkmod/libkmod-file-zstd.c')
@@ -419,7 +424,7 @@ install_headers('libkmod/libkmod.h')
libkmod = shared_library(
'kmod',
libkmod_files,
- dependencies : libkmod_deps,
+ dependencies : libkmod_deps + cdeps,
link_with : libshared,
link_args : ['-Wl,--version-script', meson.current_source_dir() /
'libkmod/libkmod.sym'],
@@ -434,12 +439,13 @@ pkg.generate(
description : 'Library to deal with kernel modules',
libraries : libkmod,
requires_private : libkmod_deps,
+ libraries_private : cdeps,
)
libkmod_internal = static_library(
'kmod-internal',
objects : libkmod.extract_all_objects(recursive : true),
- dependencies : libkmod_deps,
+ dependencies : libkmod_deps + cdeps,
install : false,
)