SHA256
1
0
forked from pool/xdm

Accepting request 585124 from X11:XOrg

- check for available graphics during runtime instead of %post,
  since %post may already run during image building time in our
  buildsystem (boo#1039497)

OBS-URL: https://build.opensuse.org/request/show/585124
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdm?expand=0&rev=68
This commit is contained in:
Dominique Leuenberger 2018-03-13 09:21:56 +00:00 committed by Git OBS Bridge
commit 6d11ce12c4
3 changed files with 10 additions and 10 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 9 16:46:58 UTC 2018 - sndirsch@suse.com
- check for available graphics during runtime instead of %post,
since %post may already run during image building time in our
buildsystem (boo#1039497)
-------------------------------------------------------------------
Mon Feb 26 19:24:04 UTC 2018 - sndirsch@suse.com

View File

@ -160,6 +160,7 @@ rmdir usr/lib/firewalld
%endif
%if 0%{?suse_version} >= 1330
patch -p1 < %{PATCH2}
rm -f usr/lib/X11/display-manager.orig
%endif
%if "%{_fillupdir}" != "/var/adm/fillup-templates"
mkdir -p %{buildroot}$(dirname %{_fillupdir})
@ -217,14 +218,6 @@ touch %{buildroot}%{_libexecdir}/X11/displaymanagers/console
%service_add_post display-manager.service
%{fillup_only -n displaymanager}
%endif
# Do no try to start Xserver on platforms which may ship without
# graphics card (bsc#1039497)
%ifarch aarch64 ppc64le
if ! [ -c /dev/fb* -o -d /dev/dri ]; then
sed -i -e "s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
%{_sysconfdir}/sysconfig/displaymanager
fi
%endif
%if 0%{?suse_version} >= 1330
%{_sbindir}/update-alternatives --install %{_libexecdir}/X11/displaymanagers/default-displaymanager \
default-displaymanager %{_libexecdir}/X11/displaymanagers/console 5

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5358018905e24cd25d161bf97d61b0a247fb8a2fe14a4f8318c97cf6a81aab2c
size 23875
oid sha256:555f89ea66078c531dbf8d27bb44a07452580b88de2f21bf7580149d4d8b41b3
size 24065