diff --git a/files.container b/files.container index 181cd26c..a5445635 100644 --- a/files.container +++ b/files.container @@ -30,7 +30,7 @@ %{_mandir}/man5/org.freedesktop.machine1.5.gz %{_mandir}/man8/systemd-machined.8.gz %{_mandir}/man8/systemd-machined.service.8.gz -%{_systemd_util_dir}/scripts/fix-machines-btrfs-subvol.sh +%{_systemd_util_dir}/rpm/fixlet-container-machines-btrfs-subvol.sh %{_systemd_util_dir}/systemd-machined %{_tmpfilesdir}/systemd-nspawn.conf %{_unitdir}/dbus-org.freedesktop.machine1.service diff --git a/files.systemd b/files.systemd index e2be4037..95f44378 100644 --- a/files.systemd +++ b/files.systemd @@ -44,7 +44,7 @@ %dir %{_systemd_user_env_generator_dir} %dir %{_systemd_util_dir} %dir %{_systemd_util_dir}/ntp-units.d -%dir %{_systemd_util_dir}/scripts +%dir %{_systemd_util_dir}/rpm %dir %{_systemd_util_dir}/system-preset %dir %{_systemd_util_dir}/system-shutdown %dir %{_systemd_util_dir}/system-sleep @@ -440,8 +440,8 @@ %{_sysctldir}/99-sysctl.conf %{_systemd_user_env_generator_dir}/30-systemd-environment-d-generator %{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list -%{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh -%{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh +%{_systemd_util_dir}/rpm/fixlet-migrate-sysconfig-i18n.sh +%{_systemd_util_dir}/rpm/fixlet-upgrade-from-sysvinit.sh %{_systemd_util_dir}/system-preset/99-default.preset %{_systemd_util_dir}/systemd %{_systemd_util_dir}/systemd-binfmt diff --git a/scripts-systemd-fix-machines-btrfs-subvol.sh b/fixlet-container-machines-btrfs-subvol.sh similarity index 100% rename from scripts-systemd-fix-machines-btrfs-subvol.sh rename to fixlet-container-machines-btrfs-subvol.sh diff --git a/scripts-systemd-migrate-sysconfig-i18n.sh b/fixlet-migrate-sysconfig-i18n.sh similarity index 100% rename from scripts-systemd-migrate-sysconfig-i18n.sh rename to fixlet-migrate-sysconfig-i18n.sh diff --git a/scripts-systemd-upgrade-from-pre-210.sh b/fixlet-upgrade-from-sysvinit.sh similarity index 100% rename from scripts-systemd-upgrade-from-pre-210.sh rename to fixlet-upgrade-from-sysvinit.sh diff --git a/systemd.changes b/systemd.changes index bc46bcfe..70f67463 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 4 09:32:44 UTC 2023 - Franck Bui + +- Make use of %_systemd_util_dir in the spec file. + +- Rename the SUSE specific scripts used to fix up the system where systemd is + installed on. Also rename the directory where these scripts are stored. + ------------------------------------------------------------------- Thu May 4 08:40:15 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 363cfb97..0e843727 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ %define min_kernel_version 4.5 %define archive_version +suse.28.g25aec15788 -%define _testsuitedir /usr/lib/systemd/tests +%define _testsuitedir %{_systemd_util_dir}/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit # Similar to %%with but returns true/false. The 'true' value can be redefined @@ -176,9 +176,9 @@ Source6: baselibs.conf Source11: after-local.service Source14: kbd-model-map.legacy -Source100: scripts-systemd-fix-machines-btrfs-subvol.sh -Source101: scripts-systemd-upgrade-from-pre-210.sh -Source102: scripts-systemd-migrate-sysconfig-i18n.sh +Source100: fixlet-container-machines-btrfs-subvol.sh +Source101: fixlet-upgrade-from-sysvinit.sh +Source102: fixlet-migrate-sysconfig-i18n.sh Source200: files.systemd Source201: files.udev @@ -748,7 +748,7 @@ export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" %if %{with sd_boot} %ifarch x86_64 -export BRP_PESIGN_FILES="/usr/lib/systemd/boot/efi/systemd-bootx64.efi" +export BRP_PESIGN_FILES="%{_systemd_util_dir}/boot/efi/systemd-bootx64.efi" %endif %endif @@ -766,14 +766,13 @@ install -m0755 -D %{SOURCE4} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-inst mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn -# Package the scripts used to fix all packaging issues. Also drop the -# "scripts-{systemd/udev}" prefix which is used because osc doesn't allow -# directories in the workspace... +# Install the fixlets +mkdir -p %{buildroot}%{_systemd_util_dir}/rpm %if %{with machined} -install -m0755 -D %{SOURCE100} %{buildroot}%{_systemd_util_dir}/scripts/fix-machines-btrfs-subvol.sh +install -m0755 %{SOURCE100} %{buildroot}%{_systemd_util_dir}/rpm/ %endif -install -m0755 -D %{SOURCE101} %{buildroot}%{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh -install -m0755 -D %{SOURCE102} %{buildroot}%{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh +install -m0755 %{SOURCE101} %{buildroot}%{_systemd_util_dir}/rpm/ +install -m0755 %{SOURCE102} %{buildroot}%{_systemd_util_dir}/rpm/ %if %{with split_usr} mkdir -p %{buildroot}/{bin,sbin} @@ -849,8 +848,8 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/catalog mkdir -p %{buildroot}%{_ntpunitsdir} # Make sure the shutdown/sleep drop-in dirs exist. -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-shutdown/ -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/ +mkdir -p %{buildroot}%{_systemd_util_dir}/system-shutdown/ +mkdir -p %{buildroot}%{_systemd_util_dir}/system-sleep/ # Make sure these directories are properly owned. mkdir -p %{buildroot}%{_unitdir}/basic.target.wants @@ -1049,7 +1048,7 @@ if [ -L %{_localstatedir}/lib/systemd/timesync ]; then fi # This includes all hacks needed when upgrading from SysV. -%{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : +%{_systemd_util_dir}/rpm/fixlet-upgrade-from-sysvinit.sh || : # Migrate old i18n settings previously configured in /etc/sysconfig to the new # locations used by systemd (/etc/locale.conf, /etc/vconsole.conf, ...). Recent @@ -1060,7 +1059,7 @@ fi # is being installed). # # It's run only once. -%{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || : +%{_systemd_util_dir}/rpm/fixlet-migrate-sysconfig-i18n.sh || : %postun # daemon-reload is implied by systemd_postun_with_restart @@ -1147,7 +1146,7 @@ if [ $1 -gt 1 ]; then # if needed. See bsc#992573. The installer has been fixed to create it # at installation time. # - # The convertion might only be problematic for openSUSE distros + # The conversion might only be problematic for openSUSE distros # (TW/Factory) where previous versions had already created the subvolume # at the wrong place (via tmpfiles for example) and user started to # populate and use it. In this case we'll let the user fix it manually. @@ -1156,7 +1155,7 @@ if [ $1 -gt 1 ]; then # v210 to v228 when we added this workaround. Note that the subvolume is # still created at the wrong place due to the call to tmpfiles_create # macro previously however it's empty so there shouldn't be any issues. - %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : + %{_systemd_util_dir}/rpm/fixlet-container-machines-btrfs-subvol.sh || : fi %preun container @@ -1341,9 +1340,9 @@ fi %{_unitdir}/systemd-journal-gatewayd.* %{_unitdir}/systemd-journal-remote.* %{_unitdir}/systemd-journal-upload.* -%{_prefix}/lib/systemd/systemd-journal-gatewayd -%{_prefix}/lib/systemd/systemd-journal-remote -%{_prefix}/lib/systemd/systemd-journal-upload +%{_systemd_util_dir}/systemd-journal-gatewayd +%{_systemd_util_dir}/systemd-journal-remote +%{_systemd_util_dir}/systemd-journal-upload %{_sysusersdir}/systemd-remote.conf %{_mandir}/man5/journal-remote.conf* %{_mandir}/man5/journal-upload.conf* @@ -1358,8 +1357,8 @@ fi %files portable %defattr(-,root,root) %{_bindir}/portablectl -%{_prefix}/lib/systemd/systemd-portabled -%{_prefix}/lib/systemd/portable +%{_systemd_util_dir}/systemd-portabled +%{_systemd_util_dir}/portable %{_unitdir}/systemd-portabled.service %{_unitdir}/dbus-org.freedesktop.portable1.service %{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf