From 0d903d82d726ca8300aa38d4d2fe1e5d2504816a4fff694678dc2fb489e3cc41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 22 Jul 2024 17:00:00 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main dracut revision cd9f53c0aaa3cd82768f6a2b28df1a49 --- README.susemaint | 35 ++++++++++++++++++++++----- _service | 2 +- _servicedata | 2 +- dracut-059+suse.557.g8a62bf73.obscpio | 3 --- dracut-059+suse.586.ge0294756.obscpio | 3 +++ dracut.changes | 25 +++++++++++++++++++ dracut.obsinfo | 6 ++--- dracut.spec | 23 +++++------------- 8 files changed, 68 insertions(+), 31 deletions(-) delete mode 100644 dracut-059+suse.557.g8a62bf73.obscpio create mode 100644 dracut-059+suse.586.ge0294756.obscpio diff --git a/README.susemaint b/README.susemaint index 21c3ab1..8b45e33 100644 --- a/README.susemaint +++ b/README.susemaint @@ -6,11 +6,12 @@ Maintaining dracut Patches are added as merge requests on GitHub against the respective maintenance branch. Currently, these active maintenance branches are: -- SUSE/044 -> SLE 12 SP5 -- SUSE/049 -> SLE 15 SP2, SLE 15 SP3 -- SUSE/055 -> SLE 15 SP4 -- SLE-15-SP5_Update -> SLE 15 SP5 (based on SUSE/055 plus some specific patches) -- SUSE/059 -> Tumbleweed +- SUSE/044 -> SLE 12 SP5 +- SUSE/049 -> SLE 15 SP2, SLE 15 SP3 +- SUSE/055 -> SLE 15 SP4 +- SLE-15-SP5_Update -> SLE 15 SP5 (based on SUSE/055 plus some specific patches) +- SL-Micro-6.0_Update -> SL Micro 6.0 +- SUSE/059 -> Tumbleweed Rules: @@ -90,7 +91,7 @@ the upgrade to dracut-059 (0aa08f0e docs: update NEWS.md and AUTHORS), extracted using `git log --oneline 0aa08f0e..HEAD`: 4980bad3 fix(configure): misleading error if C compiler is not installed - de8ac630 fix(github): update format of labeler +MERGED de8ac630 fix(github): update format of labeler MERGED 4971f443 fix(systemd-journald): add systemd-sysusers dependency MERGED 4d594210 fix(dracut-initramfs-restore.sh): do not set selinux labels if disabled MERGED 1586af09 fix(systemd-repart): correct undefined $libdir @@ -336,3 +337,25 @@ PR Commit message 2618 fix(dracut-init.sh): handle decompress with `--sysroot` 2630 fix(zfcp_rules): correct shellcheck regression when parsing ccw args +3. Commits from the new https://github.com/dracut-ng/dracut-ng upstream that +were already merged + +6c55657e refactor(cms): use zdev to simplify handling CMSDASD=... boot option +53a5d10b refactor(cms): use consolidated zfcp config with zdev from s390-tools +168c0c66 refactor(cms): use consolidated dasd config with zdev from s390-tools +0b6d6952 refactor(cms): use consolidated network config with zdev from s390-tools +166e8a22 refactor(cms): remove now unnecessary inclusion of full s390utils-base +b5a35f9d feat(zfcp_rules): remove zfcp handling consolidated in s390-tools +7745a81a feat(zfcp): minimize zfcp handling consolidated in s390-tools +72c945ca feat(dasd_rules): remove dasd handling consolidated in s390-tools +2397c479 feat(dasd_mod): minimize dasd handling consolidated in s390-tools +36e1f884 feat(dasd): minimize dasd handling consolidated in s390-tools +658a21ac feat(znet): use zdev for consolidated device configuration +8707a69b docs(dracut.cmdline): generalize description of rd.znet +198a86c2 feat(qeth_rules): remove qeth handling consolidated in 95znet +22f51730 fix(znet): append to udev rules so each rd.znet_ifname is effective +2d8fa8be refactor(ifcfg): delete code duplication using iface_get_subchannels() +457e66e6 feat(ifcfg): minimize s390-specific network configuration aspects +3fd43858 fix(mdraid): try to assemble the missing raid device +61ab3386 feat(crypt): force the inclusion of crypttab entries with x-initrd.attach + diff --git a/_service b/_service index 3bf76d1..b757404 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/opensuse/dracut.git - SUSE/059 + SLFO_Main @PARENT_TAG@+suse.@TAG_OFFSET@.g%h suse/dracut.spec suse/README.susemaint diff --git a/_servicedata b/_servicedata index aed57b8..d589458 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/opensuse/dracut.git - 4d203e0423d5ae54db94788aca7c9f31240b9bbb \ No newline at end of file + 021020a3d01bb34232146a5f5613683c27afadcd \ No newline at end of file diff --git a/dracut-059+suse.557.g8a62bf73.obscpio b/dracut-059+suse.557.g8a62bf73.obscpio deleted file mode 100644 index 2d99cac..0000000 --- a/dracut-059+suse.557.g8a62bf73.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0844f6910fefccce60d956e1fd038e3ec6d16e821f2432f06a7a731bbac845d4 -size 2120204 diff --git a/dracut-059+suse.586.ge0294756.obscpio b/dracut-059+suse.586.ge0294756.obscpio new file mode 100644 index 0000000..b3449de --- /dev/null +++ b/dracut-059+suse.586.ge0294756.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e933acb2ad84e8e65436dbd49b2e27bb80b8d5c85b76dd88adabb274d8cc7b1e +size 2120716 diff --git a/dracut.changes b/dracut.changes index caffd09..5b19c97 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Jul 08 10:29:40 UTC 2024 - antonio.feijoo@suse.com + +- Update to version 059+suse.586.ge0294756: + * feat(crypt): force the inclusion of crypttab entries with x-initrd.attach (bsc#1226529) + * fix(mdraid): try to assemble the missing raid device (bsc#1226412) + * feat(ifcfg): minimize s390-specific network configuration aspects + * refactor(ifcfg): delete code duplication using iface_get_subchannels() + * fix(znet): append to udev rules so each rd.znet_ifname is effective + * feat(qeth_rules): remove qeth handling consolidated in 95znet + * docs(dracut.cmdline): generalize description of rd.znet + * feat(znet): use zdev for consolidated device configuration + * feat(dasd): minimize dasd handling consolidated in s390-tools + * feat(dasd_mod): minimize dasd handling consolidated in s390-tools + * feat(dasd_rules): remove dasd handling consolidated in s390-tools + * feat(zfcp): minimize zfcp handling consolidated in s390-tools + * feat(zfcp_rules): remove zfcp handling consolidated in s390-tools + * refactor(cms): remove now unnecessary inclusion of full s390utils-base + * refactor(cms): use consolidated network config with zdev from s390-tools + * refactor(cms): use consolidated dasd config with zdev from s390-tools + * refactor(cms): use consolidated zfcp config with zdev from s390-tools + * refactor(cms): use zdev to simplify handling CMSDASD=... boot option + * fix(github): update format of labeler + * fix(dracut-install): continue parsing if ldd prints "cannot be preloaded" (bsc#1208690) + ------------------------------------------------------------------- Wed Feb 28 08:05:09 UTC 2024 - antonio.feijoo@suse.com diff --git a/dracut.obsinfo b/dracut.obsinfo index 6c85349..8a7421a 100644 --- a/dracut.obsinfo +++ b/dracut.obsinfo @@ -1,4 +1,4 @@ name: dracut -version: 059+suse.557.g8a62bf73 -mtime: 1709107404 -commit: 8a62bf7337c9d1960daa96db64b1af92b8dfbd8e +version: 059+suse.586.ge0294756 +mtime: 1719919781 +commit: e029475601f44a066ae151ba0faf9bddcdbfdb1b diff --git a/dracut.spec b/dracut.spec index d96d927..1de5176 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,7 +1,7 @@ # # spec file for package dracut # -# Copyright (c) 2024 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - %define dracutlibdir %{_prefix}/lib/dracut %if 0%{?suse_version} >= 1550 @@ -25,10 +24,10 @@ %endif Name: dracut -Version: 059+suse.557.g8a62bf73 +Version: 059+suse.586.ge0294756 Release: 0 Summary: Event driven initramfs infrastructure -License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later +License: GPLv2+ and LGPLv2+ and GPLv2 Group: System/Base URL: https://github.com/dracutdevs/dracut/wiki Source0: dracut-%{version}.tar.xz @@ -36,16 +35,16 @@ Source1: dracut-rpmlintrc Source2: README.susemaint BuildRequires: asciidoc BuildRequires: bash -BuildRequires: cargo BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt -BuildRequires: rust BuildRequires: pkgconfig(libkmod) BuildRequires: pkgconfig(systemd) >= 219 +BuildRequires: cargo +BuildRequires: rust +Requires: gawk Requires: %{_bindir}/get_kernel_version Requires: bash Requires: coreutils -Requires: gawk Requires(post): coreutils Requires: cpio Requires: elfutils @@ -147,11 +146,8 @@ rm -rf %{buildroot}%{dracutlibdir}/modules.d/81cio_ignore rm -rf %{buildroot}%{dracutlibdir}/modules.d/91zipl rm -rf %{buildroot}%{dracutlibdir}/modules.d/95dasd rm -rf %{buildroot}%{dracutlibdir}/modules.d/95dasd_mod -rm -rf %{buildroot}%{dracutlibdir}/modules.d/95dasd_rules rm -rf %{buildroot}%{dracutlibdir}/modules.d/95dcssblk -rm -rf %{buildroot}%{dracutlibdir}/modules.d/95qeth_rules rm -rf %{buildroot}%{dracutlibdir}/modules.d/95zfcp -rm -rf %{buildroot}%{dracutlibdir}/modules.d/95zfcp_rules rm -rf %{buildroot}%{dracutlibdir}/modules.d/95znet %else rm -rf %{buildroot}%{dracutlibdir}/modules.d/00warpclock @@ -434,7 +430,6 @@ fi %{dracutlibdir}/modules.d/95cifs %ifarch s390 s390x %{dracutlibdir}/modules.d/95dasd_mod -%{dracutlibdir}/modules.d/95dasd_rules %{dracutlibdir}/modules.d/95dcssblk %endif %{dracutlibdir}/modules.d/95debug @@ -446,9 +441,6 @@ fi %{dracutlibdir}/modules.d/95nbd %{dracutlibdir}/modules.d/95nfs %{dracutlibdir}/modules.d/95nvmf -%ifarch s390 s390x -%{dracutlibdir}/modules.d/95qeth_rules -%endif %{dracutlibdir}/modules.d/95resume %{dracutlibdir}/modules.d/95rootfs-block %{dracutlibdir}/modules.d/95ssh-client @@ -456,9 +448,6 @@ fi %{dracutlibdir}/modules.d/95udev-rules %{dracutlibdir}/modules.d/95virtfs %{dracutlibdir}/modules.d/95virtiofs -%ifarch s390 s390x -%{dracutlibdir}/modules.d/95zfcp_rules -%endif %{dracutlibdir}/modules.d/97biosdevname %ifarch %ix86 %exclude %{dracutlibdir}/modules.d/96securityfs