From 32a19585eea2cbe8799568a16f6683a43787e478 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 7 Jun 2024 20:23:36 +0200 Subject: Merging debian version 102-3. Signed-off-by: Daniel Baumann --- debian/changelog | 7 +++++++ debian/dracut-network.install | 1 + debian/patches/fido-libz | 10 ---------- debian/patches/series | 1 - 4 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 debian/patches/fido-libz diff --git a/debian/changelog b/debian/changelog index 02748d8..6c0e96d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dracut (102-3) unstable; urgency=medium + + * add module net-lib, Closes: #1072744 + * remove obsolete patch fido-libz + + -- Thomas Lange Fri, 07 Jun 2024 13:57:47 +0200 + dracut (102-2~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/dracut-network.install b/debian/dracut-network.install index 3c6f5f5..d03294e 100644 --- a/debian/dracut-network.install +++ b/debian/dracut-network.install @@ -4,6 +4,7 @@ usr/lib/dracut/modules.d/35connman usr/lib/dracut/modules.d/35network-manager usr/lib/dracut/modules.d/35network-legacy usr/lib/dracut/modules.d/40network +usr/lib/dracut/modules.d/45net-lib usr/lib/dracut/modules.d/45url-lib usr/lib/dracut/modules.d/80cms usr/lib/dracut/modules.d/90kernel-network-modules diff --git a/debian/patches/fido-libz b/debian/patches/fido-libz deleted file mode 100644 index 64017f1..0000000 --- a/debian/patches/fido-libz +++ /dev/null @@ -1,10 +0,0 @@ ---- a/modules.d/91fido2/module-setup.sh -+++ b/modules.d/91fido2/module-setup.sh -@@ -21,6 +21,7 @@ - # Install required libraries. - _arch=${DRACUT_ARCH:-$(uname -m)} - inst_libdir_file \ -+ {"tls/$_arch/",tls/,"$_arch/",}"libz.so.*" \ - {"tls/$_arch/",tls/,"$_arch/",}"libfido2.so.*" \ - {"tls/$_arch/",tls/,"$_arch/",}"libz.so.*" \ - {"tls/$_arch/",tls/,"$_arch/",}"libcryptsetup.so.*" \ diff --git a/debian/patches/series b/debian/patches/series index 7d275c0..901d431 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ rpc-user udevsettle nm-path -fido-libz vconsole debian-initramfs-post-update.patch -- cgit v1.2.3