From 55345dfd419c133d55eb33c9e69ba286f42dbe6d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 5 Aug 2019 11:56:50 -0700 Subject: xorg-xserver: Adapt bbappend to latest OE-core There is no need to override complete packageconfig but just the openGL part, this ensures that any common change in oe-core reflects for rpi as well and does not cause the packageconfigs to go stale Signed-off-by: Khem Raj --- recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index a5a6af3..fba1632 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend @@ -1,9 +1 @@ -OPENGL_PKGCFG = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'dri3 xshmfence glamor', '', d)}" - -# slightly modified to oe-core's default: add ${OPENGL_PKGCFG} -PACKAGECONFIG_rpi ?= " \ - dri2 udev ${XORG_CRYPTO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx ${OPENGL_PKGCFG}', '', d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \ -" +OPENGL_PKGCONFIGS_rpi = "dri glx ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'dri3 xshmfence glamor', '', d)}" -- cgit v1.2.3-54-g00ecf