- Rename %usrmerged into %split_usr
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1199
This commit is contained in:
parent
2d5389d5ca
commit
14769bea51
@ -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>
|
||||
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user