summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Perrot <thomas.perrot@bootlin.com>2022-10-18 16:05:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-10 14:39:24 +0000
commit1716159ede14e063292dd13965d6a19e67da6977 (patch)
tree86e219ea8882dbf95a1ff2ce9af5663b2ee234bd
parent02e90e8fc348435c6bc1a07a7f08f13237077ef8 (diff)
downloadpoky-1716159ede14e063292dd13965d6a19e67da6977.tar.gz
xserver-xorg: move some recommended dependencies in required
Otherwise, xserver will no longer start when NO_RECOMMENDATIONS = “1”, because dependencies in XSERVER_RRECOMMENDS are missing. (From OE-Core rev: a3607a035b4c9ab89232ccb1d0361791e5892b34) Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit bc7bd3953f3896af0db036250cda34bc9ecbb3ac) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 057a1ba6ad..6b11c79be6 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -80,9 +80,9 @@ PACKAGES =+ "${PN}-sdl \
80SUMMARY:xf86-video-modesetting = "X.Org X server -- modesetting display driver" 80SUMMARY:xf86-video-modesetting = "X.Org X server -- modesetting display driver"
81INSANE_SKIP:${MLPREFIX}xf86-video-modesetting = "xorg-driver-abi" 81INSANE_SKIP:${MLPREFIX}xf86-video-modesetting = "xorg-driver-abi"
82 82
83XSERVER_RRECOMMENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput" 83XSERVER_RDEPENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput"
84RRECOMMENDS:${PN} += "${XSERVER_RRECOMMENDS}" 84RDEPENDS:${PN} += "${XSERVER_RDEPENDS}"
85RRECOMMENDS:${PN}-xwayland += "${XSERVER_RRECOMMENDS}" 85RDEPENDS:${PN}-xwayland += "${XSERVER_RDEPENDS}"
86RDEPENDS:${PN}-xvfb += "xkeyboard-config" 86RDEPENDS:${PN}-xvfb += "xkeyboard-config"
87RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" 87RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
88 88