diff --git a/packages/sysutils/kmod/package.mk b/packages/sysutils/kmod/package.mk index 60346e91f9..bcfd3c58ce 100644 --- a/packages/sysutils/kmod/package.mk +++ b/packages/sysutils/kmod/package.mk @@ -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" diff --git a/packages/sysutils/kmod/patches/kmod-01-fix-build-with-glibc-2.31.patch b/packages/sysutils/kmod/patches/kmod-01-fix-build-with-glibc-2.31.patch deleted file mode 100644 index 98d3f9d1dd..0000000000 --- a/packages/sysutils/kmod/patches/kmod-01-fix-build-with-glibc-2.31.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 5bc0ef11b684393bd3727ea01495a61b791857cd Mon Sep 17 00:00:00 2001 -From: Lucas De Marchi -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 ---- - 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, - ) -