rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 731744 from home:fbui:systemd:openSUSE-Factory

Browse Source 
- Import commit 9e41d7ec3572d8d5ea1e00f683e9fbf8108e85b4
  fb1b9d54f9 tty-ask-pwd-agent: fix message forwarded to wall(1)
  dd14da3bb6 core: restore initialization of u->source_mtime
  d62f30f647 resolved: create /etc/resolv.conf symlink at runtime

- Slighly rework (mostly reorganization) the portable stuff

OBS-URL: https://build.opensuse.org/request/show/731744
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1070
This commit is contained in:
Franck Bui 2019-09-18 13:55:56 +00:00 committed by Git OBS Bridge
parent 3a39ad7e66
commit cdc959e14f
6 changed files with 101 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
systemd-mini.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 18 12:17:37 UTC 2019 - Franck Bui <fbui@suse.com>
- Import commit 9e41d7ec3572d8d5ea1e00f683e9fbf8108e85b4
fb1b9d54f9 tty-ask-pwd-agent: fix message forwarded to wall(1)
dd14da3bb6 core: restore initialization of u->source_mtime
d62f30f647 resolved: create /etc/resolv.conf symlink at runtime
-------------------------------------------------------------------
Wed Sep 18 11:33:16 UTC 2019 - Franck Bui <fbui@suse.com>
- Slighly rework (mostly reorganization) the portable stuff
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 6 06:20:11 UTC 2019 - Franck Bui <fbui@suse.com> Fri Sep 6 06:20:11 UTC 2019 - Franck Bui <fbui@suse.com>

60
systemd-mini.spec
View File

@ -26,7 +26,7 @@
##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
%define mini -mini %define mini -mini
%define min_kernel_version 4.5 %define min_kernel_version 4.5
%define suse_version +suse.32.ge0b24c4356 %define suse_version +suse.36.g9e41d7ec35
%bcond_with gnuefi %bcond_with gnuefi
%if 0%{?bootstrap} %if 0%{?bootstrap}
@ -332,14 +332,14 @@ This package contains systemd-nspawn, machinectl, systemd-machined,
and systemd-importd. and systemd-importd.
%if %{with portabled} %if %{with portabled}
%package portabled %package portable
Summary: Systemd tools for portable services Summary: Systemd tools for portable services
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: System/Base Group: System/Base
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%systemd_requires %systemd_requires
%description portabled %description portable
Systemd tools to manage portable services. The feature is still Systemd tools to manage portable services. The feature is still
considered experimental so the package might change or vanish. considered experimental so the package might change or vanish.
Use at own risk. Use at own risk.
@ -469,9 +469,6 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
-Dntp-servers="${opensuse_ntp_servers[*]}" \ -Dntp-servers="${opensuse_ntp_servers[*]}" \
-Drc-local=/etc/init.d/boot.local \ -Drc-local=/etc/init.d/boot.local \
-Ddebug-shell=/bin/bash \ -Ddebug-shell=/bin/bash \
%if %{without portabled}
-Dportabled=false \
%endif
-Dseccomp=auto \ -Dseccomp=auto \
-Dselinux=auto \ -Dselinux=auto \
-Dapparmor=auto \ -Dapparmor=auto \
@ -498,6 +495,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
%if %{without journal_remote} %if %{without journal_remote}
-Dremote=false \ -Dremote=false \
%endif %endif
%if %{without portabled}
-Dportabled=false \
%endif
%if %{without machined} %if %{without machined}
-Dmachined=false \ -Dmachined=false \
%endif %endif
@ -888,11 +888,6 @@ if [ $1 -gt 1 ]; then
%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
fi fi
%if %{with portabled}
%post portabled
%tmpfiles_create portables.conf
%endif
%if ! 0%{?bootstrap} %if ! 0%{?bootstrap}
%post logger %post logger
%tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ %tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/
@ -941,6 +936,21 @@ fi
%service_del_postun systemd-journal-upload.service %service_del_postun systemd-journal-upload.service
%endif %endif
%if %{with portabled}
%pre portable
%service_add_pre systemd-portabled.service
%post portable
%tmpfiles_create portables.conf
%service_add_post systemd-portabled.service
%preun portable
%service_del_preun systemd-portabled.service
%postun portable
%service_del_postun systemd-portabled.service
%endif
%clean %clean
%files -f systemd.lang %files -f systemd.lang
@ -1412,20 +1422,6 @@ fi
%endif %endif
%endif %endif
%if %{with portabled}
%files portabled
%defattr(-,root,root)
%{_bindir}/portablectl
%{_prefix}/lib/systemd/systemd-portabled
%{_prefix}/lib/systemd/portable
%{_unitdir}/systemd-portabled.service
%{_unitdir}/dbus-org.freedesktop.portable1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.portable1.service
%{_datadir}/polkit-1/actions/org.freedesktop.portable1.policy
%{_tmpfilesdir}/portables.conf
%endif
%if ! 0%{?bootstrap} %if ! 0%{?bootstrap}
%files logger %files logger
%defattr(-,root,root) %defattr(-,root,root)
@ -1479,4 +1475,18 @@ fi
%{_datadir}/systemd/gatewayd %{_datadir}/systemd/gatewayd
%endif %endif
%if %{with portabled}
%files portable
%defattr(-,root,root)
%{_bindir}/portablectl
%{_prefix}/lib/systemd/systemd-portabled
%{_prefix}/lib/systemd/portable
%{_unitdir}/systemd-portabled.service
%{_unitdir}/dbus-org.freedesktop.portable1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.portable1.service
%{_datadir}/polkit-1/actions/org.freedesktop.portable1.policy
%{_tmpfilesdir}/portables.conf
%endif
%changelog %changelog

