From c6b3f079ef737e46f9f9217ae0cf7bb993e0cf58b342bb5142c4ffb49d510697 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 5 Oct 2021 08:47:13 +0000 Subject: [PATCH 01/11] - No need to install upstream pam configuration file "systemd-user" It's overwritten by the SUSE version anyway. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1195 --- systemd-mini.changes | 7 +++++++ systemd-mini.spec | 2 +- systemd.changes | 7 +++++++ systemd.spec | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 49998b05..9a345222 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 4 14:40:12 UTC 2021 - Franck Bui + +- No need to install upstream pam configuration file "systemd-user" + + It's overwritten by the SUSE version anyway. + ------------------------------------------------------------------- Wed Sep 29 10:04:38 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index c7cf5326..ef901410 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -611,7 +611,7 @@ Have fun with these services at your own risk. -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ - -Dpamconfdir=%{_pam_vendordir} \ + -Dpamconfdir=no \ -Dpamlibdir=%{_pam_moduledir} \ -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ diff --git a/systemd.changes b/systemd.changes index 49998b05..9a345222 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 4 14:40:12 UTC 2021 - Franck Bui + +- No need to install upstream pam configuration file "systemd-user" + + It's overwritten by the SUSE version anyway. + ------------------------------------------------------------------- Wed Sep 29 10:04:38 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index bd5c5924..eae5c1dd 100644 --- a/systemd.spec +++ b/systemd.spec @@ -609,7 +609,7 @@ Have fun with these services at your own risk. -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ - -Dpamconfdir=%{_pam_vendordir} \ + -Dpamconfdir=no \ -Dpamlibdir=%{_pam_moduledir} \ -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ From 1f9e275259f7f7e4fbcab0de7b8a9e9624e9b43d578fbefb1449985f925f3738 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 5 Oct 2021 13:00:46 +0000 Subject: [PATCH 02/11] fix previous commit OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1196 --- systemd-mini.spec | 2 +- systemd.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/systemd-mini.spec b/systemd-mini.spec index ef901410..c08f0716 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -743,7 +743,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target # Replace upstream systemd-user with the openSUSE one. -install -m0644 %{S:2} %{buildroot}%{_pam_vendordir} +install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{S:2} # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path diff --git a/systemd.spec b/systemd.spec index eae5c1dd..b4c4fba5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -741,7 +741,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target # Replace upstream systemd-user with the openSUSE one. -install -m0644 %{S:2} %{buildroot}%{_pam_vendordir} +install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{S:2} # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path From cc44b2b8ac087177895b91caf2e8b1543931ea9a2efe587c9fb7f763fac45848 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 6 Oct 2021 08:03:55 +0000 Subject: [PATCH 03/11] - Suppress PAM warning when the credentials for user@.service service are established (bsc#1190515) systemd-user PAM service needs to define a default implementation of pam_setcred() otherwise the fallback (defined by /etc/pam.d/other) is used, which consists of pam_warn.so + pam_deny.so, and will throw a warning each time a user logs in. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1197 --- systemd-mini.changes | 11 +++++++++++ systemd-user | 6 ++++-- systemd.changes | 11 +++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 9a345222..2f301ff0 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Oct 6 07:40:24 UTC 2021 - Franck Bui + +- Suppress PAM warning when the credentials for user@.service service + are established (bsc#1190515) + + systemd-user PAM service needs to define a default implementation of + pam_setcred() otherwise the fallback (defined by /etc/pam.d/other) + is used, which consists of pam_warn.so + pam_deny.so, and will throw + a warning each time a user logs in. + ------------------------------------------------------------------- Mon Oct 4 14:40:12 UTC 2021 - Franck Bui diff --git a/systemd-user b/systemd-user index f1d252b7..055168eb 100644 --- a/systemd-user +++ b/systemd-user @@ -2,8 +2,10 @@ # # Used by systemd --user instances. -account include common-account +auth required pam_permit.so + +account include common-account session required pam_selinux.so close session required pam_selinux.so nottys open -session include common-session +session include common-session diff --git a/systemd.changes b/systemd.changes index 9a345222..2f301ff0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Oct 6 07:40:24 UTC 2021 - Franck Bui + +- Suppress PAM warning when the credentials for user@.service service + are established (bsc#1190515) + + systemd-user PAM service needs to define a default implementation of + pam_setcred() otherwise the fallback (defined by /etc/pam.d/other) + is used, which consists of pam_warn.so + pam_deny.so, and will throw + a warning each time a user logs in. + ------------------------------------------------------------------- Mon Oct 4 14:40:12 UTC 2021 - Franck Bui From 4844148bb30ac957066aed3bb5e0d4083c1266a18fc18383866baa7e456acb22 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 8 Oct 2021 08:31:22 +0000 Subject: [PATCH 04/11] update systemd-user to get the potential extended creds via common-auth OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1198 --- systemd-user | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/systemd-user b/systemd-user index 055168eb..3907c885 100644 --- a/systemd-user +++ b/systemd-user @@ -2,7 +2,18 @@ # # Used by systemd --user instances. -auth required pam_permit.so +# This is not about authentication per se (user@.service is a system +# service anyway) but to give the possibility to user services +# (especially those like gnome-terminal, see [1]) to have theirs +# credentials extended similar to the ones received by a user when he +# logs in (and the full PAM authentication stack is run). See [2] and +# [3] for details. +# +# [1] https://gitlab.gnome.org/GNOME/gdm/-/issues/393 +# [2] https://github.com/systemd/systemd/issues/11198 +# [3] https://bugzilla.suse.com/show_bug.cgi?id=1190515 +# +auth include common-auth account include common-account From 8f5cab173367e45f7913752f6d5a41897c13c942439bcb8df55665260dac91ae Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 8 Oct 2021 10:11:10 +0000 Subject: [PATCH 05/11] - Rename %usrmerged into %split_usr OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1199 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 8 +++++--- systemd.changes | 5 +++++ systemd.spec | 8 +++++--- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 2f301ff0..b24fa8d8 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 8 09:01:59 UTC 2021 - Franck Bui + +- Rename %usrmerged into %split_usr + ------------------------------------------------------------------- Wed Oct 6 07:40:24 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index c08f0716..6e6c681c 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -56,6 +56,8 @@ %bcond_without experimental %bcond_without testsuite %endif +# Kept to ease migrations toward SLE +%bcond_with split_usr Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd @@ -605,7 +607,7 @@ Have fun with these services at your own risk. -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -%if !0%{?usrmerged} +%if %{with split_usr} -Dsplit-usr=true \ %endif -Dsplit-bin=true \ @@ -723,7 +725,7 @@ for s in %{S:100} %{S:101} %{S:102}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} done -%if !0%{?usrmerged} +%if %{with split_usr} # Legacy sysvinit tools mkdir -p %{buildroot}/sbin ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init @@ -1557,7 +1559,7 @@ fi %files sysvinit %defattr(-,root,root,-) -%if !0%{?usrmerged} +%if %{with split_usr} /sbin/init /sbin/reboot /sbin/halt diff --git a/systemd.changes b/systemd.changes index 2f301ff0..b24fa8d8 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 8 09:01:59 UTC 2021 - Franck Bui + +- Rename %usrmerged into %split_usr + ------------------------------------------------------------------- Wed Oct 6 07:40:24 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index b4c4fba5..32d3c983 100644 --- a/systemd.spec +++ b/systemd.spec @@ -54,6 +54,8 @@ %bcond_without experimental %bcond_without testsuite %endif +# Kept to ease migrations toward SLE +%bcond_with split_usr Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd @@ -603,7 +605,7 @@ Have fun with these services at your own risk. -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -%if !0%{?usrmerged} +%if %{with split_usr} -Dsplit-usr=true \ %endif -Dsplit-bin=true \ @@ -721,7 +723,7 @@ for s in %{S:100} %{S:101} %{S:102}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} done -%if !0%{?usrmerged} +%if %{with split_usr} # Legacy sysvinit tools mkdir -p %{buildroot}/sbin ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init @@ -1555,7 +1557,7 @@ fi %files sysvinit %defattr(-,root,root,-) -%if !0%{?usrmerged} +%if %{with split_usr} /sbin/init /sbin/reboot /sbin/halt From f2bb42f254d9ba130e86e55c9d3c69496f28bc1acc6e61e63ee53e35eeb7ff00 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 8 Oct 2021 11:21:33 +0000 Subject: [PATCH 06/11] - Overwriting rootprefix= is only required when split-usr is enabled OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1200 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 2 +- systemd.changes | 5 +++++ systemd.spec | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index b24fa8d8..76d774bc 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 8 11:14:20 UTC 2021 - Franck Bui + +- Overwriting rootprefix= is only required when split-usr is enabled + ------------------------------------------------------------------- Fri Oct 8 09:01:59 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 6e6c681c..89ddae1e 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -606,8 +606,8 @@ Have fun with these services at your own risk. -Dmode=release \ -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ - -Drootprefix=/usr \ %if %{with split_usr} + -Drootprefix=/usr \ -Dsplit-usr=true \ %endif -Dsplit-bin=true \ diff --git a/systemd.changes b/systemd.changes index b24fa8d8..76d774bc 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 8 11:14:20 UTC 2021 - Franck Bui + +- Overwriting rootprefix= is only required when split-usr is enabled + ------------------------------------------------------------------- Fri Oct 8 09:01:59 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 32d3c983..397f389b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -604,8 +604,8 @@ Have fun with these services at your own risk. -Dmode=release \ -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ - -Drootprefix=/usr \ %if %{with split_usr} + -Drootprefix=/usr \ -Dsplit-usr=true \ %endif -Dsplit-bin=true \ From 40636e38240e45af0066195f6d10c3decb94eb82e9bc3fb0050e92a5768a334c Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 15 Oct 2021 09:32:30 +0000 Subject: [PATCH 07/11] - Ghost own directories /var/log/journal and /var/log/journal/remote again rpmlint no more complain about the setgid bit, see sr#923496. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1201 --- systemd-mini.changes | 7 +++++++ systemd-mini.spec | 2 ++ systemd.changes | 7 +++++++ systemd.spec | 2 ++ 4 files changed, 18 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 76d774bc..fe7acc60 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 15 09:27:00 UTC 2021 - Franck Bui + +- Ghost own directories /var/log/journal and /var/log/journal/remote again + + rpmlint no more complain about the setgid bit, see sr#923496. + ------------------------------------------------------------------- Fri Oct 8 11:14:20 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 89ddae1e..cf97e2bd 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1435,6 +1435,7 @@ fi %{_modprobedir}/systemd.conf # Some files created at runtime. +%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf @@ -1766,6 +1767,7 @@ fi %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.* %{_datadir}/systemd/gatewayd +%ghost %dir %{_localstatedir}/log/journal/remote %endif %if %{with networkd} || %{with resolved} diff --git a/systemd.changes b/systemd.changes index 76d774bc..fe7acc60 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 15 09:27:00 UTC 2021 - Franck Bui + +- Ghost own directories /var/log/journal and /var/log/journal/remote again + + rpmlint no more complain about the setgid bit, see sr#923496. + ------------------------------------------------------------------- Fri Oct 8 11:14:20 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 397f389b..01b41ae2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1433,6 +1433,7 @@ fi %{_modprobedir}/systemd.conf # Some files created at runtime. +%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf @@ -1764,6 +1765,7 @@ fi %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.* %{_datadir}/systemd/gatewayd +%ghost %dir %{_localstatedir}/log/journal/remote %endif %if %{with networkd} || %{with resolved} From 4bd5e376d896f3173a1f577bf17281f5d3568a9ed083c251ff41caca9943cee4 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 15 Oct 2021 11:50:45 +0000 Subject: [PATCH 08/11] - Rename %{gnu-efi} into %{sd_boot} Build conditionals (%bcond_with and %bcond_without) are used to define a specific feature of systemd. "gnu-efi" is rather an implemenation detail. Also not really sure what "efi" option alone is useful for since systemd-boot & co depends on "gnu-efi". - Enable sd_boot support for aarch64 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1202 --- systemd-mini.changes | 12 ++++++++++++ systemd-mini.spec | 20 +++++++++++++------- systemd.changes | 12 ++++++++++++ systemd.spec | 20 +++++++++++++------- 4 files changed, 50 insertions(+), 14 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index fe7acc60..406970ad 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Oct 15 11:38:41 UTC 2021 - Franck Bui + +- Rename %{gnu-efi} into %{sd_boot} + + Build conditionals (%bcond_with and %bcond_without) are used to + define a specific feature of systemd. "gnu-efi" is rather an + implemenation detail. Also not really sure what "efi" option alone + is useful for since systemd-boot & co depends on "gnu-efi". + +- Enable sd_boot support for aarch64 + ------------------------------------------------------------------- Fri Oct 15 09:27:00 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index cf97e2bd..8b0654d2 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -29,7 +29,6 @@ %define suse_version +suse.39.g7a5801342f %define _testsuitedir /usr/lib/systemd/tests -%bcond_with gnuefi %if 0%{?bootstrap} %bcond_with coredump %bcond_with importd @@ -38,20 +37,23 @@ %bcond_with networkd %bcond_with portabled %bcond_with resolved +%bcond_with sd_boot %bcond_with sysvcompat %bcond_with experimental %bcond_with testsuite %else %bcond_without coredump -%ifarch %{ix86} x86_64 -%bcond_without gnuefi -%endif %bcond_without importd %bcond_without journal_remote %bcond_without machined %bcond_without networkd %bcond_without portabled %bcond_without resolved +%ifarch %{ix86} x86_64 aarch64 +%bcond_without sd_boot +%else +%bcond_with sd_boot +%endif %bcond_without sysvcompat %bcond_without experimental %bcond_without testsuite @@ -117,7 +119,7 @@ BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %endif -%if %{with gnuefi} +%if %{with sd_boot} BuildRequires: gnu-efi %endif @@ -652,8 +654,12 @@ Have fun with these services at your own risk. %if %{without coredump} -Dcoredump=false \ %endif -%if %{without gnuefi} +%if %{without sd_boot} + -Defi=false \ -Dgnu-efi=false \ +%else + -Defi=true \ + -Dgnu-efi=true \ %endif %if %{without importd} -Dimportd=false \ @@ -1367,7 +1373,7 @@ fi %{_pam_moduledir}/pam_systemd.so -%if %{with gnuefi} +%if %{with sd_boot} %dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot/efi %{_prefix}/lib/systemd/boot/efi/*.efi diff --git a/systemd.changes b/systemd.changes index fe7acc60..406970ad 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Oct 15 11:38:41 UTC 2021 - Franck Bui + +- Rename %{gnu-efi} into %{sd_boot} + + Build conditionals (%bcond_with and %bcond_without) are used to + define a specific feature of systemd. "gnu-efi" is rather an + implemenation detail. Also not really sure what "efi" option alone + is useful for since systemd-boot & co depends on "gnu-efi". + +- Enable sd_boot support for aarch64 + ------------------------------------------------------------------- Fri Oct 15 09:27:00 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 01b41ae2..e46f4bd7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -27,7 +27,6 @@ %define suse_version +suse.39.g7a5801342f %define _testsuitedir /usr/lib/systemd/tests -%bcond_with gnuefi %if 0%{?bootstrap} %bcond_with coredump %bcond_with importd @@ -36,20 +35,23 @@ %bcond_with networkd %bcond_with portabled %bcond_with resolved +%bcond_with sd_boot %bcond_with sysvcompat %bcond_with experimental %bcond_with testsuite %else %bcond_without coredump -%ifarch %{ix86} x86_64 -%bcond_without gnuefi -%endif %bcond_without importd %bcond_without journal_remote %bcond_without machined %bcond_without networkd %bcond_without portabled %bcond_without resolved +%ifarch %{ix86} x86_64 aarch64 +%bcond_without sd_boot +%else +%bcond_with sd_boot +%endif %bcond_without sysvcompat %bcond_without experimental %bcond_without testsuite @@ -115,7 +117,7 @@ BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %endif -%if %{with gnuefi} +%if %{with sd_boot} BuildRequires: gnu-efi %endif @@ -650,8 +652,12 @@ Have fun with these services at your own risk. %if %{without coredump} -Dcoredump=false \ %endif -%if %{without gnuefi} +%if %{without sd_boot} + -Defi=false \ -Dgnu-efi=false \ +%else + -Defi=true \ + -Dgnu-efi=true \ %endif %if %{without importd} -Dimportd=false \ @@ -1365,7 +1371,7 @@ fi %{_pam_moduledir}/pam_systemd.so -%if %{with gnuefi} +%if %{with sd_boot} %dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot/efi %{_prefix}/lib/systemd/boot/efi/*.efi From 15f422b3821cd1f53453d3aef9a0821510b5faa3a28c726de27deee37ff0fa9d Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 15 Oct 2021 12:07:31 +0000 Subject: [PATCH 09/11] - Import commit 355e113ce193e5e2d195278c57d47f9a1b00ae46 3b4a005095 meson: add missing include directory when using xkbcommon 4c4e642712 meson: allow extra net naming schemes to be defined during configuration (jsc#SLE-18514) 78466e4464 meson: drop the list of valid net naming schemes b9a2098f9d netif-naming: inline one iterator variable d7fbbc5e74 Add remaining supported schemes as options for default-net-naming-scheme OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1203 --- systemd-mini.changes | 11 +++++++++++ systemd-mini.spec | 2 +- systemd-v249.4+suse.39.g7a5801342f.tar.xz | 3 --- systemd-v249.4+suse.45.g355e113ce1.tar.xz | 3 +++ systemd.changes | 11 +++++++++++ systemd.spec | 2 +- 6 files changed, 27 insertions(+), 5 deletions(-) delete mode 100644 systemd-v249.4+suse.39.g7a5801342f.tar.xz create mode 100644 systemd-v249.4+suse.45.g355e113ce1.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 406970ad..aaefa009 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Oct 15 11:54:34 UTC 2021 - Franck Bui + +- Import commit 355e113ce193e5e2d195278c57d47f9a1b00ae46 + + 3b4a005095 meson: add missing include directory when using xkbcommon + 4c4e642712 meson: allow extra net naming schemes to be defined during configuration (jsc#SLE-18514) + 78466e4464 meson: drop the list of valid net naming schemes + b9a2098f9d netif-naming: inline one iterator variable + d7fbbc5e74 Add remaining supported schemes as options for default-net-naming-scheme + ------------------------------------------------------------------- Fri Oct 15 11:38:41 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 8b0654d2..c92c73c8 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.39.g7a5801342f +%define suse_version +suse.45.g355e113ce1 %define _testsuitedir /usr/lib/systemd/tests %if 0%{?bootstrap} diff --git a/systemd-v249.4+suse.39.g7a5801342f.tar.xz b/systemd-v249.4+suse.39.g7a5801342f.tar.xz deleted file mode 100644 index 5000653b..00000000 --- a/systemd-v249.4+suse.39.g7a5801342f.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:253802820cf7090eb06e26f5dc23dfd9dfd967fc20b8c85350ea4856fe99442d -size 7266304 diff --git a/systemd-v249.4+suse.45.g355e113ce1.tar.xz b/systemd-v249.4+suse.45.g355e113ce1.tar.xz new file mode 100644 index 00000000..42ff1f8c --- /dev/null +++ b/systemd-v249.4+suse.45.g355e113ce1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec1e888d4bd6da62e0038d220140c47b9d1e44f54e2c5212d812c79299fc8c9e +size 7266360 diff --git a/systemd.changes b/systemd.changes index 406970ad..aaefa009 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Oct 15 11:54:34 UTC 2021 - Franck Bui + +- Import commit 355e113ce193e5e2d195278c57d47f9a1b00ae46 + + 3b4a005095 meson: add missing include directory when using xkbcommon + 4c4e642712 meson: allow extra net naming schemes to be defined during configuration (jsc#SLE-18514) + 78466e4464 meson: drop the list of valid net naming schemes + b9a2098f9d netif-naming: inline one iterator variable + d7fbbc5e74 Add remaining supported schemes as options for default-net-naming-scheme + ------------------------------------------------------------------- Fri Oct 15 11:38:41 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index e46f4bd7..5d44523f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.39.g7a5801342f +%define suse_version +suse.45.g355e113ce1 %define _testsuitedir /usr/lib/systemd/tests %if 0%{?bootstrap} From f7b937968d6fe64d5f99a3d62d3cb60943ed0224682f44c3df0a6905c96cc0e9 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 15 Oct 2021 12:22:28 +0000 Subject: [PATCH 10/11] - Import commit 8521f8d22fd44400289fcea03493ebd7f8b1487d (merge of v249.5) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/355e113ce193e5e2d195278c57d47f9a1b00ae46...8521f8d22fd44400289fcea03493ebd7f8b1487d OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1204 --- systemd-mini.changes | 8 ++++++++ systemd-mini.spec | 4 ++-- systemd-v249.4+suse.45.g355e113ce1.tar.xz | 3 --- systemd-v249.5+suse.47.g8521f8d22f.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 4 ++-- 6 files changed, 23 insertions(+), 7 deletions(-) delete mode 100644 systemd-v249.4+suse.45.g355e113ce1.tar.xz create mode 100644 systemd-v249.5+suse.47.g8521f8d22f.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index aaefa009..e24b4142 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 15 12:09:44 UTC 2021 - Franck Bui + +- Import commit 8521f8d22fd44400289fcea03493ebd7f8b1487d (merge of v249.5) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/355e113ce193e5e2d195278c57d47f9a1b00ae46...8521f8d22fd44400289fcea03493ebd7f8b1487d + ------------------------------------------------------------------- Fri Oct 15 11:54:34 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index c92c73c8..2552df5b 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.45.g355e113ce1 +%define suse_version +suse.47.g8521f8d22f %define _testsuitedir /usr/lib/systemd/tests %if 0%{?bootstrap} @@ -63,7 +63,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 249.4 +Version: 249.5 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later diff --git a/systemd-v249.4+suse.45.g355e113ce1.tar.xz b/systemd-v249.4+suse.45.g355e113ce1.tar.xz deleted file mode 100644 index 42ff1f8c..00000000 --- a/systemd-v249.4+suse.45.g355e113ce1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec1e888d4bd6da62e0038d220140c47b9d1e44f54e2c5212d812c79299fc8c9e -size 7266360 diff --git a/systemd-v249.5+suse.47.g8521f8d22f.tar.xz b/systemd-v249.5+suse.47.g8521f8d22f.tar.xz new file mode 100644 index 00000000..5c5dfb3d --- /dev/null +++ b/systemd-v249.5+suse.47.g8521f8d22f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8a0ffb611331f565bf6bc5b7ec30cf9725cf462b08dae3c2b7bd344d1c9ed7c +size 7268136 diff --git a/systemd.changes b/systemd.changes index aaefa009..e24b4142 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 15 12:09:44 UTC 2021 - Franck Bui + +- Import commit 8521f8d22fd44400289fcea03493ebd7f8b1487d (merge of v249.5) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/355e113ce193e5e2d195278c57d47f9a1b00ae46...8521f8d22fd44400289fcea03493ebd7f8b1487d + ------------------------------------------------------------------- Fri Oct 15 11:54:34 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 5d44523f..b199cc0b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.45.g355e113ce1 +%define suse_version +suse.47.g8521f8d22f %define _testsuitedir /usr/lib/systemd/tests %if 0%{?bootstrap} @@ -61,7 +61,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 249.4 +Version: 249.5 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later From 89c84b0ccbb206de5c98bd03ad4a0d2769139d564120b559ae43d95d239cf429 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 15 Oct 2021 16:28:37 +0000 Subject: [PATCH 11/11] fix build for the mini flavor: rename of 'gnu-efi' broke it OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1205 --- systemd-mini.spec | 6 +++--- systemd.spec | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/systemd-mini.spec b/systemd-mini.spec index 2552df5b..e2e18d20 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1223,8 +1223,10 @@ fi %files %defattr(-,root,root) %license LICENSE* -%{_bindir}/busctl +%if %{with sd_boot} %{_bindir}/bootctl +%endif +%{_bindir}/busctl %{_bindir}/hostnamectl %{_bindir}/kernel-install %{_bindir}/localectl @@ -1551,7 +1553,6 @@ fi %defattr(-,root,root,-) %dir %{_docdir}/systemd %{_docdir}/systemd/html -# /bootstrap %endif %files devel @@ -1795,7 +1796,6 @@ fi %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service -# Some files created at runtime %endif %if %{with resolved} %{_bindir}/resolvectl diff --git a/systemd.spec b/systemd.spec index b199cc0b..17246d92 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1221,8 +1221,10 @@ fi %files %defattr(-,root,root) %license LICENSE* -%{_bindir}/busctl +%if %{with sd_boot} %{_bindir}/bootctl +%endif +%{_bindir}/busctl %{_bindir}/hostnamectl %{_bindir}/kernel-install %{_bindir}/localectl @@ -1549,7 +1551,6 @@ fi %defattr(-,root,root,-) %dir %{_docdir}/systemd %{_docdir}/systemd/html -# /bootstrap %endif %files devel @@ -1793,7 +1794,6 @@ fi %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service -# Some files created at runtime %endif %if %{with resolved} %{_bindir}/resolvectl