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-devtools/cmake/cmake.inc | 2 +- meta/recipes-devtools/flex/flex_2.6.4.bb | 2 +- meta/recipes-devtools/gcc/gcc-11.2.inc | 2 +- meta/recipes-devtools/gcc/gcc-target.inc | 2 +- meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 2 +- meta/recipes-devtools/go/go-1.17.7.inc | 2 +- meta/recipes-devtools/jquery/jquery_3.6.0.bb | 2 +- meta/recipes-devtools/libtool/libtool_2.4.6.bb | 2 +- meta/recipes-devtools/python/python3_3.10.2.bb | 6 +++--- meta/recipes-devtools/qemu/qemu.inc | 6 +++--- meta/recipes-devtools/rsync/rsync_3.2.3.bb | 2 +- meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 9276db3c56..a8bd4311c4 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -27,4 +27,4 @@ UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" # This is specific to the npm package that installs cmake, so isn't # relevant to OpenEmbedded -CVE_CHECK_WHITELIST += "CVE-2016-10642" +CVE_CHECK_IGNORE += "CVE-2016-10642" diff --git a/meta/recipes-devtools/flex/flex_2.6.4.bb b/meta/recipes-devtools/flex/flex_2.6.4.bb index 95e2c087ee..c7cd965347 100644 --- a/meta/recipes-devtools/flex/flex_2.6.4.bb +++ b/meta/recipes-devtools/flex/flex_2.6.4.bb @@ -31,7 +31,7 @@ UPSTREAM_CHECK_REGEX = "flex-(?P\d+(\.\d+)+)\.tar" # Disputed - yes there is stack exhaustion but no bug and it is building the # parser, not running it, effectively similar to a compiler ICE. Upstream no plans to address # https://github.com/westes/flex/issues/414 -CVE_CHECK_WHITELIST += "CVE-2019-6293" +CVE_CHECK_IGNORE += "CVE-2019-6293" inherit autotools gettext texinfo ptest diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc index d892182fd5..2394c86e29 100644 --- a/meta/recipes-devtools/gcc/gcc-11.2.inc +++ b/meta/recipes-devtools/gcc/gcc-11.2.inc @@ -119,4 +119,4 @@ EXTRA_OECONF_PATHS = "\ " # Is a binutils 2.26 issue, not gcc -CVE_CHECK_WHITELIST += "CVE-2021-37322" +CVE_CHECK_IGNORE += "CVE-2021-37322" diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index 66f737c9dc..cc65e995c3 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -256,4 +256,4 @@ do_install:append () { # and builds track file dependencies (e.g. perl and its makedepends code). # For determinism we don't install this ever and rely on the copy from gcc-cross. # [YOCTO #7287] -SYSROOT_DIRS_BLACKLIST += "${libdir}/gcc" +SYSROOT_DIRS_IGNORE += "${libdir}/gcc" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc index 836c51a3de..8e926e81e1 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc @@ -20,7 +20,7 @@ PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,native PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline" PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, nativesdk-elfutils" -SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb" +SSTATE_ALLOW_OVERLAP_FILES += "${STAGING_DATADIR}/gdb" do_configure:prepend() { cat > ${WORKDIR}/python << EOF diff --git a/meta/recipes-devtools/go/go-1.17.7.inc b/meta/recipes-devtools/go/go-1.17.7.inc index e8c8c031ae..3832b65eae 100644 --- a/meta/recipes-devtools/go/go-1.17.7.inc +++ b/meta/recipes-devtools/go/go-1.17.7.inc @@ -22,4 +22,4 @@ SRC_URI[main.sha256sum] = "c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a # Upstream don't believe it is a signifiant real world issue and will only # fix in 1.17 onwards where we can drop this. # https://github.com/golang/go/issues/30999#issuecomment-910470358 -CVE_CHECK_WHITELIST += "CVE-2021-29923" +CVE_CHECK_IGNORE += "CVE-2021-29923" diff --git a/meta/recipes-devtools/jquery/jquery_3.6.0.bb b/meta/recipes-devtools/jquery/jquery_3.6.0.bb index 33b177d1d0..39ffd38114 100644 --- a/meta/recipes-devtools/jquery/jquery_3.6.0.bb +++ b/meta/recipes-devtools/jquery/jquery_3.6.0.bb @@ -22,7 +22,7 @@ UPSTREAM_CHECK_REGEX = "jquery-(?P\d+(\.\d+)+)\.js" # https://github.com/jquery/jquery/issues/3927 # There are ways jquery can expose security issues but any issues are in the apps exposing them # and there is little we can directly do -CVE_CHECK_WHITELIST += "CVE-2007-2379" +CVE_CHECK_IGNORE += "CVE-2007-2379" inherit allarch diff --git a/meta/recipes-devtools/libtool/libtool_2.4.6.bb b/meta/recipes-devtools/libtool/libtool_2.4.6.bb index fb40ce7317..44a4950574 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.6.bb +++ b/meta/recipes-devtools/libtool/libtool_2.4.6.bb @@ -7,7 +7,7 @@ RDEPENDS:${PN} += "bash" # # We want the results of libtool-cross preserved - don't stage anything ourselves. # -SYSROOT_DIRS_BLACKLIST += " \ +SYSROOT_DIRS_IGNORE += " \ ${bindir} \ ${datadir}/aclocal \ ${datadir}/libtool/build-aux \ diff --git a/meta/recipes-devtools/python/python3_3.10.2.bb b/meta/recipes-devtools/python/python3_3.10.2.bb index d07bb017ea..429839b622 100644 --- a/meta/recipes-devtools/python/python3_3.10.2.bb +++ b/meta/recipes-devtools/python/python3_3.10.2.bb @@ -49,12 +49,12 @@ UPSTREAM_CHECK_URI = "https://www.python.org/downloads/source/" CVE_PRODUCT = "python" # Upstream consider this expected behaviour -CVE_CHECK_WHITELIST += "CVE-2007-4559" +CVE_CHECK_IGNORE += "CVE-2007-4559" # This is not exploitable when glibc has CVE-2016-10739 fixed. -CVE_CHECK_WHITELIST += "CVE-2019-18348" +CVE_CHECK_IGNORE += "CVE-2019-18348" # This is windows only issue. -CVE_CHECK_WHITELIST += "CVE-2020-15523" +CVE_CHECK_IGNORE += "CVE-2020-15523" PYTHON_MAJMIN = "3.10" diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 80b83be63f..94190b52f4 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -36,15 +36,15 @@ SRC_URI:append:class-target = " file://cross.patch" SRC_URI:append:class-nativesdk = " file://cross.patch" # Applies against virglrender < 0.6.0 and not qemu itself -CVE_CHECK_WHITELIST += "CVE-2017-5957" +CVE_CHECK_IGNORE += "CVE-2017-5957" # The VNC server can expose host files uder some circumstances. We don't # enable it by default. -CVE_CHECK_WHITELIST += "CVE-2007-0998" +CVE_CHECK_IGNORE += "CVE-2007-0998" # 'The issues identified by this CVE were determined to not constitute a vulnerability.' # https://bugzilla.redhat.com/show_bug.cgi?id=1609015#c11 -CVE_CHECK_WHITELIST += "CVE-2018-18438" +CVE_CHECK_IGNORE += "CVE-2018-18438" COMPATIBLE_HOST:mipsarchn32 = "null" COMPATIBLE_HOST:mipsarchn64 = "null" diff --git a/meta/recipes-devtools/rsync/rsync_3.2.3.bb b/meta/recipes-devtools/rsync/rsync_3.2.3.bb index 1cdf509004..b950e30b46 100644 --- a/meta/recipes-devtools/rsync/rsync_3.2.3.bb +++ b/meta/recipes-devtools/rsync/rsync_3.2.3.bb @@ -20,7 +20,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ SRC_URI[sha256sum] = "becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e" # -16548 required for v3.1.3pre1. Already in v3.1.3. -CVE_CHECK_WHITELIST += " CVE-2017-16548 " +CVE_CHECK_IGNORE += " CVE-2017-16548 " inherit autotools-brokensep diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb index 7ead00d489..9f6b003ffb 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb @@ -31,7 +31,7 @@ SRC_URI:class-native = "${BASE_SRC_URI}" # Upstream don't believe this is an exploitable issue # https://core.tcl-lang.org/tcl/info/7079e4f91601e9c7 -CVE_CHECK_WHITELIST += "CVE-2021-35331" +CVE_CHECK_IGNORE += "CVE-2021-35331" UPSTREAM_CHECK_REGEX = "tcl(?P\d+(\.\d+)+)-src" -- cgit v1.2.3-54-g00ecf