From cf6b708a6b4e626d7c88deb6927d17515d20d8a83f4c91bfd47195f1530a52ae Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 18 Jan 2022 17:00:29 +0000 Subject: [PATCH] Accepting request 946940 from home:afeijoo:branches:openSUSE:Factory - Update to version 055+suse.194.gdd41932a: * fix(network-legacy): add wicked as an alternative to arping (bsc#1193670) * fix(network): add wicked as an alternative to arping (bsc#1193670) - Update to version 055+suse.191.g67eb4ea8: * fix(dracut-initramfs-restore.sh): add test for SUSE initrd name (bsc#1194570) * fix(dracut.spec): require util-linux-systemd (bsc#1194162) * fix(network-wicked): multiple path corrections * fix(drm): add privacy screen modules to the initrd (bsc#1193590) * fix(dracut.spec): update usrmerged mkinitrd dir * fix(url-lib): improve ca-bundle detection (bsc#1175892) OBS-URL: https://build.opensuse.org/request/show/946940 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=451 --- _servicedata | 2 +- dracut-055+suse.179.g3cf989c2.obscpio | 3 --- dracut-055+suse.194.gdd41932a.obscpio | 3 +++ dracut.changes | 18 ++++++++++++++++++ dracut.obsinfo | 6 +++--- dracut.spec | 26 +++++++++++++------------- 6 files changed, 38 insertions(+), 20 deletions(-) delete mode 100644 dracut-055+suse.179.g3cf989c2.obscpio create mode 100644 dracut-055+suse.194.gdd41932a.obscpio diff --git a/_servicedata b/_servicedata index b61e227..ff8bf0e 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/opensuse/dracut.git - 83368e246ecc7deb2f4377bb93530b5b1654855f \ No newline at end of file + 11521375426fa21ef03a7701b4b587478809f263 \ No newline at end of file diff --git a/dracut-055+suse.179.g3cf989c2.obscpio b/dracut-055+suse.179.g3cf989c2.obscpio deleted file mode 100644 index a3753a6..0000000 --- a/dracut-055+suse.179.g3cf989c2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4c2fd7d38ed9cb1d362c76bb25c4bc69a4cc9128a7a47c385971805b3fc9d47 -size 2013708 diff --git a/dracut-055+suse.194.gdd41932a.obscpio b/dracut-055+suse.194.gdd41932a.obscpio new file mode 100644 index 0000000..ce315b7 --- /dev/null +++ b/dracut-055+suse.194.gdd41932a.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a42b6589c5065dee1e35be68fdc6b07527fe1b3fc4e0973fad316039de47f65 +size 2015756 diff --git a/dracut.changes b/dracut.changes index 6398e51..6fcec09 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Jan 17 11:20:56 UTC 2022 - antonio.feijoo@suse.com + +- Update to version 055+suse.194.gdd41932a: + * fix(network-legacy): add wicked as an alternative to arping (bsc#1193670) + * fix(network): add wicked as an alternative to arping (bsc#1193670) + +------------------------------------------------------------------- +Mon Jan 17 09:45:53 UTC 2022 - antonio.feijoo@suse.com + +- Update to version 055+suse.191.g67eb4ea8: + * fix(dracut-initramfs-restore.sh): add test for SUSE initrd name (bsc#1194570) + * fix(dracut.spec): require util-linux-systemd (bsc#1194162) + * fix(network-wicked): multiple path corrections + * fix(drm): add privacy screen modules to the initrd (bsc#1193590) + * fix(dracut.spec): update usrmerged mkinitrd dir + * fix(url-lib): improve ca-bundle detection (bsc#1175892) + ------------------------------------------------------------------- Thu Dec 09 19:35:36 UTC 2021 - ddiss@suse.com diff --git a/dracut.obsinfo b/dracut.obsinfo index b345825..bd11a97 100644 --- a/dracut.obsinfo +++ b/dracut.obsinfo @@ -1,5 +1,5 @@ name: dracut -version: 055+suse.179.g3cf989c2 -mtime: 1638957245 -commit: 3cf989c235a7bebd1273e93b7c4f6960f4772a18 +version: 055+suse.194.gdd41932a +mtime: 1642418207 +commit: dd41932a78c4b1934f4876de169c1dcf205c713f diff --git a/dracut.spec b/dracut.spec index fd24856..edf8cae 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,7 +1,7 @@ # # spec file for package dracut # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,8 +18,14 @@ %define dracutlibdir %{_prefix}/lib/dracut +%if 0%{?suse_version} >= 1550 +%define dracut_sbindir %{_sbindir} +%else +%define dracut_sbindir /sbin +%endif + Name: dracut -Version: 055+suse.179.g3cf989c2 +Version: 055+suse.194.gdd41932a Release: 0 Summary: Initramfs generator using udev License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -56,11 +62,12 @@ Requires: systemd >= 219 Requires: systemd-sysvinit Requires: udev > 166 Requires: util-linux >= 2.21 +Requires: util-linux-systemd >= 2.36.2 Recommends: xz Requires: zstd # We use 'btrfs fi usage' that was not present before Conflicts: btrfsprogs < 3.18 -# suse-module-tools >= 16.0.3 is prepared for the removal of mkinitrd-suse.sh +# suse-module-tools >= 15.4.7 is prepared for the removal of mkinitrd-suse.sh Conflicts: suse-module-tools < 15.4.7 %{?systemd_requires} @@ -122,6 +129,7 @@ Group: System/Base Requires: %{name} = %{version}-%{release} Requires: dracut Obsoletes: mkinitrd < 2.8.2 +Provides: dracut:/sbin/mkinitrd Provides: mkinitrd = 2.8.2 %description mkinitrd-deprecated @@ -158,11 +166,7 @@ install -m 0644 dracut.conf.d/ima.conf.example %{buildroot}%{_sysconfdir}/dracut install -m 0644 suse/s390x_persistent_device.conf %{buildroot}%{_sysconfdir}/dracut.conf.d/10-s390x_persistent_device.conf %endif -%if 0%{?suse_version} < 1550 - install -D -m 0755 suse/mkinitrd-suse.sh %{buildroot}/sbin/mkinitrd -%else - install -D -m 0755 suse/mkinitrd-suse.sh %{buildroot}/%{_sbindir}/mkinitrd -%endif +install -D -m 0755 suse/mkinitrd-suse.sh %{buildroot}/%{dracut_sbindir}/mkinitrd mv %{buildroot}%{_mandir}/man8/mkinitrd-suse.8 %{buildroot}%{_mandir}/man8/mkinitrd.8 @@ -254,11 +258,7 @@ fi %{dracutlibdir}/modules.d/95znet %files mkinitrd-deprecated -%if 0%{?suse_version} < 1550 - /sbin/mkinitrd -%else - %{_sbindir}/mkinitrd -%endif +%{dracut_sbindir}/mkinitrd %{_mandir}/man8/mkinitrd.8* %files