diff --git a/README.susemaint b/README.susemaint index 3ab05b1..41dc149 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: @@ -336,3 +337,9 @@ 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 + +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 3c05d9d..1da5cb9 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/opensuse/dracut.git - SUSE/059 + SL-Micro-6.0_Update @PARENT_TAG@+suse.@TAG_OFFSET@.g%h suse/dracut.spec suse/README.susemaint diff --git a/_servicedata b/_servicedata index 8315d65..4de7672 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/opensuse/dracut.git - 4d203e0423d5ae54db94788aca7c9f31240b9bbb \ No newline at end of file + 003f23a82384e13625c68b2780cfa718b7d8d2d6 \ 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 ea5d9fb..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.571.g32b61281.obscpio b/dracut-059+suse.571.g32b61281.obscpio new file mode 100644 index 0000000..799eccb --- /dev/null +++ b/dracut-059+suse.571.g32b61281.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e3e05900d6e87f90e02be36b691149d12ca97d272145528d1a4f980c73c1019 +size 2121740 diff --git a/dracut.changes b/dracut.changes index 56200d0..e12b7e2 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Aug 23 07:16:49 UTC 2024 - antonio.feijoo@suse.com + +- Update to version 059+suse.571.g32b61281: + * feat(systemd*): include systemd config files from /usr/lib/systemd (bsc#1228398) + * fix(convertfs): error in conditional expressions (bsc#1228847) + +------------------------------------------------------------------- +Mon Jul 08 10:49:23 UTC 2024 - antonio.feijoo@suse.com + +- Update to version 059+suse.567.gadd3169d: + * 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) + * 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 b2946d2..7f8613a 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.571.g32b61281 +mtime: 1724134987 +commit: 32b61281cd24b4cdb676b5a4af5228ca022e9661 diff --git a/dracut.spec b/dracut.spec index c1b4c83..a112da3 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.571.g32b61281 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