mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
bfaea5f7ec
commit
1c472390b8
@@ -116,14 +116,13 @@ FILES:xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.s
|
||||
|
||||
EXTRA_OEMESON += " \
|
||||
-Dxnest=false \
|
||||
-Dxvfb=true \
|
||||
-Ddtrace=false \
|
||||
-Dint10=x86emu \
|
||||
-Dxkb_output_dir=/var/lib/xkb \
|
||||
"
|
||||
|
||||
OPENGL_PKGCONFIGS = "dri glx glamor dri3"
|
||||
PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \
|
||||
PACKAGECONFIG ??= "dga dri2 udev xvfb ${XORG_CRYPTO} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-logind', '', d)} \
|
||||
"
|
||||
@@ -138,6 +137,7 @@ PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,li
|
||||
PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind"
|
||||
PACKAGECONFIG[systemd-logind] = "-Dsystemd_logind=true,-Dsystemd_logind=false,dbus,"
|
||||
PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false"
|
||||
PACKAGECONFIG[xvfb] = "-Dxvfb=true,-Dxvfb=false"
|
||||
|
||||
# Xorg requires a SHA1 implementation, pick one
|
||||
XORG_CRYPTO ??= "openssl"
|
||||
@@ -175,3 +175,5 @@ python populate_packages:prepend() {
|
||||
d.appendVar("RPROVIDES:" + pn, " " + get_abi("input"))
|
||||
d.appendVar("RPROVIDES:" + pn, " " + get_abi("video"))
|
||||
}
|
||||
|
||||
CVE_STATUS[CVE-2023-5574] = "${@bb.utils.contains('PACKAGECONFIG', 'xvfb', '', 'not-applicable-config: specific to Xvfb', d)}"
|
||||
|
||||
Reference in New Issue
Block a user