From b1fdf87710cec27be137f11621b863c8e2b13b10 Mon Sep 17 00:00:00 2001
From: afeijoo <>
Date: Sep 10 2023 11:18:15 +0000
Subject: Update dracut to version 059+suse.497.ga7feaf12 / rev 212 via SR 1109709
https://build.opensuse.org/request/show/1109709
by user afeijoo + anag+factory
---
diff --git a/.files b/.files
index 2d73b72..d7fd377 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 92aa69a..0f1149f 100644
--- a/.rev
+++ b/.rev
@@ -2242,4 +2242,12 @@ and stuff that has no relevance to the end user (i.e CI related commits) (forwar
1103459
+
+ 9767cd496cde9c7472f46e76b9e6b58c
+ 059+suse.497.ga7feaf12
+
+ anag+factory
+
+ 1109709
+
diff --git a/README.susemaint b/README.susemaint
index 8e1e773..0f47949 100644
--- a/README.susemaint
+++ b/README.susemaint
@@ -1,25 +1,81 @@
-Maintaining Dracut
+Maintaining dracut
==================
1. Adding/Submitting patches:
-Patches get added as merge requests on Github against the respective maintenance branch.
-If the dracut version is 049, the maintenance branch is SUSE/049. Please make sure
-to provide an adiquate patch description. If you fix a modules, please prepend the module
-name in the first line. Also add bugzilla and fate references in their own line:
+Patches are added as merge requests on GitHub against the respective maintenance
+branch. Currently, these active maintenance branches are:
- 99example: Provide a useful description
+- 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
- Explain the use cases for the module in more detail, give a general summary of
- its purpose.
+Rules:
- Reference: bsc#4566
+- Follow the commit message convention [1].
+- Write related Bugzilla ID in the commit message (the dracut.changes file is
+ updated automatically from the information of the patch).
+- If the Bugzilla ID cannot be added to the commit title because the length is
+ greater than 80 characters (the maximum allowed), then write it into the
+ commit description (it must be manually added to dracut.changes prior to OBS
+ submission).
+- To indicate backports of upstream commits use `git cherry-pick -x` (this
+ automatically appends "cherry picked from commit xxxxx").
+- First, check if your patch can be submitted upstream, and if so, do it there
+ first. Once approved, it can be backported here.
-2. Updating the OBS repo from git:
+Example, fix for https://bugzilla.opensuse.org/show_bug.cgi?id=1203749:
+
+```
+commit 92a6793c7d94a9a70c99ffcaf72112808164851b
+Author: Antonio Alvarez Feijoo
+Date: Wed Sep 21 11:54:17 2022 +0200
+
+ fix(systemd): add missing modprobe@.service (bsc#1203749)
+
+ sys-kernel-config.mount needs modprobe@configfs.service since systemd v246.7
+ (https://github.com/systemd/systemd/commit/42cc2855), so the kernel configfs
+ fails to mount in the initrd.
+
+ (cherry picked from commit 928252a145ca44627ba5873e01245eabe246992f)
+```
+
+2. Updating the OBS repo:
+
+2.1. Branch dracut
+
+- Go to the Factory OBS repo [2] and "Branch Package".
+- Checkout branch with `osc`:
+
+ $ osc checkout home:USER:branches:openSUSE:Factory/dracut
+
+2.2. Trigger services and build the package
+
+ $ rm dracut*.xz
+ $ rm dracut*.obscpio
+ $ osc service manualrun
+ $ osc ar
+
+ * Verify that the new Bugzilla IDs are referenced in the dracut.changes file.
+
+2.3. Commit the changes
+
+ $ osc commit
+
+ * Verify that the package is correctly built in the OBS branch.
+ * Test the built package and make sure it fixes the bug.
+
+2.4. Create request to submit source
+
+ $ osc sr
+
+ * The request is submitted against the OBS Devel repo [3].
+
+
+--
+[1] Commit message convention: https://github.com/dracutdevs/dracut/blob/master/docs/HACKING.md#commit-messages
+[2] Factory OBS repo: https://build.opensuse.org/package/show/openSUSE:Factory/dracut
+[3] Factory OBS Devel repo: https://build.opensuse.org/package/show/Base:System/dracut
- rm dracut*.xz
- rm dracut*.obscpio
- osc service manualrun
- osc ar
- osc commit
- osc sr
diff --git a/_servicedata b/_servicedata
index 3254077..18e3de8 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/opensuse/dracut.git
- 99bc39eb41f1d3ca3e2cd8e50e0ed97aa33a9182
\ No newline at end of file
+ a7feaf124e8b2fb26ef237d36b290de5e3320e6d
\ No newline at end of file
diff --git a/dracut-059+suse.491.g87f19c22.obscpio b/dracut-059+suse.491.g87f19c22.obscpio
deleted file mode 120000
index de78f22..0000000
--- a/dracut-059+suse.491.g87f19c22.obscpio
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeif4w5ietmbd3dcyk4m62sgi3n4ep2n2vcfsd34ti4snzd2rm7oogq
\ No newline at end of file
diff --git a/dracut-059+suse.497.ga7feaf12.obscpio b/dracut-059+suse.497.ga7feaf12.obscpio
new file mode 120000
index 0000000..2cc8847
--- /dev/null
+++ b/dracut-059+suse.497.ga7feaf12.obscpio
@@ -0,0 +1 @@
+/ipfs/bafybeiccxjkdrqcoiwq4qp2p22i4424iy6icey6lp2lf3esgi5qtu7qdu4
\ No newline at end of file
diff --git a/dracut.changes b/dracut.changes
index f0509de..010021a 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Fri Sep 08 09:51:48 UTC 2023 - antonio.feijoo@suse.com
+
+- Update to version 059+suse.497.ga7feaf12:
+ * chore(suse): disable fips and ima subpackages for i?86
+ * fix(dracut.sh): remove microcode check based on CONFIG_MICROCODE_[AMD|INTEL]
+ * chore(suse): update SUSE maintainers doc
+
+-------------------------------------------------------------------
Fri Aug 11 08:32:42 UTC 2023 - antonio.feijoo@suse.com
- Update to version 059+suse.491.g87f19c22:
diff --git a/dracut.obsinfo b/dracut.obsinfo
index 525dc44..9c7a3a2 100644
--- a/dracut.obsinfo
+++ b/dracut.obsinfo
@@ -1,4 +1,4 @@
name: dracut
-version: 059+suse.491.g87f19c22
-mtime: 1691742580
-commit: 87f19c22a1ec012937ba10b28aceb39500111605
+version: 059+suse.497.ga7feaf12
+mtime: 1694166628
+commit: a7feaf124e8b2fb26ef237d36b290de5e3320e6d
diff --git a/dracut.spec b/dracut.spec
index f2c8356..bfb237f 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -25,7 +25,7 @@
%endif
Name: dracut
-Version: 059+suse.491.g87f19c22
+Version: 059+suse.497.ga7feaf12
Release: 0
Summary: Event driven initramfs infrastructure
License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -76,6 +76,7 @@ Dracut contains various modules which are driven by the event-based udev
and systemd. Having root on MD, DM, LVM2, LUKS is supported as well as
NFS, iSCSI, NBD, FCoE.
+%ifnarch %ix86
%package fips
Summary: Dracut modules to build a dracut initramfs with an integrity check
Group: System/Base
@@ -89,7 +90,9 @@ Requires: libopenssl1_1-hmac
This package requires everything which is needed to build an
initramfs with dracut, which does an integrity check of the kernel
and its cryptography during startup.
+%endif
+%ifnarch %ix86
%package ima
Summary: Dracut modules to build a dracut initramfs with IMA
Group: System/Base
@@ -100,6 +103,7 @@ Requires: keyutils
%description ima
This package requires everything which is needed to build an
initramfs (using dracut) which tries to load an IMA policy during startup.
+%endif
%package tools
Summary: Tools to build a local initramfs
@@ -115,8 +119,6 @@ This package contains tools to assemble the local initrd and host configuration.
Summary: Dracut modules usually not required for normal operation
Group: System/Base
Requires: %{name} = %{version}-%{release}
-Requires: evmctl
-Requires: keyutils
%description extra
This package contains all modules that are part of dracut upstream
@@ -165,8 +167,10 @@ touch %{buildroot}%{_localstatedir}/log/dracut.log
install -D -m 0644 dracut.conf.d/suse.conf.example %{buildroot}%{dracutlibdir}/dracut.conf.d/01-dist.conf
install -m 0644 suse/99-debug.conf %{buildroot}%{_sysconfdir}/dracut.conf.d/99-debug.conf
+%ifnarch %ix86
install -m 0644 dracut.conf.d/fips.conf.example %{buildroot}%{_sysconfdir}/dracut.conf.d/40-fips.conf
install -m 0644 dracut.conf.d/ima.conf.example %{buildroot}%{_sysconfdir}/dracut.conf.d/40-ima.conf
+%endif
# bsc#915218
%ifarch s390 s390x
install -m 0644 suse/s390x_persistent_policy.conf %{buildroot}%{_sysconfdir}/dracut.conf.d/10-persistent_policy.conf
@@ -206,41 +210,57 @@ if [ -L /var/run ] && [ -f /etc/dracut.conf.d/05-convertfs.conf ]; then
fi
%{?regenerate_initrd_post}
+%ifnarch %ix86
%post fips
%{?regenerate_initrd_post}
+%endif
+%ifnarch %ix86
%post ima
%{?regenerate_initrd_post}
+%endif
%postun
%{?regenerate_initrd_post}
+%ifnarch %ix86
%postun fips
%{?regenerate_initrd_post}
+%endif
+%ifnarch %ix86
%postun ima
%{?regenerate_initrd_post}
+%endif
%posttrans
%{?regenerate_initrd_posttrans}
+%ifnarch %ix86
%posttrans fips
%{?regenerate_initrd_posttrans}
+%endif
+%ifnarch %ix86
%posttrans ima
%{?regenerate_initrd_posttrans}
+%endif
+%ifnarch %ix86
%files fips
%license COPYING
%config %{_sysconfdir}/dracut.conf.d/40-fips.conf
%{dracutlibdir}/modules.d/01fips
+%endif
+%ifnarch %ix86
%files ima
%license COPYING
%config %{_sysconfdir}/dracut.conf.d/40-ima.conf
%{dracutlibdir}/modules.d/96securityfs
%{dracutlibdir}/modules.d/97masterkey
%{dracutlibdir}/modules.d/98integrity
+%endif
%files tools
%{_bindir}/dracut-catimages
@@ -327,6 +347,9 @@ fi
%ifnarch s390 s390x
%{dracutlibdir}/modules.d/00warpclock
%endif
+%ifarch %ix86
+%exclude %{dracutlibdir}/modules.d/01fips
+%endif
%{dracutlibdir}/modules.d/01systemd-ac-power
%{dracutlibdir}/modules.d/01systemd-ask-password
%{dracutlibdir}/modules.d/01systemd-coredump
@@ -436,6 +459,11 @@ fi
%{dracutlibdir}/modules.d/95zfcp_rules
%endif
%{dracutlibdir}/modules.d/97biosdevname
+%ifarch %ix86
+%exclude %{dracutlibdir}/modules.d/96securityfs
+%exclude %{dracutlibdir}/modules.d/97masterkey
+%exclude %{dracutlibdir}/modules.d/98integrity
+%endif
%{dracutlibdir}/modules.d/98dracut-systemd
%{dracutlibdir}/modules.d/98ecryptfs
%{dracutlibdir}/modules.d/98pollcdrom