diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:28:04 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:28:04 +0000 |
| commit | dfb125ac8ca774944f18a8de462d0be45f50fe8e (patch) | |
| tree | 7c60f5b100e76ccbcb51610d83b3be6eaca8f6c2 | |
| parent | Merging upstream version 32+20240327. (diff) | |
| download | kmod-debian.tar.xz kmod-debian.zip | |
Adding debian version 32+20240327-1.debian/32+20240327-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/libkmod2.symbols | 2 | ||||
| -rw-r--r-- | debian/patches/no_tools_links | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
5 files changed, 15 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 478f606..8729adc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +kmod (32+20240327-1) unstable; urgency=medium + + * New upstream snapshot. + * Disable the test suite on non-i386 32 bit architectures. (See #1065973.) + + -- Marco d'Itri <md@linux.it> Sun, 26 May 2024 05:23:33 +0200 + kmod (32-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 0034a41..7aa4686 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13), libssl-dev, libzstd-dev, zstd <!nocheck>, gtk-doc-tools, xsltproc, -Standards-Version: 4.6.2.0 +Standards-Version: 4.7.0.0 Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/md/kmod.git Vcs-Browser: https://salsa.debian.org/md/kmod diff --git a/debian/libkmod2.symbols b/debian/libkmod2.symbols index 9a17099..627a89c 100644 --- a/debian/libkmod2.symbols +++ b/debian/libkmod2.symbols @@ -9,6 +9,7 @@ libkmod.so.2 libkmod2 #MINVER# kmod_config_get_options@LIBKMOD_5 5~ kmod_config_get_remove_commands@LIBKMOD_5 5~ kmod_config_get_softdeps@LIBKMOD_5 5~ + kmod_config_get_weakdeps@LIBKMOD_5 32+20240327~ kmod_config_iter_free_iter@LIBKMOD_5 5~ kmod_config_iter_get_key@LIBKMOD_5 5~ kmod_config_iter_get_value@LIBKMOD_5 5~ @@ -44,6 +45,7 @@ libkmod.so.2 libkmod2 #MINVER# kmod_module_get_softdeps@LIBKMOD_5 5~ kmod_module_get_symbols@LIBKMOD_5 5~ kmod_module_get_versions@LIBKMOD_5 5~ + kmod_module_get_weakdeps@LIBKMOD_5 32+20240327~ kmod_module_info_free_list@LIBKMOD_5 5~ kmod_module_info_get_key@LIBKMOD_5 5~ kmod_module_info_get_value@LIBKMOD_5 5~ diff --git a/debian/patches/no_tools_links b/debian/patches/no_tools_links index 3553989..dbb2d92 100644 --- a/debian/patches/no_tools_links +++ b/debian/patches/no_tools_links @@ -5,7 +5,7 @@ fi if BUILD_TOOLS - for tool in insmod lsmod rmmod depmod modprobe modinfo; do \ -- $(LN_S) kmod $(DESTDIR)$(bindir)/$$tool; \ +- $(LN_S) -f kmod $(DESTDIR)$(bindir)/$$tool; \ - done endif diff --git a/debian/rules b/debian/rules index 19b1189..a503015 100755 --- a/debian/rules +++ b/debian/rules @@ -71,7 +71,11 @@ build-udeb/.stamp-build: build-udeb/config.status override_dh_auto_build: build-deb/.stamp-build $(BUILD_UDEB_TARGET) override_dh_auto_test: +ifeq ($(DEB_HOST_ARCH_BITS)$(filter i386,$(DEB_HOST_ARCH_CPU)),32) + @echo "The test suite has been disabled on non-i386 32 bit architectures." +else dh_auto_test --builddir=build-deb +endif override_dh_auto_install: dh_auto_install --builddir=build-deb --destdir=$D |