pool/systemd
SHA256
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Rename %usrmerged into %split_usr

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1199
This commit is contained in:
Franck Bui 2021-10-08 10:11:10 +00:00 committed by Git OBS Bridge
parent 4844148bb3
commit 8f5cab1733
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
systemd-mini.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 8 09:01:59 UTC 2021 - Franck Bui <fbui@suse.com>
- Rename %usrmerged into %split_usr
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 6 07:40:24 UTC 2021 - Franck Bui <fbui@suse.com> Wed Oct 6 07:40:24 UTC 2021 - Franck Bui <fbui@suse.com>

8
systemd-mini.spec
View File

@ -56,6 +56,8 @@
%bcond_without experimental %bcond_without experimental
%bcond_without testsuite %bcond_without testsuite
%endif %endif
# Kept to ease migrations toward SLE
%bcond_with split_usr
Name: systemd-mini Name: systemd-mini
URL: http://www.freedesktop.org/wiki/Software/systemd 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} \ -Dversion-tag=%{version}%{suse_version} \
-Ddocdir=%{_docdir}/systemd \ -Ddocdir=%{_docdir}/systemd \
-Drootprefix=/usr \ -Drootprefix=/usr \
%if !0%{?usrmerged} %if %{with split_usr}
-Dsplit-usr=true \ -Dsplit-usr=true \
%endif %endif
-Dsplit-bin=true \ -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-} install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-}
done done
%if !0%{?usrmerged} %if %{with split_usr}
# Legacy sysvinit tools # Legacy sysvinit tools
mkdir -p %{buildroot}/sbin mkdir -p %{buildroot}/sbin
ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init
@ -1557,7 +1559,7 @@ fi
%files sysvinit %files sysvinit
%defattr(-,root,root,-) %defattr(-,root,root,-)
%if !0%{?usrmerged} %if %{with split_usr}
/sbin/init /sbin/init
/sbin/reboot /sbin/reboot
/sbin/halt /sbin/halt

5
systemd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 8 09:01:59 UTC 2021 - Franck Bui <fbui@suse.com>
- Rename %usrmerged into %split_usr
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 6 07:40:24 UTC 2021 - Franck Bui <fbui@suse.com> Wed Oct 6 07:40:24 UTC 2021 - Franck Bui <fbui@suse.com>

8
systemd.spec
View File

@ -54,6 +54,8 @@
%bcond_without experimental %bcond_without experimental
%bcond_without testsuite %bcond_without testsuite
%endif %endif
# Kept to ease migrations toward SLE
%bcond_with split_usr
Name: systemd Name: systemd
URL: http://www.freedesktop.org/wiki/Software/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} \ -Dversion-tag=%{version}%{suse_version} \
-Ddocdir=%{_docdir}/systemd \ -Ddocdir=%{_docdir}/systemd \
-Drootprefix=/usr \ -Drootprefix=/usr \
%if !0%{?usrmerged} %if %{with split_usr}
-Dsplit-usr=true \ -Dsplit-usr=true \
%endif %endif
-Dsplit-bin=true \ -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-} install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-}
done done
%if !0%{?usrmerged} %if %{with split_usr}
# Legacy sysvinit tools # Legacy sysvinit tools
mkdir -p %{buildroot}/sbin mkdir -p %{buildroot}/sbin
ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init
@ -1555,7 +1557,7 @@ fi
%files sysvinit %files sysvinit
%defattr(-,root,root,-) %defattr(-,root,root,-)
%if !0%{?usrmerged} %if %{with split_usr}
/sbin/init /sbin/init
/sbin/reboot /sbin/reboot
/sbin/halt /sbin/halt