diff options
author | Ross Burton <ross.burton@arm.com> | 2024-01-22 14:04:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-23 11:53:41 +0000 |
commit | 1c472390b8cc59f898855e8f36836ea3f64d73ff (patch) | |
tree | e54bdb716a8e06cbc87d3f1160871b21cc1cabf9 /meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |
parent | bfaea5f7ecbfae5f962a910c6fda7ee1399b3b09 (diff) | |
download | poky-1c472390b8cc59f898855e8f36836ea3f64d73ff.tar.gz |
xserver-xorg: add PACKAGECONFIG for xvfb
Xvfb is pretty niche and has outstanding unsolved security issues, so
let people disable it and add a conditional CVE_STATUS to reflect this.
(From OE-Core rev: 5d47474f6eb6b4441154c7de7261f8e0ab47333d)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 085fcaf87a..5a0fceea86 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
@@ -116,14 +116,13 @@ FILES:xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.s | |||
116 | 116 | ||
117 | EXTRA_OEMESON += " \ | 117 | EXTRA_OEMESON += " \ |
118 | -Dxnest=false \ | 118 | -Dxnest=false \ |
119 | -Dxvfb=true \ | ||
120 | -Ddtrace=false \ | 119 | -Ddtrace=false \ |
121 | -Dint10=x86emu \ | 120 | -Dint10=x86emu \ |
122 | -Dxkb_output_dir=/var/lib/xkb \ | 121 | -Dxkb_output_dir=/var/lib/xkb \ |
123 | " | 122 | " |
124 | 123 | ||
125 | OPENGL_PKGCONFIGS = "dri glx glamor dri3" | 124 | OPENGL_PKGCONFIGS = "dri glx glamor dri3" |
126 | PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \ | 125 | PACKAGECONFIG ??= "dga dri2 udev xvfb ${XORG_CRYPTO} \ |
127 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ | 126 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ |
128 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-logind', '', d)} \ | 127 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-logind', '', d)} \ |
129 | " | 128 | " |
@@ -138,6 +137,7 @@ PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,li | |||
138 | PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" | 137 | PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" |
139 | PACKAGECONFIG[systemd-logind] = "-Dsystemd_logind=true,-Dsystemd_logind=false,dbus," | 138 | PACKAGECONFIG[systemd-logind] = "-Dsystemd_logind=true,-Dsystemd_logind=false,dbus," |
140 | PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false" | 139 | PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false" |
140 | PACKAGECONFIG[xvfb] = "-Dxvfb=true,-Dxvfb=false" | ||
141 | 141 | ||
142 | # Xorg requires a SHA1 implementation, pick one | 142 | # Xorg requires a SHA1 implementation, pick one |
143 | XORG_CRYPTO ??= "openssl" | 143 | XORG_CRYPTO ??= "openssl" |
@@ -175,3 +175,5 @@ python populate_packages:prepend() { | |||
175 | d.appendVar("RPROVIDES:" + pn, " " + get_abi("input")) | 175 | d.appendVar("RPROVIDES:" + pn, " " + get_abi("input")) |
176 | d.appendVar("RPROVIDES:" + pn, " " + get_abi("video")) | 176 | d.appendVar("RPROVIDES:" + pn, " " + get_abi("video")) |
177 | } | 177 | } |
178 | |||
179 | CVE_STATUS[CVE-2023-5574] = "${@bb.utils.contains('PACKAGECONFIG', 'xvfb', '', 'not-applicable-config: specific to Xvfb', d)}" | ||