Accepting request 731698 from home:lnussel:branches:Base:System
- enable systemd-portabled OBS-URL: https://build.opensuse.org/request/show/731698 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1069
This commit is contained in:
Franck Bui
Git OBS Bridge
parent
769af78b45
commit
3a39ad7e66
@ -22,6 +22,11 @@ Tue Sep 3 15:10:10 UTC 2019 - Franck Bui <fbui@suse.com>
|
||||
this functionality had been deprecated during the previous release
|
||||
and now have been dropped by upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 14 14:25:43 UTC 2019 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- enable systemd-portabled
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 31 14:38:13 UTC 2019 - Franck Bui <fbui@suse.com>
|
||||
|
||||
|
||||
@ -35,6 +35,7 @@
|
||||
%bcond_with machined
|
||||
%bcond_with importd
|
||||
%bcond_with networkd
|
||||
%bcond_with portabled
|
||||
%bcond_with resolved
|
||||
%bcond_with journal_remote
|
||||
%else
|
||||
@ -43,6 +44,7 @@
|
||||
%bcond_without machined
|
||||
%bcond_without importd
|
||||
%bcond_without networkd
|
||||
%bcond_without portabled
|
||||
%bcond_without resolved
|
||||
%bcond_without journal_remote
|
||||
%ifarch %{ix86} x86_64
|
||||
@ -329,6 +331,26 @@ Systemd tools to spawn and manage containers and virtual machines.
|
||||
This package contains systemd-nspawn, machinectl, systemd-machined,
|
||||
and systemd-importd.
|
||||
|
||||
%if %{with portabled}
|
||||
%package portabled
|
||||
Summary: Systemd tools for portable services
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%systemd_requires
|
||||
|
||||
%description portabled
|
||||
Systemd tools to manage portable services. The feature is still
|
||||
considered experimental so the package might change or vanish.
|
||||
Use at own risk.
|
||||
|
||||
More information can be found online:
|
||||
|
||||
http://0pointer.net/blog/walkthrough-for-portable-services.html
|
||||
https://systemd.io/PORTABLE_SERVICES
|
||||
|
||||
%endif
|
||||
|
||||
%if ! 0%{?bootstrap}
|
||||
%package logger
|
||||
Summary: Journal only logging
|
||||
@ -447,7 +469,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
|
||||
-Dntp-servers="${opensuse_ntp_servers[*]}" \
|
||||
-Drc-local=/etc/init.d/boot.local \
|
||||
-Ddebug-shell=/bin/bash \
|
||||
%if %{without portabled}
|
||||
-Dportabled=false \
|
||||
%endif
|
||||
-Dseccomp=auto \
|
||||
-Dselinux=auto \
|
||||
-Dapparmor=auto \
|
||||
@ -864,6 +888,11 @@ if [ $1 -gt 1 ]; then
|
||||
%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
|
||||
fi
|
||||
|
||||
%if %{with portabled}
|
||||
%post portabled
|
||||
%tmpfiles_create portables.conf
|
||||
%endif
|
||||
|
||||
%if ! 0%{?bootstrap}
|
||||
%post logger
|
||||
%tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/
|
||||
@ -1383,6 +1412,20 @@ fi
|
||||
%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}
|
||||
%files logger
|
||||
%defattr(-,root,root)
|
||||
|
||||
@ -22,6 +22,11 @@ Tue Sep 3 15:10:10 UTC 2019 - Franck Bui <fbui@suse.com>
|
||||
this functionality had been deprecated during the previous release
|
||||
and now have been dropped by upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 14 14:25:43 UTC 2019 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- enable systemd-portabled
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 31 14:38:13 UTC 2019 - Franck Bui <fbui@suse.com>
|
||||
|
||||
|
||||
43
systemd.spec
43
systemd.spec
@ -33,6 +33,7 @@
|
||||
%bcond_with machined
|
||||
%bcond_with importd
|
||||
%bcond_with networkd
|
||||
%bcond_with portabled
|
||||
%bcond_with resolved
|
||||
%bcond_with journal_remote
|
||||
%else
|
||||
@ -41,6 +42,7 @@
|
||||
%bcond_without machined
|
||||
%bcond_without importd
|
||||
%bcond_without networkd
|
||||
%bcond_without portabled
|
||||
%bcond_without resolved
|
||||
%bcond_without journal_remote
|
||||
%ifarch %{ix86} x86_64
|
||||
@ -327,6 +329,26 @@ Systemd tools to spawn and manage containers and virtual machines.
|
||||
This package contains systemd-nspawn, machinectl, systemd-machined,
|
||||
and systemd-importd.
|
||||
|
||||
%if %{with portabled}
|
||||
%package portabled
|
||||
Summary: Systemd tools for portable services
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%systemd_requires
|
||||
|
||||
%description portabled
|
||||
Systemd tools to manage portable services. The feature is still
|
||||
considered experimental so the package might change or vanish.
|
||||
Use at own risk.
|
||||
|
||||
More information can be found online:
|
||||
|
||||
http://0pointer.net/blog/walkthrough-for-portable-services.html
|
||||
https://systemd.io/PORTABLE_SERVICES
|
||||
|
||||
%endif
|
||||
|
||||
%if ! 0%{?bootstrap}
|
||||
%package logger
|
||||
Summary: Journal only logging
|
||||
@ -445,7 +467,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
|
||||
-Dntp-servers="${opensuse_ntp_servers[*]}" \
|
||||
-Drc-local=/etc/init.d/boot.local \
|
||||
-Ddebug-shell=/bin/bash \
|
||||
%if %{without portabled}
|
||||
-Dportabled=false \
|
||||
%endif
|
||||
-Dseccomp=auto \
|
||||
-Dselinux=auto \
|
||||
-Dapparmor=auto \
|
||||
@ -862,6 +886,11 @@ if [ $1 -gt 1 ]; then
|
||||
%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
|
||||
fi
|
||||
|
||||
%if %{with portabled}
|
||||
%post portabled
|
||||
%tmpfiles_create portables.conf
|
||||
%endif
|
||||
|
||||
%if ! 0%{?bootstrap}
|
||||
%post logger
|
||||
%tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/
|
||||
@ -1381,6 +1410,20 @@ fi
|
||||
%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}
|
||||
%files logger
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user