From 71ef3191938da772b07274165dd3a85c2ed011f1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 16 Feb 2022 20:33:47 +0000 Subject: meta/scripts: Automated conversion of OE renamed variables (From OE-Core rev: aa52af4518604b5bf13f3c5e885113bf868d6c81) Signed-off-by: Richard Purdie --- meta/recipes-graphics/builder/builder_0.1.bb | 2 +- meta/recipes-graphics/xorg-font/font-util_1.3.2.bb | 2 +- meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 2 +- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/builder/builder_0.1.bb b/meta/recipes-graphics/builder/builder_0.1.bb index f448465f9a..39be3bd63f 100644 --- a/meta/recipes-graphics/builder/builder_0.1.bb +++ b/meta/recipes-graphics/builder/builder_0.1.bb @@ -30,4 +30,4 @@ do_install () { } # -4178 is an unrelated 'builder' -CVE_CHECK_WHITELIST = "CVE-2008-4178" +CVE_CHECK_IGNORE = "CVE-2008-4178" diff --git a/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb b/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb index 84e1d377a8..b3e832756b 100644 --- a/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb +++ b/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb @@ -19,4 +19,4 @@ BBCLASSEXTEND = "native" SRC_URI[md5sum] = "3d6adb76fdd072db8c8fae41b40855e8" SRC_URI[sha256sum] = "3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282" -SYSROOT_DIRS_BLACKLIST:remove = "${datadir}/fonts" +SYSROOT_DIRS_IGNORE:remove = "${datadir}/fonts" diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index fad2962948..60bc8c76fa 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -18,7 +18,7 @@ EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop" PACKAGECONFIG ??= "" PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" -UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0returnsnull \ +UNKNOWN_CONFIGURE_OPT_IGNORE += "--enable-malloc0returnsnull --disable-malloc0returnsnull \ --disable-specs --without-groff --without-ps2pdf --without-fop \ --without-xmlto --with-xmlto \ " diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 5b7d0cd292..057a1ba6ad 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -21,13 +21,13 @@ UPSTREAM_CHECK_REGEX = "xorg-server-(?P\d+(\.(?!99)\d+)+)\.tar" CVE_PRODUCT = "xorg-server x_server" # This is specific to Debian's xserver-wrapper.c -CVE_CHECK_WHITELIST += "CVE-2011-4613" +CVE_CHECK_IGNORE += "CVE-2011-4613" # As per upstream, exploiting this flaw is non-trivial and it requires exact # timing on the behalf of the attacker. Many graphical applications exit if their # connection to the X server is lost, so a typical desktop session is either # impossible or difficult to exploit. There is currently no upstream patch # available for this flaw. -CVE_CHECK_WHITELIST += "CVE-2020-25697" +CVE_CHECK_IGNORE += "CVE-2020-25697" S = "${WORKDIR}/${XORG_PN}-${PV}" -- cgit v1.2.3-54-g00ecf