Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2023-09-10 13:09:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
and /work/SRC/openSUSE:Factory/.dracut.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut"
Sun Sep 10 13:09:32 2023 rev:212 rq:1109709 version:059+suse.497.ga7feaf12
Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2023-08-12
15:06:01.314437617 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new.1766/dracut.changes 2023-09-10
13:09:56.725943868 +0200
@@ -1,0 +2,8 @@
+Fri Sep 08 09:51:48 UTC 2023 - antonio.fei...@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
+
+-------------------------------------------------------------------
Old:
----
dracut-059+suse.491.g87f19c22.obscpio
New:
----
dracut-059+suse.497.ga7feaf12.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.X2mMau/_old 2023-09-10 13:09:58.125993888 +0200
+++ /var/tmp/diff_new_pack.X2mMau/_new 2023-09-10 13:09:58.129994030 +0200
@@ -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 @@
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 @@
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 @@
%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 @@
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 @@
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 @@
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 @@
%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 @@
%{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
++++++ README.susemaint ++++++
--- /var/tmp/diff_new_pack.X2mMau/_old 2023-09-10 13:09:58.157995031 +0200
+++ /var/tmp/diff_new_pack.X2mMau/_new 2023-09-10 13:09:58.161995174 +0200
@@ -1,26 +1,82 @@
-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:
-
- 99example: Provide a useful description
-
- Explain the use cases for the module in more detail, give a general summary
of
- its purpose.
-
- Reference: bsc#4566
-
-2. Updating the OBS repo from git:
-
- rm dracut*.xz
- rm dracut*.obscpio
- osc service manualrun
- osc ar
- osc commit
- osc sr
+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
+
+Rules:
+
+- 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.
+
+Example, fix for https://bugzilla.opensuse.org/show_bug.cgi?id=1203749:
+
+```
+commit 92a6793c7d94a9a70c99ffcaf72112808164851b
+Author: Antonio Alvarez Feijoo <antonio.fei...@suse.com>
+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
+
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.X2mMau/_old 2023-09-10 13:09:58.189996174 +0200
+++ /var/tmp/diff_new_pack.X2mMau/_new 2023-09-10 13:09:58.193996317 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/opensuse/dracut.git</param>
- <param
name="changesrevision">99bc39eb41f1d3ca3e2cd8e50e0ed97aa33a9182</param></service></servicedata>
+ <param
name="changesrevision">a7feaf124e8b2fb26ef237d36b290de5e3320e6d</param></service></servicedata>
(No newline at EOF)
++++++ dracut-059+suse.491.g87f19c22.obscpio ->
dracut-059+suse.497.ga7feaf12.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-059+suse.491.g87f19c22/dracut.sh
new/dracut-059+suse.497.ga7feaf12/dracut.sh
--- old/dracut-059+suse.491.g87f19c22/dracut.sh 2023-08-11 10:29:40.000000000
+0200
+++ new/dracut-059+suse.497.ga7feaf12/dracut.sh 2023-09-08 11:50:28.000000000
+0200
@@ -1547,23 +1547,20 @@
if [[ $early_microcode == yes ]]; then
if [[ $hostonly ]]; then
- if [[ $(get_cpu_vendor) == "AMD" ]]; then
- check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
- elif [[ $(get_cpu_vendor) == "Intel" ]]; then
- check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
+ if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]];
then
+ check_kernel_config CONFIG_MICROCODE || unset early_microcode
else
unset early_microcode
fi
else
- ! check_kernel_config CONFIG_MICROCODE_AMD \
- && ! check_kernel_config CONFIG_MICROCODE_INTEL \
+ ! check_kernel_config CONFIG_MICROCODE \
&& unset early_microcode
fi
# Do not complain on non-x86 architectures as it makes no sense
case "${DRACUT_ARCH:-$(uname -m)}" in
x86_64 | i?86)
[[ $early_microcode != yes ]] \
- && dwarn "Disabling early microcode, because kernel does not
support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
+ && dwarn "Disabling early microcode, because kernel does not
support it. CONFIG_MICROCODE!=y"
;;
*) ;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-059+suse.491.g87f19c22/suse/README.susemaint
new/dracut-059+suse.497.ga7feaf12/suse/README.susemaint
--- old/dracut-059+suse.491.g87f19c22/suse/README.susemaint 2023-08-11
10:29:40.000000000 +0200
+++ new/dracut-059+suse.497.ga7feaf12/suse/README.susemaint 2023-09-08
11:50:28.000000000 +0200
@@ -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:
-
- 99example: Provide a useful description
-
- Explain the use cases for the module in more detail, give a general summary
of
- its purpose.
-
- Reference: bsc#4566
-
-2. Updating the OBS repo from git:
-
- rm dracut*.xz
- rm dracut*.obscpio
- osc service manualrun
- osc ar
- osc commit
- osc sr
+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
+
+Rules:
+
+- 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.
+
+Example, fix for https://bugzilla.opensuse.org/show_bug.cgi?id=1203749:
+
+```
+commit 92a6793c7d94a9a70c99ffcaf72112808164851b
+Author: Antonio Alvarez Feijoo <antonio.fei...@suse.com>
+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
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-059+suse.491.g87f19c22/suse/dracut.spec
new/dracut-059+suse.497.ga7feaf12/suse/dracut.spec
--- old/dracut-059+suse.491.g87f19c22/suse/dracut.spec 2023-08-11
10:29:40.000000000 +0200
+++ new/dracut-059+suse.497.ga7feaf12/suse/dracut.spec 2023-09-08
11:50:28.000000000 +0200
@@ -75,6 +75,7 @@
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
@@ -88,7 +89,9 @@
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
@@ -99,6 +102,7 @@
%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
@@ -114,8 +118,6 @@
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
@@ -164,8 +166,10 @@
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
@@ -205,41 +209,57 @@
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
@@ -326,6 +346,9 @@
%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
@@ -435,6 +458,11 @@
%{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
++++++ dracut.obsinfo ++++++
--- /var/tmp/diff_new_pack.X2mMau/_old 2023-09-10 13:09:58.490006892 +0200
+++ /var/tmp/diff_new_pack.X2mMau/_new 2023-09-10 13:09:58.490006892 +0200
@@ -1,5 +1,5 @@
name: dracut
-version: 059+suse.491.g87f19c22
-mtime: 1691742580
-commit: 87f19c22a1ec012937ba10b28aceb39500111605
+version: 059+suse.497.ga7feaf12
+mtime: 1694166628
+commit: a7feaf124e8b2fb26ef237d36b290de5e3320e6d
