Bugzilla – Bug 1206798
Deprecate the %usrmerged macro
Last modified: 2024-05-27 22:04:54 UTC
When transitioning to usrmerged systemd we introduced the %usrmerged macro. Since there is no way back for Tumbleweed and already released distributions won't ever go for usrmerge, the macro is actually obsolete. It's sufficient to check for Tumbleweed which is usually done by checking %suse_version. So the %usrmerged macro in spec files needs to be removed. Of course spec files could manually set it based on %suse_version if that's convenient. Spec files just shouldn't rely on an externally set %usrmerged anymore.
This is an autogenerated message for OBS integration: This bug (1206798) was mentioned in https://build.opensuse.org/request/show/1055733 Factory / pam_mount https://build.opensuse.org/request/show/1055735 Factory / kmod https://build.opensuse.org/request/show/1055736 Factory / iproute2 https://build.opensuse.org/request/show/1055738 Factory / fuse https://build.opensuse.org/request/show/1055739 Factory / f2fs-tools https://build.opensuse.org/request/show/1055767 Factory / util-linux
This is an autogenerated message for OBS integration: This bug (1206798) was mentioned in https://build.opensuse.org/request/show/1055943 Factory / cryptsetup
This is an autogenerated message for OBS integration: This bug (1206798) was mentioned in https://build.opensuse.org/request/show/1055976 Factory / keyutils https://build.opensuse.org/request/show/1055977 Factory / ecryptfs-utils
This is an autogenerated message for OBS integration: This bug (1206798) was mentioned in https://build.opensuse.org/request/show/1056297 Factory / dmraid
This is an autogenerated message for OBS integration: This bug (1206798) was mentioned in https://build.opensuse.org/request/show/1056354 Factory / util-linux
This is an autogenerated message for OBS integration: This bug (1206798) was mentioned in https://build.opensuse.org/request/show/1056976 Factory / tcsh
This is an autogenerated message for OBS integration: This bug (1206798) was mentioned in https://build.opensuse.org/request/show/1057022 Factory / sysvinit https://build.opensuse.org/request/show/1057023 Factory / syslogd https://build.opensuse.org/request/show/1057024 Factory / scsh https://build.opensuse.org/request/show/1057025 Factory / rash https://build.opensuse.org/request/show/1057026 Factory / psmisc https://build.opensuse.org/request/show/1057027 Factory / procps https://build.opensuse.org/request/show/1057028 Factory / mksh https://build.opensuse.org/request/show/1057029 Factory / mingetty https://build.opensuse.org/request/show/1057030 Factory / mailx https://build.opensuse.org/request/show/1057031 Factory / mailutils https://build.opensuse.org/request/show/1057032 Factory / libreadline5 https://build.opensuse.org/request/show/1057034 Factory / blog https://build.opensuse.org/request/show/1057035 Factory / bash
This is an autogenerated message for OBS integration: This bug (1206798) was mentioned in https://build.opensuse.org/request/show/1057829 Factory / s390-tools
This is an autogenerated message for OBS integration: This bug (1206798) was mentioned in https://build.opensuse.org/request/show/1061060 Factory / wicked
SUSE-RU-2023:1694-1: An update that has two recommended fixes can now be installed. Category: recommended (moderate) Bug References: 1206798, 1208122 Sources used: openSUSE Leap 15.4 (src): lsvpd-1.7.14-150400.3.7.2 Basesystem Module 15-SP4 (src): lsvpd-1.7.14-150400.3.7.2 NOTE: This line indicates an update has been released for the listed product(s). At times this might be only a partial fix. If you have questions please reach out to maintenance coordination.
This is an autogenerated message for OBS integration: This bug (1206798) was mentioned in https://build.opensuse.org/request/show/1098358 Factory / rpm-config-SUSE
SUSE-RU-2023:2875-1: An update that contains one feature and has six recommended fixes can now be installed. Category: recommended (moderate) Bug References: 1194557, 1203300, 1206447, 1206674, 1206798, 1211026 Jira References: PED-90 Sources used: SUSE Linux Enterprise High Performance Computing 15 SP1 LTSS 15-SP1 (src): wicked-0.6.73-150100.3.32.1 SUSE Linux Enterprise Server 15 SP1 LTSS 15-SP1 (src): wicked-0.6.73-150100.3.32.1 SUSE Linux Enterprise Server for SAP Applications 15 SP1 (src): wicked-0.6.73-150100.3.32.1 SUSE CaaS Platform 4.0 (src): wicked-0.6.73-150100.3.32.1 NOTE: This line indicates an update has been released for the listed product(s). At times this might be only a partial fix. If you have questions please reach out to maintenance coordination.
AFAICT all packages are in, including rpm-config-SUSE so %usrmerged can be removed from the Factory prjconf. Dominique?
> grep -l "%{?usrmerged" */*.spec gcc12/gcc12.spec => uses its own, local setting gcc13/gcc13.spec => uses its own, local setting kernel-source/kernel-64kb.spec kernel-source/kernel-debug.spec kernel-source/kernel-default.spec kernel-source/kernel-kvmsmall.spec kernel-source/kernel-lpae.spec kernel-source/kernel-pae.spec kernel-source/kernel-vanilla.spec kernel-source/kernel-zfcpdump.spec => they seem to make modifications based on the usrmerged macro mdadm/mdadm.spec %if !0%{?usrmerged} mkdir -p %{buildroot}/sbin ln -s %{_sbindir}/mdadm %{buildroot}/sbin/mdadm ln -s %{_sbindir}/mdmon %{buildroot}/sbin/mdmon %endif nvidia-open-driver-G06-signed/nvidia-open-driver-G06-signed.spec %if 0%{?usrmerged} %define kernel_module_directory /usr/lib/modules %else %define kernel_module_directory /lib/modules %endif => not really all done
mdadm and nvidia slipped through the cracks indeed. fixes on the way The kernel defines usrmerged itself too, in a separate kernel-spec-macros file
ok, the kernel-module-subpackage macros file may still use it. Need to make sure suse-module-tools doesn't rely on the macro first: https://github.com/openSUSE/suse-module-tools/pull/75
This is an autogenerated message for OBS integration: This bug (1206798) was mentioned in https://build.opensuse.org/request/show/1104074 Factory / suse-module-tools
SUSE-RU-2024:0011-1: An update that contains three features and has four fixes can now be installed. Category: recommended (moderate) Bug References: 1029961, 1158830, 1206798, 1209122 Jira References: PED-3144, PED-3244, PED-6369 Sources used: openSUSE Leap Micro 5.3 (src): procps-3.3.17-150000.7.37.1 openSUSE Leap Micro 5.4 (src): procps-3.3.17-150000.7.37.1 openSUSE Leap 15.4 (src): procps-3.3.17-150000.7.37.1 openSUSE Leap 15.5 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Micro for Rancher 5.3 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Micro 5.3 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Micro for Rancher 5.4 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Micro 5.4 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Micro 5.5 (src): procps-3.3.17-150000.7.37.1 Basesystem Module 15-SP4 (src): procps-3.3.17-150000.7.37.1 Basesystem Module 15-SP5 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise High Performance Computing 15 SP1 LTSS 15-SP1 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise High Performance Computing 15 SP2 LTSS 15-SP2 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise High Performance Computing ESPOS 15 SP3 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise High Performance Computing LTSS 15 SP3 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Server 15 SP1 LTSS 15-SP1 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Server 15 SP2 LTSS 15-SP2 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Server 15 SP3 LTSS 15-SP3 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Server for SAP Applications 15 SP1 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Server for SAP Applications 15 SP2 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Server for SAP Applications 15 SP3 (src): procps-3.3.17-150000.7.37.1 SUSE Enterprise Storage 7.1 (src): procps-3.3.17-150000.7.37.1 SUSE CaaS Platform 4.0 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Micro 5.1 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Micro 5.2 (src): procps-3.3.17-150000.7.37.1 SUSE Linux Enterprise Micro for Rancher 5.2 (src): procps-3.3.17-150000.7.37.1 NOTE: This line indicates an update has been released for the listed product(s). At times this might be only a partial fix. If you have questions please reach out to maintenance coordination.
openSUSE-RU-2024:0144-1: An update that has two recommended fixes can now be installed. Category: recommended (moderate) Bug References: 1206798,1224057 CVE References: JIRA References: Sources used: openSUSE Backports SLE-15-SP5 (src): ksh-93vu-bp155.3.3.1