summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2025-04-09 09:55:23 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-04-10 11:05:35 +0100
commita2cce88141eb0731381b1e99c6bfdd9a34cd39ea (patch)
treef7a6fe18c878dca19d74742d4093bd5661c8ba83
parentab7af060548b8de259dd0d9ff61819514b5e237a (diff)
downloadpoky-a2cce88141eb0731381b1e99c6bfdd9a34cd39ea.tar.gz
xserver-xorg: remove sub-package ${PN}-xwayland
xwayland has been split to a standalone package via commit * 4ee66f574 Drop XWayland DDX https://gitlab.freedesktop.org/xorg/xserver/-/commit/4ee66f574 and there is a recipe for xwayland in oe-core too. So remove sub-package ${PN}-xwayland from xserver-xorg accordingly. (From OE-Core rev: 59e759207e349bece9da8bbcb5216df5923d243b) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc3
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 94d55072fe..fbe860c6ea 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -59,7 +59,6 @@ PACKAGES =+ "${PN}-sdl \
59 ${PN}-xvfb \ 59 ${PN}-xvfb \
60 ${PN}-utils \ 60 ${PN}-utils \
61 ${PN}-xephyr \ 61 ${PN}-xephyr \
62 ${PN}-xwayland \
63 ${PN}-multimedia-modules \ 62 ${PN}-multimedia-modules \
64 ${PN}-extension-dri \ 63 ${PN}-extension-dri \
65 ${PN}-extension-dri2 \ 64 ${PN}-extension-dri2 \
@@ -82,7 +81,6 @@ SUMMARY:xf86-video-modesetting = "X.Org X server -- modesetting display driver"
82 81
83XSERVER_RDEPENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput" 82XSERVER_RDEPENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput"
84RDEPENDS:${PN} += "${XSERVER_RDEPENDS}" 83RDEPENDS:${PN} += "${XSERVER_RDEPENDS}"
85RDEPENDS:${PN}-xwayland += "${XSERVER_RDEPENDS}"
86RDEPENDS:${PN}-xvfb += "xkeyboard-config" 84RDEPENDS:${PN}-xvfb += "xkeyboard-config"
87RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" 85RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
88 86
@@ -94,7 +92,6 @@ FILES:${PN}-fbdev = "${bindir}/Xfbdev"
94FILES:${PN}-xvfb = "${bindir}/Xvfb" 92FILES:${PN}-xvfb = "${bindir}/Xvfb"
95FILES:${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" 93FILES:${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
96FILES:${PN}-xephyr = "${bindir}/Xephyr" 94FILES:${PN}-xephyr = "${bindir}/Xephyr"
97FILES:${PN}-xwayland = "${bindir}/Xwayland"
98FILES:${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" 95FILES:${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
99FILES:${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" 96FILES:${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
100FILES:${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" 97FILES:${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"