Jan Engelhardt
1710990364
- Fix tests * refresh configure-Detect-openssl-sm3-support.patch * refresh kmod-Add-pkgconfig-file-with-kmod-compile-time-confi.patch * refresh usr-lib-modules.patch OBS-URL: https://build.opensuse.org/request/show/1118343 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=232
118 lines
3.9 KiB
Diff
118 lines
3.9 KiB
Diff
From 6760cce5b59eeb2ba9b96f43626221df0128a285 Mon Sep 17 00:00:00 2001
|
|
From: Michal Suchanek <msuchanek@suse.de>
|
|
Date: Fri, 30 Jun 2023 16:16:24 +0200
|
|
Subject: [PATCH 4/6] kmod: Add pkgconfig file with kmod compile time
|
|
configuration
|
|
|
|
Show distconfdir (where system configuration files are searched/to be
|
|
installed), sysconfdir (where user configuration files are searched),
|
|
module compressions, and module signatures supported.
|
|
|
|
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
|
|
---
|
|
v2: mention module signature in commit message
|
|
v3: add sysconfdir
|
|
v5: add distconfdir, switch to pkgconfig
|
|
---
|
|
Makefile.am | 2 +-
|
|
configure.ac | 11 +++++++++++
|
|
tools/kmod.pc.in | 9 +++++++++
|
|
3 files changed, 21 insertions(+), 1 deletion(-)
|
|
create mode 100644 tools/kmod.pc.in
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index e6630a36e18c..2a54c25bd631 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -96,7 +96,7 @@ libkmod_libkmod_internal_la_DEPENDENCIES = $(libkmod_libkmod_la_DEPENDENCIES)
|
|
libkmod_libkmod_internal_la_LIBADD = $(libkmod_libkmod_la_LIBADD)
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
-pkgconfig_DATA = libkmod/libkmod.pc
|
|
+pkgconfig_DATA = libkmod/libkmod.pc tools/kmod.pc
|
|
|
|
bashcompletiondir=@bashcompletiondir@
|
|
dist_bashcompletion_DATA = \
|
|
diff --git a/configure.ac b/configure.ac
|
|
index fd88d1fbdbf7..7bf8d78ca747 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -21,6 +21,9 @@ LT_INIT([disable-static pic-only])
|
|
AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by kmod])])
|
|
AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by kmod])])
|
|
|
|
+module_compressions=""
|
|
+module_signatures="legacy"
|
|
+
|
|
#####################################################################
|
|
# Program checks and configurations
|
|
#####################################################################
|
|
@@ -94,6 +97,7 @@ AC_ARG_WITH([zstd],
|
|
AS_IF([test "x$with_zstd" != "xno"], [
|
|
PKG_CHECK_MODULES([libzstd], [libzstd >= 1.4.4], [LIBS="$LIBS $libzstd_LIBS"])
|
|
AC_DEFINE([ENABLE_ZSTD], [1], [Enable Zstandard for modules.])
|
|
+ module_compressions="zstd $module_compressions"
|
|
], [
|
|
AC_MSG_NOTICE([Zstandard support not requested])
|
|
])
|
|
@@ -105,6 +109,7 @@ AC_ARG_WITH([xz],
|
|
AS_IF([test "x$with_xz" != "xno"], [
|
|
PKG_CHECK_MODULES([liblzma], [liblzma >= 4.99], [LIBS="$LIBS $liblzma_LIBS"])
|
|
AC_DEFINE([ENABLE_XZ], [1], [Enable Xz for modules.])
|
|
+ module_compressions="xz $module_compressions"
|
|
], [
|
|
AC_MSG_NOTICE([Xz support not requested])
|
|
])
|
|
@@ -116,6 +121,7 @@ AC_ARG_WITH([zlib],
|
|
AS_IF([test "x$with_zlib" != "xno"], [
|
|
PKG_CHECK_MODULES([zlib], [zlib], [LIBS="$LIBS $zlib_LIBS"])
|
|
AC_DEFINE([ENABLE_ZLIB], [1], [Enable zlib for modules.])
|
|
+ module_compressions="gzip $module_compressions"
|
|
], [
|
|
AC_MSG_NOTICE([zlib support not requested])
|
|
])
|
|
@@ -134,6 +140,7 @@ AS_IF([test "x$with_openssl" != "xno"], [
|
|
AC_MSG_NOTICE([openssl sm3 support not detected])
|
|
CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_SM3"
|
|
])
|
|
+ module_signatures="PKCS7 $module_signatures"
|
|
], [
|
|
AC_MSG_NOTICE([openssl support not requested])
|
|
])
|
|
@@ -298,6 +305,9 @@ AC_DEFINE_UNQUOTED(KMOD_FEATURES, ["$with_features"], [Features in this build])
|
|
# Generate files from *.in
|
|
#####################################################################
|
|
|
|
+AC_SUBST([module_compressions], $module_compressions)
|
|
+AC_SUBST([module_signatures], $module_signatures)
|
|
+
|
|
AC_CONFIG_FILES([
|
|
Makefile
|
|
man/Makefile
|
|
@@ -305,6 +315,7 @@ AC_CONFIG_FILES([
|
|
libkmod/docs/version.xml
|
|
libkmod/libkmod.pc
|
|
libkmod/python/kmod/version.py
|
|
+ tools/kmod.pc
|
|
])
|
|
|
|
|
|
diff --git a/tools/kmod.pc.in b/tools/kmod.pc.in
|
|
new file mode 100644
|
|
index 000000000000..2595980a6b35
|
|
--- /dev/null
|
|
+++ b/tools/kmod.pc.in
|
|
@@ -0,0 +1,9 @@
|
|
+prefix=@prefix@
|
|
+sysconfdir=@sysconfdir@
|
|
+distconfdir=@distconfdir@
|
|
+module_compressions=@module_compressions@
|
|
+module_signatures=@module_signatures@
|
|
+
|
|
+Name: kmod
|
|
+Description: Tools to deal with kernel modules
|
|
+Version: @VERSION@
|
|
--
|
|
2.42.0
|
|
|