Buildroot 2018-11 (#258)
* Update to buildroot 2018.11 * containerd update * runc update * runc docker engine * runc docker proxy * update rpi firmware * update network manager * update dhcpd * update wait on network * update rpi wifi * revert glibc
This commit is contained in:
@@ -32,24 +32,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
|
||||
xlib_libxkbfile \
|
||||
xlib_xtrans \
|
||||
xdata_xbitmaps \
|
||||
xproto_bigreqsproto \
|
||||
xproto_compositeproto \
|
||||
xproto_damageproto \
|
||||
xproto_fixesproto \
|
||||
xproto_fontsproto \
|
||||
xproto_glproto \
|
||||
xproto_inputproto \
|
||||
xproto_kbproto \
|
||||
xproto_randrproto \
|
||||
xproto_renderproto \
|
||||
xproto_resourceproto \
|
||||
xproto_videoproto \
|
||||
xproto_xcmiscproto \
|
||||
xproto_xextproto \
|
||||
xproto_xf86bigfontproto \
|
||||
xproto_xf86dgaproto \
|
||||
xproto_xf86vidmodeproto \
|
||||
xproto_xproto \
|
||||
xorgproto \
|
||||
xkeyboard-config \
|
||||
pixman \
|
||||
mcookie \
|
||||
@@ -60,6 +43,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
|
||||
# -Os on several architectures.
|
||||
XSERVER_XORG_SERVER_CONF_OPTS = \
|
||||
--disable-config-hal \
|
||||
--enable-record \
|
||||
--disable-xnest \
|
||||
--disable-xephyr \
|
||||
--disable-dmx \
|
||||
@@ -73,8 +57,7 @@ XSERVER_XORG_SERVER_CONF_OPTS += \
|
||||
--with-systemd-daemon \
|
||||
--enable-systemd-logind
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += \
|
||||
systemd \
|
||||
xproto_dri2proto
|
||||
systemd
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += \
|
||||
--without-systemd-daemon \
|
||||
@@ -89,12 +72,6 @@ else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xwayland
|
||||
endif
|
||||
|
||||
# Present protocol only required for xserver 1.15+, but does not matter if
|
||||
# enabled for older versions as they don't use it (not even optionally).
|
||||
ifeq ($(BR2_PACKAGE_XPROTO_PRESENTPROTO),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_presentproto
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess
|
||||
@@ -144,7 +121,7 @@ endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx
|
||||
endif
|
||||
@@ -165,7 +142,7 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += udev
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev
|
||||
# udev kms support depends on libdrm and dri2
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_XPROTO_DRI2PROTO),yy)
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms
|
||||
@@ -188,13 +165,6 @@ else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-libunwind
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XPROTO_RECORDPROTO),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-record
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-record
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont2
|
||||
endif
|
||||
@@ -214,14 +184,9 @@ XSERVER_XORG_SERVER_CONF_OPTS += --disable-composite
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
|
||||
ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri2
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri2
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_XPROTO_DRI3PROTO),yy)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libepoxy
|
||||
|
||||
Reference in New Issue
Block a user