forked from pool/systemd
.
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=684
This commit is contained in:
parent
b22c9c974e
commit
1d4069aad5
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 25 14:12:52 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
- Temporary disable patch 1022 (bnc#884271 and bnc#882714
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jun 24 11:55:39 UTC 2014 - rmilasan@suse.com
|
Tue Jun 24 11:55:39 UTC 2014 - rmilasan@suse.com
|
||||||
|
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
%else
|
%else
|
||||||
%define has_efi 0
|
%define has_efi 0
|
||||||
%endif
|
%endif
|
||||||
|
%bcond_with udevsettle
|
||||||
|
|
||||||
Name: systemd-mini
|
Name: systemd-mini
|
||||||
Url: http://www.freedesktop.org/wiki/Software/systemd
|
Url: http://www.freedesktop.org/wiki/Software/systemd
|
||||||
@ -1141,7 +1142,11 @@ cp %{SOURCE7} m4/
|
|||||||
%patch1019 -p0
|
%patch1019 -p0
|
||||||
%patch1020 -p0
|
%patch1020 -p0
|
||||||
%patch1021 -p1
|
%patch1021 -p1
|
||||||
|
%if 0%{?suse_version} > 1310
|
||||||
|
%if %{with udevsettle}
|
||||||
%patch1022 -p1
|
%patch1022 -p1
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
%patch1023 -p0
|
%patch1023 -p0
|
||||||
%patch1024 -p0
|
%patch1024 -p0
|
||||||
%patch1025 -p1
|
%patch1025 -p1
|
||||||
@ -1174,6 +1179,17 @@ else
|
|||||||
sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c
|
sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
%if 0%{?suse_version} <= 1310
|
||||||
|
#
|
||||||
|
# Older versions like oS 13.1 do not distinguish between
|
||||||
|
# network.target and network-online.target
|
||||||
|
#
|
||||||
|
for f in src/core/service.c src/insserv-generator/insserv-generator.c
|
||||||
|
do
|
||||||
|
sed -ri '/"network",.*SPECIAL_NETWORK_ONLINE_TARGET,/{ s/SPECIAL_NETWORK_ONLINE_TARGET/SPECIAL_NETWORK_TARGET/}' $f
|
||||||
|
done
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cflags ()
|
cflags ()
|
||||||
{
|
{
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 25 14:12:52 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
- Temporary disable patch 1022 (bnc#884271 and bnc#882714
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jun 24 11:55:39 UTC 2014 - rmilasan@suse.com
|
Tue Jun 24 11:55:39 UTC 2014 - rmilasan@suse.com
|
||||||
|
|
||||||
|
@ -29,6 +29,7 @@
|
|||||||
%else
|
%else
|
||||||
%define has_efi 0
|
%define has_efi 0
|
||||||
%endif
|
%endif
|
||||||
|
%bcond_with udevsettle
|
||||||
|
|
||||||
Name: systemd
|
Name: systemd
|
||||||
Url: http://www.freedesktop.org/wiki/Software/systemd
|
Url: http://www.freedesktop.org/wiki/Software/systemd
|
||||||
@ -1136,7 +1137,11 @@ cp %{SOURCE7} m4/
|
|||||||
%patch1019 -p0
|
%patch1019 -p0
|
||||||
%patch1020 -p0
|
%patch1020 -p0
|
||||||
%patch1021 -p1
|
%patch1021 -p1
|
||||||
|
%if 0%{?suse_version} > 1310
|
||||||
|
%if %{with udevsettle}
|
||||||
%patch1022 -p1
|
%patch1022 -p1
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
%patch1023 -p0
|
%patch1023 -p0
|
||||||
%patch1024 -p0
|
%patch1024 -p0
|
||||||
%patch1025 -p1
|
%patch1025 -p1
|
||||||
|
Loading…
Reference in New Issue
Block a user