jengelh/kmod
SHA256
1
0
Fork 0
forked from pool/kmod
Code Pull Requests Activity

Accepting request 1195204 from Base:System

Browse Source 
- Update to release 33
  * Add weak dependencies
  * Stop parsing .alias files from modprobe.d directories

OBS-URL: https://build.opensuse.org/request/show/1195204
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kmod?expand=0&rev=82
This commit is contained in:
Ana Guerrero 2024-08-22 16:10:36 +00:00 committed by Git OBS Bridge
commit 6faf9a9a34
12 changed files with 90 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0001-testsuite-fix-path-for-test-user.patch Normal file
View File

@ -0,0 +1,31 @@
From 590074281e8463128ac92ed2640405cd05b10cb1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 14 Aug 2024 09:58:16 +0200
Subject: [PATCH] testsuite: fix path for test-user
... as this just does not find its paths.
Closes: https://github.com/kmod-project/kmod/issues/69
Fixes: 9d1fb31 ("libkmod, depmod, modprobe: Make directory for kernel modules configurable")
Signed-off-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---
testsuite/test-user.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testsuite/test-user.c b/testsuite/test-user.c
index 97a4747..0db48c3 100644
--- a/testsuite/test-user.c
+++ b/testsuite/test-user.c
@@ -16,7 +16,7 @@
#include "testsuite.h"
#define TEST_USER_ROOTFS TESTSUITE_ROOTFS "test-user/"
-#define TEST_USER_KERNEL_DIR TEST_USER_ROOTFS "lib/modules/4.4.4/"
+#define TEST_USER_KERNEL_DIR TEST_USER_ROOTFS MODULE_DIRECTORY "/4.4.4/"
static const char *const test_user_config_paths[] = {
TEST_USER_ROOTFS "etc/modprobe.d",
--
2.46.0

30
0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
View File

@ -12,11 +12,11 @@ Patch-mainline: never
libkmod/libkmod-module.c | 31 +++++++++++++++++++++++++++++++ libkmod/libkmod-module.c | 31 +++++++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 2 deletions(-) 3 files changed, 42 insertions(+), 2 deletions(-)
Index: kmod-31/libkmod/libkmod-config.c Index: kmod-33/libkmod/libkmod-config.c
=================================================================== ===================================================================
--- kmod-31.orig/libkmod/libkmod-config.c --- kmod-33.orig/libkmod/libkmod-config.c
+++ kmod-31/libkmod/libkmod-config.c +++ kmod-33/libkmod/libkmod-config.c
@@ -708,8 +708,16 @@ static int kmod_config_parse(struct kmod @@ -869,8 +869,16 @@ static int kmod_config_parse(struct kmod
ERR(ctx, "%s: command %s is deprecated and not parsed anymore\n", ERR(ctx, "%s: command %s is deprecated and not parsed anymore\n",
filename, cmd); filename, cmd);
} else if (streq(cmd, "allow_unsupported_modules")) { } else if (streq(cmd, "allow_unsupported_modules")) {
@ -35,23 +35,23 @@ Index: kmod-31/libkmod/libkmod-config.c
} else { } else {
syntax_error: syntax_error:
ERR(ctx, "%s line %u: ignoring bad line starting with '%s'\n", ERR(ctx, "%s line %u: ignoring bad line starting with '%s'\n",
Index: kmod-31/libkmod/libkmod-internal.h Index: kmod-33/libkmod/libkmod-internal.h
=================================================================== ===================================================================
--- kmod-31.orig/libkmod/libkmod-internal.h --- kmod-33.orig/libkmod/libkmod-internal.h
+++ kmod-31/libkmod/libkmod-internal.h +++ kmod-33/libkmod/libkmod-internal.h
@@ -130,6 +130,7 @@ struct kmod_config { @@ -131,6 +131,7 @@ struct kmod_config {
struct kmod_list *softdeps; struct kmod_list *weakdeps;
struct kmod_list *paths; struct kmod_list *paths;
+ int block_unsupported; + int block_unsupported;
}; };
int kmod_config_new(struct kmod_ctx *ctx, struct kmod_config **config, const char * const *config_paths) __attribute__((nonnull(1, 2,3))); int kmod_config_new(struct kmod_ctx *ctx, struct kmod_config **config, const char * const *config_paths) __attribute__((nonnull(1, 2,3)));
Index: kmod-31/libkmod/libkmod-module.c Index: kmod-33/libkmod/libkmod-module.c
=================================================================== ===================================================================
--- kmod-31.orig/libkmod/libkmod-module.c --- kmod-33.orig/libkmod/libkmod-module.c
+++ kmod-31/libkmod/libkmod-module.c +++ kmod-33/libkmod/libkmod-module.c
@@ -781,6 +781,24 @@ KMOD_EXPORT const char *kmod_module_get_ @@ -767,6 +767,24 @@ KMOD_EXPORT const char *kmod_module_get_
return mod->name; return mod->name;
} }
@ -76,7 +76,7 @@ Index: kmod-31/libkmod/libkmod-module.c
/** /**
* kmod_module_get_path: * kmod_module_get_path:
* @mod: kmod module * @mod: kmod module
@@ -959,6 +977,7 @@ KMOD_EXPORT int kmod_module_insert_modul @@ -947,6 +965,7 @@ KMOD_EXPORT int kmod_module_insert_modul
int err; int err;
const char *path; const char *path;
const char *args = options ? options : ""; const char *args = options ? options : "";
@ -84,7 +84,7 @@ Index: kmod-31/libkmod/libkmod-module.c
if (mod == NULL) if (mod == NULL)
return -ENOENT; return -ENOENT;
@@ -977,6 +996,18 @@ KMOD_EXPORT int kmod_module_insert_modul @@ -965,6 +984,18 @@ KMOD_EXPORT int kmod_module_insert_modul
} }
} }

4
_scmsync.obsinfo Normal file
View File

@ -0,0 +1,4 @@
mtime: 1724288766
commit: c0d997b9f87fef11b441dffd32addda660379ac46be324866950df1bb120bbfb
url: https://src.opensuse.org/jengelh/kmod
revision: master

3
build.specials.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c2048e2a949628d627588e8adc4dabbfab2220ec67d60d7969fb1b33fd4d429
size 256

16
kmod-32.tar.sign
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE6rM8lpABPHM5FqyDm6KlpjDL6lMFAmXn4vQACgkQm6KlpjDL
6lNdrg//Z2RngX3Vl1Y0/0tC77dez36xFZ4MnpW+gYm5B1vPgqyqChFWCc1WbUHG
mgJc5EU3Zbesg6Pdblp6YIswBvVGSMcH+7zkysGzLJyiO61Az+YjInlWgfuyI8lA
EG6qlqTFc1O8nExO+2Zci5E8VxjX/6BriB3jzls1zjk7WdI6X8HRjWrG8QgW3yix
Blt0AiBPw2wM9rdlFoQ8ZIOj7V33ax96dPHmSq6dTfMaZFCtXhPqgb6vh8ZtP9OW
21aJcWbVcdgalWIeNHKHxq+GOeXi7qs/s5Ss/6ugSVncOTXq3Y6X+WqVjgiQNdn8
BLm0bK/eL78FlIkrx7xDgWDuHyarICoPa4Y8M+lKpABuKssXWSXm/IoRmYtThWj7
UdNXx7cpGXsa0OGBA4HvMMKXkRVTLFhYdodEPLllIQm90dOt3oYJrf57a36MU49B
F03o5MKazuA3BbUlF5u5DQ/eG5lbp/i3kw2J6K+ezC24P/ulR+P5jP+nTeEoOI1T
QfgMvGvifbVaOX8jy3eisej7QvshBi/fGcpZcYORE/mCyEz0xcXAvhQdoo4UgdtG
6+qOm4ZSIrb98lmyjOg0LXI3SNJ2+7mbP08K5t4o1nTTa/pjzSrwbeoRU1uPLQyg
DxUp7bayhKXDwtN1Qgye1ZNbUGj4NvR5neGp0bXKICMV09XESeQ=
=jQpD
-----END PGP SIGNATURE-----

BIN
kmod-32.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

16
kmod-33.tar.sign Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE6rM8lpABPHM5FqyDm6KlpjDL6lMFAma7li4ACgkQm6KlpjDL
6lM6OA//W5nsBow53HlqVH4I4uPO743SREE469uT0t9rF43IY+rngUNQAZGA9RP+
rw+vy4/v3uJ5YhZd6Z2mdPZFoG8WfM8xxhDhjhyZXpBlDCf9sp+hxZTG3/2Y5qy8
j0RUWwnunYzIAu+icLI1Svtq3ksp/7Il5nXYoPKVnEFxMN/y7bpbniac20osvsx4
gzJEQrNUwDlWx10jm+C2ijWFrdCEAZd8wBfDVWIZPzXxPrzGZULvkYVTe4MZ8y4p
1gWW6MTJU8ayiAJjM29RFqY2oPWLUw9hocCHDlsNuhMJ2mam+n9qSeWy7vgHm1F4
LUR90Kx9z0AUiwYS4tAQUHbfg/NJlhVjeMGG9jBsU4bjV/ljX6ofnweAPokKRvrt
ehdzJpwvbBa2FdVyQ7WCiIo5Rf7Ry73BE5KsmGrhDWtun+DMYiYPCMQJdNWs0mXb
KDBe4A8hKU3NIRzXl7X/bPNIkMc0SFD2RuS10SqQbKS23LwGVqtwBfhrsHmD95fA
cZiT+hSjBHC/ixlF36SzlBSLgQlPmfcbmvz5WIrs9GVJ720vYrKqsOhA5LVovmjd
jUkRaQPoKb3RVeX7J8QCPYU5/3/wysSYk8NekGW4id5kc8Pk6W4/+TB7kGkk/bkT
Xbg3r3BFy7s+mWv7BG1N51XKWaF18RcrI3mTNLrxuJe6MeNczDo=
=Feot
-----END PGP SIGNATURE-----

BIN
kmod-33.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

8
kmod-testsuite.spec
View File

@ -22,7 +22,7 @@
Name: kmod-testsuite Name: kmod-testsuite
%define lname libkmod2 %define lname libkmod2
Version: 32 Version: 33
Release: 0 Release: 0
Summary: Testsuite of the kmod package Summary: Testsuite of the kmod package
License: GPL-2.0-or-later AND LGPL-2.1-or-later License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -40,15 +40,15 @@ Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: 0012-modprobe-print-unsupported-status.patch Patch6: 0012-modprobe-print-unsupported-status.patch
Patch16: no-stylesheet-download.patch Patch7: 0001-testsuite-fix-path-for-test-user.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: kernel-default-devel BuildRequires: kernel-default-devel
BuildRequires: libopenssl-devel >= 1.1.0 BuildRequires: libopenssl-devel >= 1.1.0
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libxslt-tools BuildRequires: pkg-config >= 0.21
BuildRequires: pkgconfig >= 0.21 BuildRequires: scdoc
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(liblzma) >= 4.99 BuildRequires: pkgconfig(liblzma) >= 4.99
%if 0%{?use_zstd} %if 0%{?use_zstd}

9
kmod.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Aug 21 21:19:38 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Update to release 33
* Add weak dependencies
* Stop parsing .alias files from modprobe.d directories
- Delete no-stylesheet-download.patch (merged)
- Add 0001-testsuite-fix-path-for-test-user.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 4 15:13:53 UTC 2024 - Michal Suchanek <msuchanek@suse.de> Thu Apr 4 15:13:53 UTC 2024 - Michal Suchanek <msuchanek@suse.de>

11
kmod.spec
View File

@ -22,7 +22,7 @@
Name: kmod Name: kmod
%define lname libkmod2 %define lname libkmod2
Version: 32 Version: 33
Release: 0 Release: 0
Summary: Utilities to load modules into the kernel Summary: Utilities to load modules into the kernel
License: GPL-2.0-or-later AND LGPL-2.1-or-later License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -41,14 +41,13 @@ Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: 0012-modprobe-print-unsupported-status.patch Patch6: 0012-modprobe-print-unsupported-status.patch
Patch16: no-stylesheet-download.patch Patch7: 0001-testsuite-fix-path-for-test-user.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: libopenssl-devel >= 1.1.0 BuildRequires: libopenssl-devel >= 1.1.0
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libxslt-tools BuildRequires: pkg-config >= 0.21
BuildRequires: pkgconfig >= 0.21 BuildRequires: scdoc
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(liblzma) >= 4.99 BuildRequires: pkgconfig(liblzma) >= 4.99
%if 0%{?use_zstd} %if 0%{?use_zstd}
@ -178,7 +177,7 @@ done
%_sbindir/modprobe %_sbindir/modprobe
%_sbindir/rmmod %_sbindir/rmmod
%_mandir/man[58]/*.[58]* %_mandir/man[58]/*.[58]*
%_libdir/pkgconfig/kmod.pc %_datadir/pkgconfig/kmod.pc
%if 0%{?suse_version} < 1550 %if 0%{?suse_version} < 1550
/bin/lsmod /bin/lsmod
/sbin/depmod /sbin/depmod

27
no-stylesheet-download.patch
View File

@ -1,27 +0,0 @@
From 3bb8f5af80b611238160ceb88f288af7037281e9 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Mon, 6 Sep 2021 14:52:35 +0200
Subject: [PATCH] Do not download the docbook stylesheet during build, use
local copy instead.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
man/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/Makefile.am b/man/Makefile.am
index d62ff21c799f..6e6aedf092ad 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -28,7 +28,7 @@ define generate_manpage
--nonet \
--stringparam man.output.quietly 1 \
--param funcsynopsis.style "'ansi'" \
- http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl -
+ /usr/share/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl -
endef
%.5: %.5.xml
--
2.44.0