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

Accepting request 337992 from home:fbui:branches:Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/337992
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=909
This commit is contained in:
Dr. Werner Fink 2015-10-12 10:48:46 +00:00 committed by Git OBS Bridge
parent 173cbeb878
commit ac9e9f3351
4 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
systemd-mini.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Oct 9 18:03:02 UTC 2015 - fbui@suse.com
- Disable systemd-boot on aarch64 since it fails to build.
Error while compiling src/boot/efi/util.o is:
usr/include/efi/aarch64/efibind.h:2:20: fatal error: stdint.h: No such file or directory
-------------------------------------------------------------------
Fri Oct 9 07:16:45 UTC 2015 - fbui@suse.com
- Fix UEFI detection logic: basically we let configure.ac figure out
if UEFI is supported by the current build environment. No need to
clutter the spec file with a new conditionnal %has_efi.
- Provide systemd-bootx64.efi (aka gummiboot)
-------------------------------------------------------------------
Tue Oct 6 15:13:04 UTC 2015 - werner@suse.de

22
systemd-mini.spec
View File

@ -29,11 +29,6 @@
%bcond_with resolved
%bcond_with python
%bcond_with parentpathid
%ifarch %{ix86} x86_64 aarch64
%define has_efi 1
%else
%define has_efi 0
%endif
%if 0%{?suse_version} > 1315
%bcond_without permission
%bcond_without blkrrpart
@ -101,6 +96,9 @@ BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0
BuildRequires: pkgconfig(libmicrohttpd)
BuildRequires: pkgconfig(libqrencode)
BuildRequires: pkgconfig(usbutils) >= 0.82
%ifarch %{ix86} x86_64
BuildRequires: gnu-efi
%endif
# the buildignore is important for bootstrapping
#!BuildIgnore: udev
Requires: udev >= 172
@ -693,9 +691,6 @@ cflags -Wl,--hash-size=8599 LDFLAGS
--enable-selinux \
--enable-split-usr \
--disable-static \
%if ! 0%{?has_efi}
--disable-efi \
%endif
--with-rc-local-script-path-start=/etc/init.d/boot.local \
--with-rc-local-script-path-stop=/etc/init.d/halt.local \
--with-debug-shell=/bin/bash \
@ -1141,6 +1136,7 @@ exit 0
%{_bindir}/networkctl
%endif
%{_bindir}/busctl
%{_bindir}/bootctl
%{_bindir}/kernel-install
%{_bindir}/hostnamectl
%{_bindir}/localectl
@ -1231,9 +1227,6 @@ exit 0
%{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
%endif
%{_prefix}/lib/systemd/system-generators/systemd-dbus1-generator
%if 0%{has_efi}
%{_bindir}/bootctl
%endif
%{_prefix}/lib/systemd/system-generators/systemd-debug-generator
%{_prefix}/lib/systemd/system-generators/systemd-hibernate-resume-generator
%if %{with sysvcompat}
@ -1250,6 +1243,13 @@ exit 0
/%{_lib}/security/pam_systemd.so
%config /etc/pam.d/systemd-user
%ifarch %{ix86} x86_64
%dir %{_prefix}/lib/systemd/boot
%dir %{_prefix}/lib/systemd/boot/efi
%{_prefix}/lib/systemd/boot/efi/*.efi
%{_prefix}/lib/systemd/boot/efi/*.stub
%endif
%dir %{_libexecdir}/modules-load.d
%dir %{_sysconfdir}/modules-load.d
%{_libexecdir}/modules-load.d/sg.conf

16
systemd.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Oct 9 18:03:02 UTC 2015 - fbui@suse.com
- Disable systemd-boot on aarch64 since it fails to build.
Error while compiling src/boot/efi/util.o is:
usr/include/efi/aarch64/efibind.h:2:20: fatal error: stdint.h: No such file or directory
-------------------------------------------------------------------
Fri Oct 9 07:16:45 UTC 2015 - fbui@suse.com
- Fix UEFI detection logic: basically we let configure.ac figure out
if UEFI is supported by the current build environment. No need to
clutter the spec file with a new conditionnal %has_efi.
- Provide systemd-bootx64.efi (aka gummiboot)
-------------------------------------------------------------------
Tue Oct 6 15:13:04 UTC 2015 - werner@suse.de

22
systemd.spec
View File

@ -27,11 +27,6 @@
%bcond_with resolved
%bcond_with python
%bcond_with parentpathid
%ifarch %{ix86} x86_64 aarch64
%define has_efi 1
%else
%define has_efi 0
%endif
%if 0%{?suse_version} > 1315
%bcond_without permission
%bcond_without blkrrpart
@ -96,6 +91,9 @@ BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0
BuildRequires: pkgconfig(libmicrohttpd)
BuildRequires: pkgconfig(libqrencode)
BuildRequires: pkgconfig(usbutils) >= 0.82
%ifarch %{ix86} x86_64
BuildRequires: gnu-efi
%endif
# the buildignore is important for bootstrapping
#!BuildIgnore: udev
Requires: udev >= 172
@ -688,9 +686,6 @@ cflags -Wl,--hash-size=8599 LDFLAGS
--enable-selinux \
--enable-split-usr \
--disable-static \
%if ! 0%{?has_efi}
--disable-efi \
%endif
--with-rc-local-script-path-start=/etc/init.d/boot.local \
--with-rc-local-script-path-stop=/etc/init.d/halt.local \
--with-debug-shell=/bin/bash \
@ -1136,6 +1131,7 @@ exit 0
%{_bindir}/networkctl
%endif
%{_bindir}/busctl
%{_bindir}/bootctl
%{_bindir}/kernel-install
%{_bindir}/hostnamectl
%{_bindir}/localectl
@ -1226,9 +1222,6 @@ exit 0
%{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
%endif
%{_prefix}/lib/systemd/system-generators/systemd-dbus1-generator
%if 0%{has_efi}
%{_bindir}/bootctl
%endif
%{_prefix}/lib/systemd/system-generators/systemd-debug-generator
%{_prefix}/lib/systemd/system-generators/systemd-hibernate-resume-generator
%if %{with sysvcompat}
@ -1245,6 +1238,13 @@ exit 0
/%{_lib}/security/pam_systemd.so
%config /etc/pam.d/systemd-user
%ifarch %{ix86} x86_64
%dir %{_prefix}/lib/systemd/boot
%dir %{_prefix}/lib/systemd/boot/efi
%{_prefix}/lib/systemd/boot/efi/*.efi
%{_prefix}/lib/systemd/boot/efi/*.stub
%endif
%dir %{_libexecdir}/modules-load.d
%dir %{_sysconfdir}/modules-load.d
%{_libexecdir}/modules-load.d/sg.conf