3
systemd-v243+suse.32.ge0b24c4356.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7826b55ff3010000ec1b7843eb823a54b30138b1dbc825d7b1a85d9eaa0c56b2
size 5615268

3
systemd-v243+suse.36.g9e41d7ec35.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:37e21cde36399fea6092d54907123ee25da6ef9f1c50746f720576f6ca1a03ba
size 5615256

14
systemd.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 18 12:17:37 UTC 2019 - Franck Bui <fbui@suse.com>
- Import commit 9e41d7ec3572d8d5ea1e00f683e9fbf8108e85b4
fb1b9d54f9 tty-ask-pwd-agent: fix message forwarded to wall(1)
dd14da3bb6 core: restore initialization of u->source_mtime
d62f30f647 resolved: create /etc/resolv.conf symlink at runtime
-------------------------------------------------------------------
Wed Sep 18 11:33:16 UTC 2019 - Franck Bui <fbui@suse.com>
- Slighly rework (mostly reorganization) the portable stuff
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 6 06:20:11 UTC 2019 - Franck Bui <fbui@suse.com> Fri Sep 6 06:20:11 UTC 2019 - Franck Bui <fbui@suse.com>

60
systemd.spec
View File

@ -24,7 +24,7 @@
%define bootstrap 0 %define bootstrap 0
%define mini %nil %define mini %nil
%define min_kernel_version 4.5 %define min_kernel_version 4.5
%define suse_version +suse.32.ge0b24c4356 %define suse_version +suse.36.g9e41d7ec35
%bcond_with gnuefi %bcond_with gnuefi
%if 0%{?bootstrap} %if 0%{?bootstrap}
@ -330,14 +330,14 @@ This package contains systemd-nspawn, machinectl, systemd-machined,
and systemd-importd. and systemd-importd.
%if %{with portabled} %if %{with portabled}
%package portabled %package portable
Summary: Systemd tools for portable services Summary: Systemd tools for portable services
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: System/Base Group: System/Base
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%systemd_requires %systemd_requires
%description portabled %description portable
Systemd tools to manage portable services. The feature is still Systemd tools to manage portable services. The feature is still
considered experimental so the package might change or vanish. considered experimental so the package might change or vanish.
Use at own risk. Use at own risk.
@ -467,9 +467,6 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
-Dntp-servers="${opensuse_ntp_servers[*]}" \ -Dntp-servers="${opensuse_ntp_servers[*]}" \
-Drc-local=/etc/init.d/boot.local \ -Drc-local=/etc/init.d/boot.local \
-Ddebug-shell=/bin/bash \ -Ddebug-shell=/bin/bash \
%if %{without portabled}
-Dportabled=false \
%endif
-Dseccomp=auto \ -Dseccomp=auto \
-Dselinux=auto \ -Dselinux=auto \
-Dapparmor=auto \ -Dapparmor=auto \
@ -496,6 +493,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
%if %{without journal_remote} %if %{without journal_remote}
-Dremote=false \ -Dremote=false \
%endif %endif
%if %{without portabled}
-Dportabled=false \
%endif
%if %{without machined} %if %{without machined}
-Dmachined=false \ -Dmachined=false \
%endif %endif
@ -886,11 +886,6 @@ if [ $1 -gt 1 ]; then
%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
fi fi
%if %{with portabled}
%post portabled
%tmpfiles_create portables.conf
%endif
%if ! 0%{?bootstrap} %if ! 0%{?bootstrap}
%post logger %post logger
%tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ %tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/
@ -939,6 +934,21 @@ fi
%service_del_postun systemd-journal-upload.service %service_del_postun systemd-journal-upload.service
%endif %endif
%if %{with portabled}
%pre portable
%service_add_pre systemd-portabled.service
%post portable
%tmpfiles_create portables.conf
%service_add_post systemd-portabled.service
%preun portable
%service_del_preun systemd-portabled.service
%postun portable
%service_del_postun systemd-portabled.service
%endif
%clean %clean
%files -f systemd.lang %files -f systemd.lang
@ -1410,20 +1420,6 @@ fi
%endif %endif
%endif %endif
%if %{with portabled}
%files portabled
%defattr(-,root,root)
%{_bindir}/portablectl
%{_prefix}/lib/systemd/systemd-portabled
%{_prefix}/lib/systemd/portable
%{_unitdir}/systemd-portabled.service
%{_unitdir}/dbus-org.freedesktop.portable1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.portable1.service
%{_datadir}/polkit-1/actions/org.freedesktop.portable1.policy
%{_tmpfilesdir}/portables.conf
%endif
%if ! 0%{?bootstrap} %if ! 0%{?bootstrap}
%files logger %files logger
%defattr(-,root,root) %defattr(-,root,root)
@ -1477,4 +1473,18 @@ fi
%{_datadir}/systemd/gatewayd %{_datadir}/systemd/gatewayd
%endif %endif
%if %{with portabled}
%files portable
%defattr(-,root,root)
%{_bindir}/portablectl
%{_prefix}/lib/systemd/systemd-portabled
%{_prefix}/lib/systemd/portable
%{_unitdir}/systemd-portabled.service
%{_unitdir}/dbus-org.freedesktop.portable1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.portable1.service
%{_datadir}/polkit-1/actions/org.freedesktop.portable1.policy
%{_tmpfilesdir}/portables.conf
%endif
%changelog %changelog