diff options
Diffstat (limited to 'poky/meta/recipes-devtools')
90 files changed, 3307 insertions, 711 deletions
diff --git a/poky/meta/recipes-devtools/automake/automake/buildtest.patch b/poky/meta/recipes-devtools/automake/automake/buildtest.patch index b88b9e8693..c43a4ac8f3 100644 --- a/poky/meta/recipes-devtools/automake/automake/buildtest.patch +++ b/poky/meta/recipes-devtools/automake/automake/buildtest.patch @@ -36,7 +36,7 @@ index e0db651..de137fa 100644 -check-TESTS: $(TESTS) +AM_RECURSIVE_TARGETS += buildtest runtest + -+buildtest-TESTS: $(TESTS) ++buildtest-TESTS: $(TESTS) $(check_PROGRAMS) + +check-TESTS: buildtest-TESTS + $(MAKE) $(AM_MAKEFLAGS) runtest-TESTS diff --git a/poky/meta/recipes-devtools/ccache/ccache_4.8.1.bb b/poky/meta/recipes-devtools/ccache/ccache_4.8.2.bb index b0ae7fb25c..22a6b385b0 100644 --- a/poky/meta/recipes-devtools/ccache/ccache_4.8.1.bb +++ b/poky/meta/recipes-devtools/ccache/ccache_4.8.2.bb @@ -7,14 +7,14 @@ HOMEPAGE = "http://ccache.samba.org" SECTION = "devel" LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=1601d62d6828fbe19b6f6c2d01fdff4c" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=cd54b7abfc462470b0f505273c38f0ff" DEPENDS = "zstd" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ file://0001-xxhash.h-Fix-build-with-gcc-12.patch \ " -SRC_URI[sha256sum] = "869903c1891beb8bee87f1ec94d8a0dad18c2add4072c456acbc85cdfc23ca63" +SRC_URI[sha256sum] = "75eef15b8b9da48db9c91e1d0ff58b3645fc70c0e4ca2ef1b6825a12f21f217d" inherit cmake github-releases diff --git a/poky/meta/recipes-devtools/cmake/cmake.inc b/poky/meta/recipes-devtools/cmake/cmake.inc index 7788a5c45a..f57a77c7bb 100644 --- a/poky/meta/recipes-devtools/cmake/cmake.inc +++ b/poky/meta/recipes-devtools/cmake/cmake.inc @@ -23,6 +23,4 @@ SRC_URI[sha256sum] = "313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abb UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" -# This is specific to the npm package that installs cmake, so isn't -# relevant to OpenEmbedded -CVE_CHECK_IGNORE += "CVE-2016-10642" +CVE_STATUS[CVE-2016-10642] = "cpe-incorrect: This is specific to the npm package that installs cmake, so isn't relevant to OpenEmbedded" diff --git a/poky/meta/recipes-devtools/dnf/dnf_4.16.1.bb b/poky/meta/recipes-devtools/dnf/dnf_4.16.1.bb index ff79701dc7..9134411fa9 100644 --- a/poky/meta/recipes-devtools/dnf/dnf_4.16.1.bb +++ b/poky/meta/recipes-devtools/dnf/dnf_4.16.1.bb @@ -15,9 +15,10 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0030-Run-python-scripts-using-env.patch \ file://0001-set-python-path-for-completion_helper.patch \ - file://0001-dnf-write-the-log-lock-to-root.patch \ " +SRC_URI:append:class-native = "file://0001-dnf-write-the-log-lock-to-root.patch" + SRCREV = "94b7cc7956580405b219329541d6b40db6499cf1" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/poky/meta/recipes-devtools/flex/flex_2.6.4.bb b/poky/meta/recipes-devtools/flex/flex_2.6.4.bb index 15cf6f5cca..1ac88d65ef 100644 --- a/poky/meta/recipes-devtools/flex/flex_2.6.4.bb +++ b/poky/meta/recipes-devtools/flex/flex_2.6.4.bb @@ -26,10 +26,10 @@ SRC_URI[sha256sum] = "e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c4 GITHUB_BASE_URI = "https://github.com/westes/flex/releases" -# 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_IGNORE += "CVE-2019-6293" +CVE_STATUS[CVE-2019-6293] = "upstream-wontfix: \ +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 this." inherit autotools gettext texinfo ptest github-releases diff --git a/poky/meta/recipes-devtools/gcc/gcc-13.1.inc b/poky/meta/recipes-devtools/gcc/gcc-13.1.inc index 4da703db52..e94753eed0 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-13.1.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-13.1.inc @@ -111,5 +111,4 @@ EXTRA_OECONF_PATHS = "\ --with-build-sysroot=${STAGING_DIR_TARGET} \ " -# Is a binutils 2.26 issue, not gcc -CVE_CHECK_IGNORE += "CVE-2021-37322" +CVE_STATUS[CVE-2021-37322] = "cpe-incorrect: Is a binutils 2.26 issue, not gcc" diff --git a/poky/meta/recipes-devtools/gcc/gcc-configure-common.inc b/poky/meta/recipes-devtools/gcc/gcc-configure-common.inc index e4cdb73f0a..dba25eb754 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-configure-common.inc @@ -40,7 +40,6 @@ EXTRA_OECONF = "\ ${@get_gcc_mips_plt_setting(bb, d)} \ ${@get_gcc_ppc_plt_settings(bb, d)} \ ${@get_gcc_multiarch_setting(bb, d)} \ - --enable-standard-branch-protection \ " # glibc version is a minimum controlling whether features are enabled. diff --git a/poky/meta/recipes-devtools/gcc/gcc-testsuite.inc b/poky/meta/recipes-devtools/gcc/gcc-testsuite.inc index f68fec58ed..64f60c730f 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-testsuite.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-testsuite.inc @@ -51,9 +51,10 @@ python check_prepare() { # enable all valid instructions, since the test suite itself does not # limit itself to the target cpu options. # - valid for x86*, powerpc, arm, arm64 - if qemu_binary.lstrip("qemu-") in ["x86_64", "i386", "ppc", "arm", "aarch64"]: + if qemu_binary.lstrip("qemu-") in ["x86_64", "i386", "arm", "aarch64"]: args += ["-cpu", "max"] - + elif qemu_binary.lstrip("qemu-") in ["ppc"]: + args += d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH')).split() sysroot = d.getVar("RECIPE_SYSROOT") args += ["-L", sysroot] # lib paths are static here instead of using $libdir since this is used by a -cross recipe diff --git a/poky/meta/recipes-devtools/git/git_2.39.3.bb b/poky/meta/recipes-devtools/git/git_2.39.3.bb index 54a863acd2..3393550c85 100644 --- a/poky/meta/recipes-devtools/git/git_2.39.3.bb +++ b/poky/meta/recipes-devtools/git/git_2.39.3.bb @@ -27,13 +27,6 @@ LIC_FILES_CHKSUM = "\ CVE_PRODUCT = "git-scm:git" -# This is about a manpage not mentioning --mirror may "leak" information -# in mirrored git repos. Most OE users wouldn't build the docs and -# we don't see this as a major issue for our general users/usecases. -CVE_CHECK_IGNORE += "CVE-2022-24975" -# This is specific to Git-for-Windows -CVE_CHECK_IGNORE += "CVE-2022-41953" - PACKAGECONFIG ??= "expat curl" PACKAGECONFIG[cvsserver] = "" PACKAGECONFIG[svn] = "" diff --git a/poky/meta/recipes-devtools/go/go-1.20.5.inc b/poky/meta/recipes-devtools/go/go-1.20.6.inc index 4e4e57d5cb..551171b255 100644 --- a/poky/meta/recipes-devtools/go/go-1.20.5.inc +++ b/poky/meta/recipes-devtools/go/go-1.20.6.inc @@ -15,4 +15,4 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ " -SRC_URI[main.sha256sum] = "9a15c133ba2cfafe79652f4815b62e7cfc267f68df1b9454c6ab2a3ca8b96a88" +SRC_URI[main.sha256sum] = "62ee5bc6fb55b8bae8f705e0cb8df86d6453626b4ecf93279e2867092e0b7f70" diff --git a/poky/meta/recipes-devtools/go/go-binary-native_1.20.5.bb b/poky/meta/recipes-devtools/go/go-binary-native_1.20.6.bb index a98be4af1b..5b2f8f4352 100644 --- a/poky/meta/recipes-devtools/go/go-binary-native_1.20.5.bb +++ b/poky/meta/recipes-devtools/go/go-binary-native_1.20.6.bb @@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "d7ec48cde0d3d2be2c69203bc3e0a44de8660b9c09a6e85c4732a3f7dc442612" -SRC_URI[go_linux_arm64.sha256sum] = "aa2fab0a7da20213ff975fa7876a66d47b48351558d98851b87d1cfef4360d09" -SRC_URI[go_linux_ppc64le.sha256sum] = "049b8ab07d34077b90c0642138e10207f6db14bdd1743ea994a21e228f8ca53d" +SRC_URI[go_linux_amd64.sha256sum] = "b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb" +SRC_URI[go_linux_arm64.sha256sum] = "4e15ab37556e979181a1a1cc60f6d796932223a0f5351d7c83768b356f84429b" +SRC_URI[go_linux_ppc64le.sha256sum] = "a1b91a42a40bba54bfd5c96c23d72250e0c424038d0d2b5c7950b828b4905822" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" diff --git a/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.5.bb b/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.6.bb index 7ac9449e47..7ac9449e47 100644 --- a/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.5.bb +++ b/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.6.bb diff --git a/poky/meta/recipes-devtools/go/go-cross_1.20.5.bb b/poky/meta/recipes-devtools/go/go-cross_1.20.6.bb index 80b5a03f6c..80b5a03f6c 100644 --- a/poky/meta/recipes-devtools/go/go-cross_1.20.5.bb +++ b/poky/meta/recipes-devtools/go/go-cross_1.20.6.bb diff --git a/poky/meta/recipes-devtools/go/go-crosssdk_1.20.5.bb b/poky/meta/recipes-devtools/go/go-crosssdk_1.20.6.bb index 1857c8a577..1857c8a577 100644 --- a/poky/meta/recipes-devtools/go/go-crosssdk_1.20.5.bb +++ b/poky/meta/recipes-devtools/go/go-crosssdk_1.20.6.bb diff --git a/poky/meta/recipes-devtools/go/go-native_1.20.5.bb b/poky/meta/recipes-devtools/go/go-native_1.20.6.bb index ddf25b2c9b..ddf25b2c9b 100644 --- a/poky/meta/recipes-devtools/go/go-native_1.20.5.bb +++ b/poky/meta/recipes-devtools/go/go-native_1.20.6.bb diff --git a/poky/meta/recipes-devtools/go/go-runtime_1.20.5.bb b/poky/meta/recipes-devtools/go/go-runtime_1.20.6.bb index 63464a1501..63464a1501 100644 --- a/poky/meta/recipes-devtools/go/go-runtime_1.20.5.bb +++ b/poky/meta/recipes-devtools/go/go-runtime_1.20.6.bb diff --git a/poky/meta/recipes-devtools/go/go_1.20.5.bb b/poky/meta/recipes-devtools/go/go_1.20.6.bb index 46f5fbc6be..46f5fbc6be 100644 --- a/poky/meta/recipes-devtools/go/go_1.20.5.bb +++ b/poky/meta/recipes-devtools/go/go_1.20.6.bb diff --git a/poky/meta/recipes-devtools/jquery/jquery_3.6.3.bb b/poky/meta/recipes-devtools/jquery/jquery_3.6.3.bb index 93f87f730d..db4745ad7a 100644 --- a/poky/meta/recipes-devtools/jquery/jquery_3.6.3.bb +++ b/poky/meta/recipes-devtools/jquery/jquery_3.6.3.bb @@ -20,9 +20,8 @@ SRC_URI[map.sha256sum] = "156b740931ade6c1a98d99713eeb186f93847ffc56057e973becab UPSTREAM_CHECK_REGEX = "jquery-(?P<pver>\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_IGNORE += "CVE-2007-2379" +CVE_STATUS[CVE-2007-2379] = "upstream-wontfix: 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." inherit allarch diff --git a/poky/meta/recipes-devtools/lua/lua/CVE-2022-28805.patch b/poky/meta/recipes-devtools/lua/lua/CVE-2022-28805.patch deleted file mode 100644 index 3680c715a7..0000000000 --- a/poky/meta/recipes-devtools/lua/lua/CVE-2022-28805.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1f3c6f4534c6411313361697d98d1145a1f030fa Mon Sep 17 00:00:00 2001 -From: Roberto Ierusalimschy <roberto@inf.puc-rio.br> -Date: Tue, 15 Feb 2022 12:28:46 -0300 -Subject: [PATCH] Bug: Lua can generate wrong code when _ENV is <const> - -CVE: CVE-2022-28805 - -Upstream-Status: Backport [https://github.com/lua/lua/commit/1f3c6f4534c6411313361697d98d1145a1f030fa] - -Signed-off-by: Steve Sakoman <steve@sakoman.com> ---- - src/lparser.c | 1 + - 1 files changed, 1 insertions(+) - -diff --git a/src/lparser.c b/src/lparser.c -index 3abe3d751..a5cd55257 100644 ---- a/src/lparser.c -+++ b/src/lparser.c -@@ -468,6 +468,7 @@ static void singlevar (LexState *ls, expdesc *var) { - expdesc key; - singlevaraux(fs, ls->envn, var, 1); /* get environment variable */ - lua_assert(var->k != VVOID); /* this one must exist */ -+ luaK_exp2anyregup(fs, var); /* but could be a constant */ - codestring(&key, varname); /* key is variable name */ - luaK_indexed(fs, var, &key); /* env[varname] */ - } diff --git a/poky/meta/recipes-devtools/lua/lua/CVE-2022-33099.patch b/poky/meta/recipes-devtools/lua/lua/CVE-2022-33099.patch deleted file mode 100644 index fe7b6065c2..0000000000 --- a/poky/meta/recipes-devtools/lua/lua/CVE-2022-33099.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 42d40581dd919fb134c07027ca1ce0844c670daf Mon Sep 17 00:00:00 2001 -From: Roberto Ierusalimschy <roberto@inf.puc-rio.br> -Date: Fri, 20 May 2022 13:14:33 -0300 -Subject: [PATCH] Save stack space while handling errors - -Because error handling (luaG_errormsg) uses slots from EXTRA_STACK, -and some errors can recur (e.g., string overflow while creating an -error message in 'luaG_runerror', or a C-stack overflow before calling -the message handler), the code should use stack slots with parsimony. - -This commit fixes the bug "Lua-stack overflow when C stack overflows -while handling an error". - -CVE: CVE-2022-33099 - -Upstream-Status: Backport [https://github.com/lua/lua/commit/42d40581dd919fb134c07027ca1ce0844c670daf] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - ldebug.c | 5 ++++- - lvm.c | 6 ++++-- - 2 files changed, 8 insertions(+), 3 deletions(-) - ---- a/src/ldebug.c -+++ b/src/ldebug.c -@@ -824,8 +824,11 @@ l_noret luaG_runerror (lua_State *L, con - va_start(argp, fmt); - msg = luaO_pushvfstring(L, fmt, argp); /* format message */ - va_end(argp); -- if (isLua(ci)) /* if Lua function, add source:line information */ -+ if (isLua(ci)) { /* if Lua function, add source:line information */ - luaG_addinfo(L, msg, ci_func(ci)->p->source, getcurrentline(ci)); -+ setobjs2s(L, L->top - 2, L->top - 1); /* remove 'msg' from the stack */ -+ L->top--; -+ } - luaG_errormsg(L); - } - ---- a/src/lvm.c -+++ b/src/lvm.c -@@ -656,8 +656,10 @@ void luaV_concat (lua_State *L, int tota - /* collect total length and number of strings */ - for (n = 1; n < total && tostring(L, s2v(top - n - 1)); n++) { - size_t l = vslen(s2v(top - n - 1)); -- if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl)) -+ if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl)) { -+ L->top = top - total; /* pop strings to avoid wasting stack */ - luaG_runerror(L, "string length overflow"); -+ } - tl += l; - } - if (tl <= LUAI_MAXSHORTLEN) { /* is result a short string? */ -@@ -672,7 +674,7 @@ void luaV_concat (lua_State *L, int tota - setsvalue2s(L, top - n, ts); /* create result */ - } - total -= n-1; /* got 'n' strings to create 1 new */ -- L->top -= n-1; /* popped 'n' strings and pushed one */ -+ L->top = top - (n - 1); /* popped 'n' strings and pushed one */ - } while (total > 1); /* repeat until only 1 result left */ - } - diff --git a/poky/meta/recipes-devtools/lua/lua_5.4.4.bb b/poky/meta/recipes-devtools/lua/lua_5.4.6.bb index 26ec35f997..eabfc89575 100644 --- a/poky/meta/recipes-devtools/lua/lua_5.4.4.bb +++ b/poky/meta/recipes-devtools/lua/lua_5.4.6.bb @@ -1,20 +1,18 @@ SUMMARY = "Lua is a powerful light-weight programming language designed \ for extending applications." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=307;endline=330;md5=79c3f6b19ad05efe24c1681f025026bb" +LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=303;endline=324;md5=e05449eb28c092473f854670c6e8375a" HOMEPAGE = "http://www.lua.org/" SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ file://lua.pc.in \ - file://CVE-2022-28805.patch \ - file://CVE-2022-33099.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'http://www.lua.org/tests/lua-${PV_testsuites}-tests.tar.gz;name=tarballtest file://run-ptest ', '', d)} \ " # if no test suite matches PV release of Lua exactly, download the suite for the closest Lua release. PV_testsuites = "5.4.4" -SRC_URI[tarballsrc.sha256sum] = "164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61" +SRC_URI[tarballsrc.sha256sum] = "7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88" SRC_URI[tarballtest.sha256sum] = "04d28355cd67a2299dfe5708b55a0ff221ccb1a3907a3113cc103ccc05ac6aad" inherit pkgconfig binconfig ptest diff --git a/poky/meta/recipes-devtools/ninja/ninja_1.11.1.bb b/poky/meta/recipes-devtools/ninja/ninja_1.11.1.bb index 83d2f01263..8e297ec4d4 100644 --- a/poky/meta/recipes-devtools/ninja/ninja_1.11.1.bb +++ b/poky/meta/recipes-devtools/ninja/ninja_1.11.1.bb @@ -30,5 +30,4 @@ do_install() { BBCLASSEXTEND = "native nativesdk" -# This is a different Ninja -CVE_CHECK_IGNORE += "CVE-2021-4336" +CVE_STATUS[CVE-2021-4336] = "cpe-incorrect: This is a different Ninja" diff --git a/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.5.0.bb b/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb index b27e3ded33..eb88b9b734 100644 --- a/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.5.0.bb +++ b/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb @@ -10,7 +10,7 @@ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtu SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \ file://0001-update-alternatives-correctly-match-priority.patch \ " -SRCREV = "9239541f14a2529b9d01c0a253ab11afa2822dab" +SRCREV = "67994e62dc598282830385da75ba9b1abbbda941" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/opkg/opkg/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/poky/meta/recipes-devtools/opkg/opkg/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch deleted file mode 100644 index 3406878a1d..0000000000 --- a/poky/meta/recipes-devtools/opkg/opkg/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 4089affd371e6d62dd8c1e57b344f8cc329005ea Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 14 Jan 2023 23:11:08 -0800 -Subject: [PATCH] Define alignof using _Alignof when using C11 or newer - -WG14 N2350 made very clear that it is an UB having type definitions -within "offsetof" [1]. This patch enhances the implementation of macro -alignof_slot to use builtin "_Alignof" to avoid undefined behavior on -when using std=c11 or newer - -clang 16+ has started to flag this [2] - -Fixes build when using -std >= gnu11 and using clang16+ - -Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it -may support C11, exclude those compilers too - -[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm -[2] https://reviews.llvm.org/D133574 - -Upstream-Status: Submitted [https://groups.google.com/g/opkg-devel/c/gjcQPZgT_jI] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libopkg/md5.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/libopkg/md5.c b/libopkg/md5.c -index 981b9b8..ccb645e 100644 ---- a/libopkg/md5.c -+++ b/libopkg/md5.c -@@ -237,7 +237,17 @@ void md5_process_bytes(const void *buffer, size_t len, struct md5_ctx *ctx) - /* Process available complete blocks. */ - if (len >= 64) { - #if !_STRING_ARCH_unaligned -+/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 -+ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. -+ clang versions < 8.0.0 have the same bug. */ -+#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ -+ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ -+ && !defined __clang__) \ -+ || (defined __clang__ && __clang_major__ < 8)) - #define alignof(type) offsetof (struct { char c; type x; }, x) -+#else -+#define alignof(type) _Alignof(type) -+#endif - #define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) - if (UNALIGNED_P(buffer)) - while (len > 64) { --- -2.39.0 - diff --git a/poky/meta/recipes-devtools/opkg/opkg/0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch b/poky/meta/recipes-devtools/opkg/opkg/0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch deleted file mode 100644 index f216950002..0000000000 --- a/poky/meta/recipes-devtools/opkg/opkg/0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a658e6402382250f0164c5b47b744740e04f3611 Mon Sep 17 00:00:00 2001 -From: Charlie Johnston <charlie.johnston@ni.com> -Date: Fri, 30 Dec 2022 15:21:14 -0600 -Subject: [PATCH] opkg-key: Remove --no-options flag from gpg calls. - -The opkg-key script was always passing the --no-options -flag to gpg, which uses /dev/null as the options file. -As a result, the opkg gpg.conf file was not getting -used. This change removes that flag so that gpg.conf -in the GPGHOMEDIR for opkg (currently /etc/opkg/gpg/) -will be used if present. - -Upstream-Status: Accepted [https://git.yoctoproject.org/opkg/commit/?id=cee294e72d257417b5e55ef7a76a0fd15313e46b] -Signed-off-by: Charlie Johnston <charlie.johnston@ni.com> ---- - utils/opkg-key | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/opkg-key b/utils/opkg-key -index e395a59..8645ebc 100755 ---- a/utils/opkg-key -+++ b/utils/opkg-key -@@ -53,7 +53,7 @@ else - exit 1 - fi - --GPG="$GPGCMD --no-options --homedir $GPGHOMEDIR" -+GPG="$GPGCMD --homedir $GPGHOMEDIR" - - # Gpg home dir isn't created automatically when --homedir option is used - if [ ! -e "$GPGHOMEDIR" ]; then --- -2.30.2 - diff --git a/poky/meta/recipes-devtools/opkg/opkg_0.6.1.bb b/poky/meta/recipes-devtools/opkg/opkg_0.6.2.bb index 4c25fe963a..46be137354 100644 --- a/poky/meta/recipes-devtools/opkg/opkg_0.6.1.bb +++ b/poky/meta/recipes-devtools/opkg/opkg_0.6.2.bb @@ -15,12 +15,10 @@ PE = "1" SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ file://opkg.conf \ file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ - file://0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch \ - file://0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ file://run-ptest \ -" + " -SRC_URI[sha256sum] = "e87fccb575c64d3ac0559444016a2795f12125986a0da896bab97c4a1a2f1b2a" +SRC_URI[sha256sum] = "ac73a90a2549cd04948e563d915912c78e1b8ba0f43af75c5a53fcca474adbd5" # This needs to be before ptest inherit, otherwise all ptest files end packaged # in libopkg package if OPKGLIBDIR == libdir, because default diff --git a/poky/meta/recipes-devtools/perl/files/CVE-2023-31486-0001.patch b/poky/meta/recipes-devtools/perl/files/CVE-2023-31486-0001.patch new file mode 100644 index 0000000000..0531e1f099 --- /dev/null +++ b/poky/meta/recipes-devtools/perl/files/CVE-2023-31486-0001.patch @@ -0,0 +1,217 @@ +From 77f557ef84698efeb6eed04e4a9704eaf85b741d +From: Stig Palmquist <git@stig.io> +Date: Mon Jun 5 16:46:22 2023 +0200 +Subject: [PATCH] Change verify_SSL default to 1, add ENV var to enable + insecure default + +- Changes the `verify_SSL` default parameter from `0` to `1` + + Based on patch by Dominic Hargreaves: + https://salsa.debian.org/perl-team/interpreter/perl/-/commit/1490431e40e22052f75a0b3449f1f53cbd27ba92 + + CVE: CVE-2023-31486 + +- Add check for `$ENV{PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT}` that + enables the previous insecure default behaviour if set to `1`. + + This provides a workaround for users who encounter problems with the + new `verify_SSL` default. + + Example to disable certificate checks: + ``` + $ PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT=1 ./script.pl + ``` + +- Updates to documentation: + - Describe changing the verify_SSL value + - Describe the escape-hatch environment variable + - Remove rationale for not enabling verify_SSL + - Add missing certificate search paths + - Replace "SSL" with "TLS/SSL" where appropriate + - Use "machine-in-the-middle" instead of "man-in-the-middle" + +Upstream-Status: Backport [https://github.com/chansen/p5-http-tiny/commit/77f557ef84698efeb6eed04e4a9704eaf85b741d] + +Signed-off-by: Soumya <soumya.sambu@windriver.com> +--- + cpan/HTTP-Tiny/lib/HTTP/Tiny.pm | 86 ++++++++++++++++++++++----------- + 1 file changed, 57 insertions(+), 29 deletions(-) + +diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +index 83ca06d..ebc34a1 100644 +--- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm ++++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +@@ -40,10 +40,14 @@ sub _croak { require Carp; Carp::croak(@_) } + #pod * C<timeout> — Request timeout in seconds (default is 60) If a socket open, + #pod read or write takes longer than the timeout, the request response status code + #pod will be 599. +-#pod * C<verify_SSL> — A boolean that indicates whether to validate the SSL +-#pod certificate of an C<https> — connection (default is false) ++#pod * C<verify_SSL> — A boolean that indicates whether to validate the TLS/SSL ++#pod certificate of an C<https> — connection (default is true). Changed from false ++#pod to true in version 0.083. + #pod * C<SSL_options> — A hashref of C<SSL_*> — options to pass through to + #pod L<IO::Socket::SSL> ++#pod * C<$ENV{PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT}> - Changes the default ++#pod certificate verification behavior to not check server identity if set to 1. ++#pod Only effective if C<verify_SSL> is not set. Added in version 0.083. + #pod + #pod An accessor/mutator method exists for each attribute. + #pod +@@ -111,11 +115,17 @@ sub timeout { + sub new { + my($class, %args) = @_; + ++ # Support lower case verify_ssl argument, but only if verify_SSL is not ++ # true. ++ if ( exists $args{verify_ssl} ) { ++ $args{verify_SSL} ||= $args{verify_ssl}; ++ } ++ + my $self = { + max_redirect => 5, + timeout => defined $args{timeout} ? $args{timeout} : 60, + keep_alive => 1, +- verify_SSL => $args{verify_SSL} || $args{verify_ssl} || 0, # no verification by default ++ verify_SSL => defined $args{verify_SSL} ? $args{verify_SSL} : _verify_SSL_default(), + no_proxy => $ENV{no_proxy}, + }; + +@@ -134,6 +144,13 @@ sub new { + return $self; + } + ++sub _verify_SSL_default { ++ my ($self) = @_; ++ # Check if insecure default certificate verification behaviour has been ++ # changed by the user by setting PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT=1 ++ return (($ENV{PERL_HTTP_TINY_INSECURE_BY_DEFAULT} || '') eq '1') ? 0 : 1; ++} ++ + sub _set_proxies { + my ($self) = @_; + +@@ -1055,7 +1072,7 @@ sub new { + timeout => 60, + max_line_size => 16384, + max_header_lines => 64, +- verify_SSL => 0, ++ verify_SSL => HTTP::Tiny::_verify_SSL_default(), + SSL_options => {}, + %args + }, $class; +@@ -2043,11 +2060,11 @@ proxy + timeout + verify_SSL + +-=head1 SSL SUPPORT ++=head1 TLS/SSL SUPPORT + + Direct C<https> connections are supported only if L<IO::Socket::SSL> 1.56 or + greater and L<Net::SSLeay> 1.49 or greater are installed. An error will occur +-if new enough versions of these modules are not installed or if the SSL ++if new enough versions of these modules are not installed or if the TLS + encryption fails. You can also use C<HTTP::Tiny::can_ssl()> utility function + that returns boolean to see if the required modules are installed. + +@@ -2055,7 +2072,7 @@ An C<https> connection may be made via an C<http> proxy that supports the CONNEC + command (i.e. RFC 2817). You may not proxy C<https> via a proxy that itself + requires C<https> to communicate. + +-SSL provides two distinct capabilities: ++TLS/SSL provides two distinct capabilities: + + =over 4 + +@@ -2069,24 +2086,17 @@ Verification of server identity + + =back + +-B<By default, HTTP::Tiny does not verify server identity>. +- +-Server identity verification is controversial and potentially tricky because it +-depends on a (usually paid) third-party Certificate Authority (CA) trust model +-to validate a certificate as legitimate. This discriminates against servers +-with self-signed certificates or certificates signed by free, community-driven +-CA's such as L<CAcert.org|http://cacert.org>. ++B<By default, HTTP::Tiny verifies server identity>. + +-By default, HTTP::Tiny does not make any assumptions about your trust model, +-threat level or risk tolerance. It just aims to give you an encrypted channel +-when you need one. ++This was changed in version 0.083 due to security concerns. The previous default ++behavior can be enabled by setting C<$ENV{PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT}> ++to 1. + +-Setting the C<verify_SSL> attribute to a true value will make HTTP::Tiny verify +-that an SSL connection has a valid SSL certificate corresponding to the host +-name of the connection and that the SSL certificate has been verified by a CA. +-Assuming you trust the CA, this will protect against a L<man-in-the-middle +-attack|http://en.wikipedia.org/wiki/Man-in-the-middle_attack>. If you are +-concerned about security, you should enable this option. ++Verification is done by checking that that the TLS/SSL connection has a valid ++certificate corresponding to the host name of the connection and that the ++certificate has been verified by a CA. Assuming you trust the CA, this will ++protect against L<machine-in-the-middle ++attacks|http://en.wikipedia.org/wiki/Machine-in-the-middle_attack>. + + Certificate verification requires a file containing trusted CA certificates. + +@@ -2094,9 +2104,7 @@ If the environment variable C<SSL_CERT_FILE> is present, HTTP::Tiny + will try to find a CA certificate file in that location. + + If the L<Mozilla::CA> module is installed, HTTP::Tiny will use the CA file +-included with it as a source of trusted CA's. (This means you trust Mozilla, +-the author of Mozilla::CA, the CPAN mirror where you got Mozilla::CA, the +-toolchain used to install it, and your operating system security, right?) ++included with it as a source of trusted CA's. + + If that module is not available, then HTTP::Tiny will search several + system-specific default locations for a CA certificate file: +@@ -2115,13 +2123,33 @@ system-specific default locations for a CA certificate file: + + /etc/ssl/ca-bundle.pem + ++=item * ++ ++/etc/openssl/certs/ca-certificates.crt ++ ++=item * ++ ++/etc/ssl/cert.pem ++ ++=item * ++ ++/usr/local/share/certs/ca-root-nss.crt ++ ++=item * ++ ++/etc/pki/tls/cacert.pem ++ ++=item * ++ ++/etc/certs/ca-certificates.crt ++ + =back + + An error will be occur if C<verify_SSL> is true and no CA certificate file + is available. + +-If you desire complete control over SSL connections, the C<SSL_options> attribute +-lets you provide a hash reference that will be passed through to ++If you desire complete control over TLS/SSL connections, the C<SSL_options> ++attribute lets you provide a hash reference that will be passed through to + C<IO::Socket::SSL::start_SSL()>, overriding any options set by HTTP::Tiny. For + example, to provide your own trusted CA file: + +@@ -2131,7 +2159,7 @@ example, to provide your own trusted CA file: + + The C<SSL_options> attribute could also be used for such things as providing a + client certificate for authentication to a server or controlling the choice of +-cipher used for the SSL connection. See L<IO::Socket::SSL> documentation for ++cipher used for the TLS/SSL connection. See L<IO::Socket::SSL> documentation for + details. + + =head1 PROXY SUPPORT +-- +2.40.0 diff --git a/poky/meta/recipes-devtools/perl/files/CVE-2023-31486-0002.patch b/poky/meta/recipes-devtools/perl/files/CVE-2023-31486-0002.patch new file mode 100644 index 0000000000..45452be389 --- /dev/null +++ b/poky/meta/recipes-devtools/perl/files/CVE-2023-31486-0002.patch @@ -0,0 +1,36 @@ +From a22785783b17cbaa28afaee4a024d81a1903701d +From: Stig Palmquist <git@stig.io> +Date: Sun Jun 18 11:36:05 2023 +0200 +Subject: [PATCH] Fix incorrect env var name for verify_SSL default + +The variable to override the verify_SSL default differed slightly in the +documentation from what was checked for in the code. + +This commit makes the code use `PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT` +as documented, instead of `PERL_HTTP_TINY_INSECURE_BY_DEFAULT` which was +missing `SSL_` + +CVE: CVE-2023-31486 + +Upstream-Status: Backport [https://github.com/chansen/p5-http-tiny/commit/a22785783b17cbaa28afaee4a024d81a1903701d] + +Signed-off-by: Soumya <soumya.sambu@windriver.com> +--- + cpan/HTTP-Tiny/lib/HTTP/Tiny.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +index ebc34a1..65ac8ff 100644 +--- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm ++++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +@@ -148,7 +148,7 @@ sub _verify_SSL_default { + my ($self) = @_; + # Check if insecure default certificate verification behaviour has been + # changed by the user by setting PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT=1 +- return (($ENV{PERL_HTTP_TINY_INSECURE_BY_DEFAULT} || '') eq '1') ? 0 : 1; ++ return (($ENV{PERL_HTTP_TINY_SSL_INSECURE_BY_DEFAULT} || '') eq '1') ? 0 : 1; + } + + sub _set_proxies { +-- +2.40.0 diff --git a/poky/meta/recipes-devtools/perl/perl_5.36.1.bb b/poky/meta/recipes-devtools/perl/perl_5.36.1.bb index 3db1d9c6ae..87768cc7f7 100644 --- a/poky/meta/recipes-devtools/perl/perl_5.36.1.bb +++ b/poky/meta/recipes-devtools/perl/perl_5.36.1.bb @@ -18,6 +18,8 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://determinism.patch \ file://0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch \ file://CVE-2023-31484.patch \ + file://CVE-2023-31486-0001.patch \ + file://CVE-2023-31486-0002.patch \ " SRC_URI:append:class-native = " \ file://perl-configpm-switch.patch \ diff --git a/poky/meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb b/poky/meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb index 4bdf03c574..ab1d1c84e8 100644 --- a/poky/meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb +++ b/poky/meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb @@ -15,7 +15,7 @@ LICENSE = "pkgconf" LIC_FILES_CHKSUM = "file://COPYING;md5=2214222ec1a820bd6cc75167a56925e0" SRC_URI = "\ - https://distfiles.dereferenced.org/pkgconf/pkgconf-${PV}.tar.xz \ + https://distfiles.ariadne.space/pkgconf/pkgconf-${PV}.tar.xz \ file://pkg-config-wrapper \ file://pkg-config-native.in \ file://pkg-config-esdk.in \ diff --git a/poky/meta/recipes-devtools/python/python-cython.inc b/poky/meta/recipes-devtools/python/python-cython.inc index 71596caedd..6aec6b012f 100644 --- a/poky/meta/recipes-devtools/python/python-cython.inc +++ b/poky/meta/recipes-devtools/python/python-cython.inc @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" PYPI_PACKAGE = "Cython" BBCLASSEXTEND = "native nativesdk" -SRC_URI[sha256sum] = "6e381fa0bf08b3c26ec2f616b19ae852c06f5750f4290118bf986b6f85c8c527" +SRC_URI[sha256sum] = "41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f" UPSTREAM_CHECK_REGEX = "Cython-(?P<pver>.*)\.tar" inherit pypi diff --git a/poky/meta/recipes-devtools/python/python3-cryptography-crates.inc b/poky/meta/recipes-devtools/python/python3-cryptography-crates.inc index 410c9f4042..da0a3f2ee8 100644 --- a/poky/meta/recipes-devtools/python/python3-cryptography-crates.inc +++ b/poky/meta/recipes-devtools/python/python3-cryptography-crates.inc @@ -4,135 +4,109 @@ SRC_URI += " \ crate://crates.io/Inflector/0.11.4 \ crate://crates.io/aliasable/0.1.3 \ - crate://crates.io/android_system_properties/0.1.5 \ - crate://crates.io/asn1/0.13.0 \ - crate://crates.io/asn1_derive/0.13.0 \ + crate://crates.io/asn1/0.15.2 \ + crate://crates.io/asn1_derive/0.15.2 \ crate://crates.io/autocfg/1.1.0 \ crate://crates.io/base64/0.13.1 \ crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/bumpalo/3.10.0 \ - crate://crates.io/cc/1.0.78 \ + crate://crates.io/cc/1.0.79 \ crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/chrono/0.4.23 \ - crate://crates.io/codespan-reporting/0.11.1 \ - crate://crates.io/core-foundation-sys/0.8.3 \ - crate://crates.io/cxx/1.0.85 \ - crate://crates.io/cxx-build/1.0.85 \ - crate://crates.io/cxxbridge-flags/1.0.85 \ - crate://crates.io/cxxbridge-macro/1.0.85 \ - crate://crates.io/iana-time-zone/0.1.53 \ - crate://crates.io/iana-time-zone-haiku/0.1.1 \ - crate://crates.io/indoc/0.3.6 \ - crate://crates.io/indoc-impl/0.3.6 \ - crate://crates.io/instant/0.1.12 \ - crate://crates.io/js-sys/0.3.60 \ - crate://crates.io/libc/0.2.139 \ - crate://crates.io/link-cplusplus/1.0.8 \ + crate://crates.io/foreign-types/0.3.2 \ + crate://crates.io/foreign-types-shared/0.1.1 \ + crate://crates.io/indoc/1.0.9 \ + crate://crates.io/libc/0.2.144 \ crate://crates.io/lock_api/0.4.9 \ - crate://crates.io/log/0.4.17 \ - crate://crates.io/num-integer/0.1.45 \ - crate://crates.io/num-traits/0.2.15 \ - crate://crates.io/once_cell/1.14.0 \ - crate://crates.io/ouroboros/0.15.5 \ - crate://crates.io/ouroboros_macro/0.15.5 \ - crate://crates.io/parking_lot/0.11.2 \ - crate://crates.io/parking_lot_core/0.8.6 \ - crate://crates.io/paste/0.1.18 \ - crate://crates.io/paste-impl/0.1.18 \ - crate://crates.io/pem/1.1.0 \ + crate://crates.io/memoffset/0.8.0 \ + crate://crates.io/once_cell/1.17.2 \ + crate://crates.io/openssl/0.10.54 \ + crate://crates.io/openssl-macros/0.1.1 \ + crate://crates.io/openssl-sys/0.9.88 \ + crate://crates.io/ouroboros/0.15.6 \ + crate://crates.io/ouroboros_macro/0.15.6 \ + crate://crates.io/parking_lot/0.12.1 \ + crate://crates.io/parking_lot_core/0.9.7 \ + crate://crates.io/pem/1.1.1 \ + crate://crates.io/pkg-config/0.3.27 \ crate://crates.io/proc-macro-error/1.0.4 \ crate://crates.io/proc-macro-error-attr/1.0.4 \ - crate://crates.io/proc-macro-hack/0.5.20+deprecated \ - crate://crates.io/proc-macro2/1.0.49 \ - crate://crates.io/pyo3/0.15.2 \ - crate://crates.io/pyo3-build-config/0.15.2 \ - crate://crates.io/pyo3-macros/0.15.2 \ - crate://crates.io/pyo3-macros-backend/0.15.2 \ - crate://crates.io/quote/1.0.23 \ + crate://crates.io/proc-macro2/1.0.64 \ + crate://crates.io/pyo3/0.18.3 \ + crate://crates.io/pyo3-build-config/0.18.3 \ + crate://crates.io/pyo3-ffi/0.18.3 \ + crate://crates.io/pyo3-macros/0.18.3 \ + crate://crates.io/pyo3-macros-backend/0.18.3 \ + crate://crates.io/quote/1.0.28 \ crate://crates.io/redox_syscall/0.2.16 \ crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/scratch/1.0.3 \ crate://crates.io/smallvec/1.10.0 \ - crate://crates.io/syn/1.0.107 \ - crate://crates.io/termcolor/1.1.3 \ - crate://crates.io/unicode-ident/1.0.6 \ - crate://crates.io/unicode-width/0.1.10 \ + crate://crates.io/syn/1.0.109 \ + crate://crates.io/syn/2.0.18 \ + crate://crates.io/target-lexicon/0.12.7 \ + crate://crates.io/unicode-ident/1.0.9 \ crate://crates.io/unindent/0.1.11 \ + crate://crates.io/vcpkg/0.2.15 \ crate://crates.io/version_check/0.9.4 \ - crate://crates.io/wasm-bindgen/0.2.83 \ - crate://crates.io/wasm-bindgen-backend/0.2.83 \ - crate://crates.io/wasm-bindgen-macro/0.2.83 \ - crate://crates.io/wasm-bindgen-macro-support/0.2.83 \ - crate://crates.io/wasm-bindgen-shared/0.2.83 \ - crate://crates.io/winapi/0.3.9 \ - crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ - crate://crates.io/winapi-util/0.1.5 \ - crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/windows-sys/0.45.0 \ + crate://crates.io/windows-targets/0.42.2 \ + crate://crates.io/windows_aarch64_gnullvm/0.42.2 \ + crate://crates.io/windows_aarch64_msvc/0.42.2 \ + crate://crates.io/windows_i686_gnu/0.42.2 \ + crate://crates.io/windows_i686_msvc/0.42.2 \ + crate://crates.io/windows_x86_64_gnu/0.42.2 \ + crate://crates.io/windows_x86_64_gnullvm/0.42.2 \ + crate://crates.io/windows_x86_64_msvc/0.42.2 \ " SRC_URI[Inflector-0.11.4.sha256sum] = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" SRC_URI[aliasable-0.1.3.sha256sum] = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" -SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -SRC_URI[asn1-0.13.0.sha256sum] = "2affba5e62ee09eeba078f01a00c4aed45ac4287e091298eccbb0d4802efbdc5" -SRC_URI[asn1_derive-0.13.0.sha256sum] = "bfab79c195875e5aef2bd20b4c8ed8d43ef9610bcffefbbcf66f88f555cc78af" +SRC_URI[asn1-0.15.2.sha256sum] = "28c19b9324de5b815b6487e0f8098312791b09de0dbf3d5c2db1fe2d95bab973" +SRC_URI[asn1_derive-0.15.2.sha256sum] = "a045c3ccad89f244a86bd1e6cf1a7bf645296e7692698b056399b6efd4639407" SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" SRC_URI[base64-0.13.1.sha256sum] = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -SRC_URI[bumpalo-3.10.0.sha256sum] = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" -SRC_URI[cc-1.0.78.sha256sum] = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -SRC_URI[chrono-0.4.23.sha256sum] = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -SRC_URI[codespan-reporting-0.11.1.sha256sum] = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -SRC_URI[core-foundation-sys-0.8.3.sha256sum] = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" -SRC_URI[cxx-1.0.85.sha256sum] = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" -SRC_URI[cxx-build-1.0.85.sha256sum] = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" -SRC_URI[cxxbridge-flags-1.0.85.sha256sum] = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" -SRC_URI[cxxbridge-macro-1.0.85.sha256sum] = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" -SRC_URI[iana-time-zone-0.1.53.sha256sum] = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -SRC_URI[iana-time-zone-haiku-0.1.1.sha256sum] = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -SRC_URI[indoc-0.3.6.sha256sum] = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -SRC_URI[indoc-impl-0.3.6.sha256sum] = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -SRC_URI[js-sys-0.3.60.sha256sum] = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -SRC_URI[libc-0.2.139.sha256sum] = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" -SRC_URI[link-cplusplus-1.0.8.sha256sum] = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +SRC_URI[foreign-types-0.3.2.sha256sum] = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +SRC_URI[foreign-types-shared-0.1.1.sha256sum] = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +SRC_URI[indoc-1.0.9.sha256sum] = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +SRC_URI[libc-0.2.144.sha256sum] = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" SRC_URI[lock_api-0.4.9.sha256sum] = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -SRC_URI[num-traits-0.2.15.sha256sum] = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -SRC_URI[once_cell-1.14.0.sha256sum] = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" -SRC_URI[ouroboros-0.15.5.sha256sum] = "dfbb50b356159620db6ac971c6d5c9ab788c9cc38a6f49619fca2a27acb062ca" -SRC_URI[ouroboros_macro-0.15.5.sha256sum] = "4a0d9d1a6191c4f391f87219d1ea42b23f09ee84d64763cd05ee6ea88d9f384d" -SRC_URI[parking_lot-0.11.2.sha256sum] = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -SRC_URI[parking_lot_core-0.8.6.sha256sum] = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -SRC_URI[paste-0.1.18.sha256sum] = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -SRC_URI[paste-impl-0.1.18.sha256sum] = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -SRC_URI[pem-1.1.0.sha256sum] = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +SRC_URI[memoffset-0.8.0.sha256sum] = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +SRC_URI[once_cell-1.17.2.sha256sum] = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" +SRC_URI[openssl-0.10.54.sha256sum] = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" +SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +SRC_URI[openssl-sys-0.9.88.sha256sum] = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" +SRC_URI[ouroboros-0.15.6.sha256sum] = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" +SRC_URI[ouroboros_macro-0.15.6.sha256sum] = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" +SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +SRC_URI[parking_lot_core-0.9.7.sha256sum] = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +SRC_URI[pem-1.1.1.sha256sum] = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +SRC_URI[pkg-config-0.3.27.sha256sum] = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -SRC_URI[proc-macro-hack-0.5.20+deprecated.sha256sum] = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" -SRC_URI[proc-macro2-1.0.49.sha256sum] = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" -SRC_URI[pyo3-0.15.2.sha256sum] = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752" -SRC_URI[pyo3-build-config-0.15.2.sha256sum] = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" -SRC_URI[pyo3-macros-0.15.2.sha256sum] = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a" -SRC_URI[pyo3-macros-backend-0.15.2.sha256sum] = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095" -SRC_URI[quote-1.0.23.sha256sum] = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +SRC_URI[proc-macro2-1.0.64.sha256sum] = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +SRC_URI[pyo3-0.18.3.sha256sum] = "e3b1ac5b3731ba34fdaa9785f8d74d17448cd18f30cf19e0c7e7b1fdb5272109" +SRC_URI[pyo3-build-config-0.18.3.sha256sum] = "9cb946f5ac61bb61a5014924910d936ebd2b23b705f7a4a3c40b05c720b079a3" +SRC_URI[pyo3-ffi-0.18.3.sha256sum] = "fd4d7c5337821916ea2a1d21d1092e8443cf34879e53a0ac653fbb98f44ff65c" +SRC_URI[pyo3-macros-0.18.3.sha256sum] = "a9d39c55dab3fc5a4b25bbd1ac10a2da452c4aca13bb450f22818a002e29648d" +SRC_URI[pyo3-macros-backend-0.18.3.sha256sum] = "97daff08a4c48320587b5224cc98d609e3c27b6d437315bd40b605c98eeb5918" +SRC_URI[quote-1.0.28.sha256sum] = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -SRC_URI[scratch-1.0.3.sha256sum] = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" SRC_URI[smallvec-1.10.0.sha256sum] = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" -SRC_URI[syn-1.0.107.sha256sum] = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -SRC_URI[termcolor-1.1.3.sha256sum] = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -SRC_URI[unicode-ident-1.0.6.sha256sum] = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" -SRC_URI[unicode-width-0.1.10.sha256sum] = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +SRC_URI[syn-2.0.18.sha256sum] = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +SRC_URI[target-lexicon-0.12.7.sha256sum] = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +SRC_URI[unicode-ident-1.0.9.sha256sum] = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" SRC_URI[unindent-0.1.11.sha256sum] = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +SRC_URI[vcpkg-0.2.15.sha256sum] = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -SRC_URI[wasm-bindgen-0.2.83.sha256sum] = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -SRC_URI[wasm-bindgen-backend-0.2.83.sha256sum] = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -SRC_URI[wasm-bindgen-macro-0.2.83.sha256sum] = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -SRC_URI[wasm-bindgen-macro-support-0.2.83.sha256sum] = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -SRC_URI[wasm-bindgen-shared-0.2.83.sha256sum] = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" -SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[windows-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +SRC_URI[windows-targets-0.42.2.sha256sum] = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +SRC_URI[windows_aarch64_gnullvm-0.42.2.sha256sum] = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +SRC_URI[windows_aarch64_msvc-0.42.2.sha256sum] = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +SRC_URI[windows_i686_gnu-0.42.2.sha256sum] = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +SRC_URI[windows_i686_msvc-0.42.2.sha256sum] = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +SRC_URI[windows_x86_64_gnu-0.42.2.sha256sum] = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +SRC_URI[windows_x86_64_gnullvm-0.42.2.sha256sum] = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" diff --git a/poky/meta/recipes-devtools/python/python3-cryptography-vectors_39.0.2.bb b/poky/meta/recipes-devtools/python/python3-cryptography-vectors_41.0.2.bb index 795e27f75b..52f2c35315 100644 --- a/poky/meta/recipes-devtools/python/python3-cryptography-vectors_39.0.2.bb +++ b/poky/meta/recipes-devtools/python/python3-cryptography-vectors_41.0.2.bb @@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ # NOTE: Make sure to keep this recipe at the same version as python3-cryptography # Upgrade both recipes at the same time -SRC_URI[sha256sum] = "a68f106f7a4322cf1e7ed51e3fc6d5c1e0b11d337ed918ec879e8afe0c2a5220" +SRC_URI[sha256sum] = "028dff94a8522ca818b11295ff12df55f348f33a193c0597ddfe8239e53d1582" PYPI_PACKAGE = "cryptography_vectors" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta DEPENDS += " \ ${PYTHON_PN}-cryptography \ diff --git a/poky/meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch b/poky/meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch new file mode 100644 index 0000000000..d720359ded --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch @@ -0,0 +1,52 @@ +From 2f9cd402d3293f6efe0f3ac06f17c6c14edbed86 Mon Sep 17 00:00:00 2001 +From: James Hilliard <james.hilliard1@gmail.com> +Date: Sun, 25 Jun 2023 17:39:19 -0600 +Subject: [PATCH] Fix include directory when cross compiling (#9129) + +Upstream-Status: Backport [https://github.com/pyca/cryptography/pull/9129] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + src/rust/cryptography-cffi/build.rs | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/src/rust/cryptography-cffi/build.rs b/src/rust/cryptography-cffi/build.rs +index 07590ad2e..384af1ddb 100644 +--- a/src/rust/cryptography-cffi/build.rs ++++ b/src/rust/cryptography-cffi/build.rs +@@ -47,9 +47,14 @@ fn main() { + ) + .unwrap(); + println!("cargo:rustc-cfg=python_implementation=\"{}\"", python_impl); +- let python_include = run_python_script( ++ let python_includes = run_python_script( + &python, +- "import sysconfig; print(sysconfig.get_path('include'), end='')", ++ "import os; \ ++ import setuptools.dist; \ ++ import setuptools.command.build_ext; \ ++ b = setuptools.command.build_ext.build_ext(setuptools.dist.Distribution()); \ ++ b.finalize_options(); \ ++ print(os.pathsep.join(b.include_dirs), end='')", + ) + .unwrap(); + let openssl_include = +@@ -59,12 +64,15 @@ fn main() { + let mut build = cc::Build::new(); + build + .file(openssl_c) +- .include(python_include) + .include(openssl_include) + .flag_if_supported("-Wconversion") + .flag_if_supported("-Wno-error=sign-conversion") + .flag_if_supported("-Wno-unused-parameter"); + ++ for python_include in env::split_paths(&python_includes) { ++ build.include(python_include); ++ } ++ + // Enable abi3 mode if we're not using PyPy. + if python_impl != "PyPy" { + // cp37 (Python 3.7 to help our grep when we some day drop 3.7 support) +-- +2.30.2 + diff --git a/poky/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch b/poky/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch index 481f595246..69cf451d57 100644 --- a/poky/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch +++ b/poky/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch @@ -1,4 +1,4 @@ -From ce972ea92d724f232323a9a6265a8b44d913d4d8 Mon Sep 17 00:00:00 2001 +From b7dd3ce1d75d1e6255e1aca82aa7f401d4246a75 Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> Date: Tue, 17 May 2022 17:22:48 +0800 Subject: [PATCH] pyproject.toml: remove --benchmark-disable option @@ -18,23 +18,28 @@ Fixes: Upstream-Status: Inappropriate [OE specific] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> + --- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 4d58129..b011fca 100644 +index b2e511f..4a285af 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -15,7 +15,7 @@ line-length = 79 - target-version = ["py36"] +@@ -85,7 +85,7 @@ line-length = 79 + target-version = ["py37"] [tool.pytest.ini_options] -addopts = "-r s --capture=no --strict-markers --benchmark-disable" +addopts = "-r s --capture=no --strict-markers" + console_output_style = "progress-even-when-capture-no" markers = [ "skip_fips: this test is not executed in FIPS mode", - "supported: parametrized test requiring only_if and skip_message", --- -2.25.1 - +@@ -151,4 +151,4 @@ git-only = [ + "ci-constraints-requirements.txt", + ".gitattributes", + ".gitignore", +-] +\ No newline at end of file ++] diff --git a/poky/meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch b/poky/meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch deleted file mode 100644 index 366e3a4d39..0000000000 --- a/poky/meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4b73298b214a5b69ea6edf3c2e21dd82b2b29708 Mon Sep 17 00:00:00 2001 -From: Tim Orling <tim.orling@konsulko.com> -Date: Fri, 14 Jan 2022 22:34:59 -0800 -Subject: [PATCH 2/2] Cargo.toml: edition 2018 -> 2021 - -Upstream-Status: Pending - -Signed-off-by: Tim Orling <tim.orling@konsulko.com> ---- - src/rust/Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml -index 174eaa80..7ad053d9 100644 ---- a/src/rust/Cargo.toml -+++ b/src/rust/Cargo.toml -@@ -2,7 +2,7 @@ - name = "cryptography-rust" - version = "0.1.0" - authors = ["The cryptography developers <cryptography-dev@python.org>"] --edition = "2018" -+edition = "2021" - publish = false - - [dependencies] --- -2.30.2 - diff --git a/poky/meta/recipes-devtools/python/python3-cryptography_39.0.2.bb b/poky/meta/recipes-devtools/python/python3-cryptography_41.0.2.bb index 449e3ba1bc..20d6c97f36 100644 --- a/poky/meta/recipes-devtools/python/python3-cryptography_39.0.2.bb +++ b/poky/meta/recipes-devtools/python/python3-cryptography_41.0.2.bb @@ -1,26 +1,24 @@ SUMMARY = "Provides cryptographic recipes and primitives to python developers" HOMEPAGE = "https://cryptography.io/" SECTION = "devel/python" -LICENSE = "( Apache-2.0 | BSD-3-Clause ) & PSF-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bf405a8056a6647e7d077b0e7bc36aba \ +LICENSE = "Apache-2.0 | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \ file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b \ - file://LICENSE.PSF;md5=43c37d21e1dbad10cddcd150ba2c0595 \ " LDSHARED += "-pthread" -SRC_URI[sha256sum] = "bc5b871e977c8ee5a1bbc42fa8d19bcc08baf0c51cbf1586b0e87a2694dde42f" +SRC_URI[sha256sum] = "7d230bf856164de164ecb615ccc14c7fc6de6906ddd5b491f3af90d3514c925c" -SRC_URI += "\ - file://0002-Cargo.toml-edition-2018-2021.patch \ - file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ - file://check-memfree.py \ - file://run-ptest \ -" +SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ + file://0001-Fix-include-directory-when-cross-compiling-9129.patch \ + file://check-memfree.py \ + file://run-ptest \ + " require ${BPN}-crates.inc -inherit pypi python_setuptools3_rust cargo-update-recipe-crates +inherit pypi python_setuptools3_rust cargo-update-recipe-crates pkgconfig DEPENDS += " \ ${PYTHON_PN}-cffi-native \ diff --git a/poky/meta/recipes-devtools/python/python3-cython_0.29.35.bb b/poky/meta/recipes-devtools/python/python3-cython_0.29.36.bb index 78be2b94ed..78be2b94ed 100644 --- a/poky/meta/recipes-devtools/python/python3-cython_0.29.35.bb +++ b/poky/meta/recipes-devtools/python/python3-cython_0.29.36.bb diff --git a/poky/meta/recipes-devtools/python/python3-editables_0.3.bb b/poky/meta/recipes-devtools/python/python3-editables_0.4.bb index b42ff06872..c53186997a 100644 --- a/poky/meta/recipes-devtools/python/python3-editables_0.3.bb +++ b/poky/meta/recipes-devtools/python/python3-editables_0.4.bb @@ -4,8 +4,12 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=41bc1be47b7bb8240db3ef928c7cb0bf" -SRC_URI[sha256sum] = "167524e377358ed1f1374e61c268f0d7a4bf7dbd046c656f7b410cde16161b1a" +SRC_URI[sha256sum] = "dc322c42e7ccaf19600874035a4573898d88aadd07e177c239298135b75da772" inherit pypi python_setuptools_build_meta +RDEPENDS:${PN} += "\ + python3-io \ +" + BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-git_3.1.31.bb b/poky/meta/recipes-devtools/python/python3-git_3.1.32.bb index 08b9f66bcb..f217577eb8 100644 --- a/poky/meta/recipes-devtools/python/python3-git_3.1.31.bb +++ b/poky/meta/recipes-devtools/python/python3-git_3.1.32.bb @@ -12,7 +12,7 @@ PYPI_PACKAGE = "GitPython" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "8ce3bcf69adfdf7c7d503e78fd3b1c492af782d58893b650adb2ac8912ddd573" +SRC_URI[sha256sum] = "8d9b8cb1e80b9735e8717c9362079d3ce4c6e5ddeebedd0361b228c3a67a62f6" DEPENDS += " ${PYTHON_PN}-gitdb" diff --git a/poky/meta/recipes-devtools/python/python3-hatchling_1.17.0.bb b/poky/meta/recipes-devtools/python/python3-hatchling_1.18.0.bb index 05a86f0efb..c94e49dab3 100644 --- a/poky/meta/recipes-devtools/python/python3-hatchling_1.17.0.bb +++ b/poky/meta/recipes-devtools/python/python3-hatchling_1.18.0.bb @@ -8,7 +8,7 @@ inherit pypi python_hatchling DEPENDS += "python3-pluggy-native python3-pathspec-native python3-packaging-native python3-editables-native python3-trove-classifiers-native" DEPENDS:remove:class-native = "python3-hatchling-native" -SRC_URI[sha256sum] = "b1244db3f45b4ef5a00106a46612da107cdfaf85f1580b8e1c059fefc98b0930" +SRC_URI[sha256sum] = "50e99c3110ce0afc3f7bdbadff1c71c17758e476731c27607940cfa6686489ca" do_compile:prepend() { export PYTHONPATH=src diff --git a/poky/meta/recipes-devtools/python/python3-hypothesis_6.75.7.bb b/poky/meta/recipes-devtools/python/python3-hypothesis_6.81.2.bb index dc21bc67c6..93bf638759 100644 --- a/poky/meta/recipes-devtools/python/python3-hypothesis_6.75.7.bb +++ b/poky/meta/recipes-devtools/python/python3-hypothesis_6.81.2.bb @@ -13,7 +13,7 @@ SRC_URI += " \ file://test_rle.py \ " -SRC_URI[sha256sum] = "a8ef2e0c7d5ebd90043a4ed8f6987de6a2b497b2caf6863364ff41db25971856" +SRC_URI[sha256sum] = "e35165a73064370d30d476d7218f600d2bf861ff218192c9e994cb36aa190ae7" RDEPENDS:${PN} += " \ python3-attrs \ diff --git a/poky/meta/recipes-devtools/python/python3-importlib-metadata_6.6.0.bb b/poky/meta/recipes-devtools/python/python3-importlib-metadata_6.8.0.bb index 34bc55b0e1..b8dd4bb701 100644 --- a/poky/meta/recipes-devtools/python/python3-importlib-metadata_6.6.0.bb +++ b/poky/meta/recipes-devtools/python/python3-importlib-metadata_6.8.0.bb @@ -8,7 +8,7 @@ inherit pypi python_setuptools_build_meta PYPI_PACKAGE = "importlib_metadata" UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P<pver>(\d+[\.\-_]*)+)/" -SRC_URI[sha256sum] = "92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705" +SRC_URI[sha256sum] = "dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743" S = "${WORKDIR}/importlib_metadata-${PV}" diff --git a/poky/meta/recipes-devtools/python/python3-iso8601_1.1.0.bb b/poky/meta/recipes-devtools/python/python3-iso8601_2.0.0.bb index 797607f81e..a8dccb90c7 100644 --- a/poky/meta/recipes-devtools/python/python3-iso8601_1.1.0.bb +++ b/poky/meta/recipes-devtools/python/python3-iso8601_2.0.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://pyiso8601.readthedocs.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=aab31f2ef7ba214a5a341eaa47a7f367" -SRC_URI[sha256sum] = "32811e7b81deee2063ea6d2e94f8819a86d1f3811e49d23623a41fa832bef03f" +SRC_URI[sha256sum] = "739960d37c74c77bd9bd546a76562ccb581fe3d4820ff5c3141eb49c839fda8f" inherit pypi python_poetry_core diff --git a/poky/meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch b/poky/meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch deleted file mode 100644 index 4121834dbf..0000000000 --- a/poky/meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 04a864f33848da6af1dea906ba4922770022ef66 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Thu, 16 Mar 2023 14:21:32 +0000 -Subject: [PATCH] Clean up test runner - -Test code doesn't need to manually construct a TestSuite and a -TextTestRunner, the unittest module has a discovery function that does -all this for you. - -Delete all of the manual logic from tests.py, replace it with the two -lines to bring in the doctest unit tests, and update the makefile to -run the unittest discovery. - -Upstream-Status: Submitted [https://github.com/stefankoegl/python-json-pointer/pull/54] -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - makefile | 2 +- - tests.py | 24 ++++-------------------- - 2 files changed, 5 insertions(+), 21 deletions(-) - -diff --git a/tests.py b/tests.py -index 9252369..6b4b8cc 100755 ---- a/tests.py -+++ b/tests.py -@@ -7,6 +7,7 @@ import doctest - import unittest - import sys - import copy -+import jsonpointer - from jsonpointer import resolve_pointer, EndOfList, JsonPointerException, \ - JsonPointer, set_pointer - -@@ -410,23 +411,6 @@ class AltTypesTests(unittest.TestCase): - self.assertRaises(JsonPointerException, resolve_pointer, doc, '/root/1/2/3/4') - - -- --suite = unittest.TestSuite() --suite.addTest(unittest.makeSuite(SpecificationTests)) --suite.addTest(unittest.makeSuite(ComparisonTests)) --suite.addTest(unittest.makeSuite(WrongInputTests)) --suite.addTest(unittest.makeSuite(ToLastTests)) --suite.addTest(unittest.makeSuite(SetTests)) --suite.addTest(unittest.makeSuite(AltTypesTests)) -- --modules = ['jsonpointer'] -- --for module in modules: -- m = __import__(module, fromlist=[module]) -- suite.addTest(doctest.DocTestSuite(m)) -- --runner = unittest.TextTestRunner(verbosity=1) --result = runner.run(suite) -- --if not result.wasSuccessful(): -- sys.exit(1) -+def load_tests(loader, tests, ignore): -+ tests.addTests(doctest.DocTestSuite(jsonpointer)) -+ return tests --- -2.34.1 - diff --git a/poky/meta/recipes-devtools/python/python3-jsonpointer_2.3.bb b/poky/meta/recipes-devtools/python/python3-jsonpointer_2.4.bb index 0ec4de055c..d7a1fea70a 100644 --- a/poky/meta/recipes-devtools/python/python3-jsonpointer_2.3.bb +++ b/poky/meta/recipes-devtools/python/python3-jsonpointer_2.4.bb @@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=32b15c843b7a329130f4e266a281ebb3" inherit pypi ptest setuptools3 -SRC_URI += "file://0001-Clean-up-test-runner.patch" - -SRC_URI[sha256sum] = "97cba51526c829282218feb99dab1b1e6bdf8efd1c43dc9d57be093c0d69c99a" +SRC_URI[sha256sum] = "585cee82b70211fa9e6043b7bb89db6e1aa49524340dde8ad6b63206ea689d88" RDEPENDS:${PN} += " \ ${PYTHON_PN}-json \ diff --git a/poky/meta/recipes-devtools/python/python3-lxml_4.9.2.bb b/poky/meta/recipes-devtools/python/python3-lxml_4.9.3.bb index c7f1e1fc3c..b911f7b2ad 100644 --- a/poky/meta/recipes-devtools/python/python3-lxml_4.9.2.bb +++ b/poky/meta/recipes-devtools/python/python3-lxml_4.9.3.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ DEPENDS += "libxml2 libxslt" -SRC_URI[sha256sum] = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67" +SRC_URI[sha256sum] = "48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c" SRC_URI += "${PYPI_SRC_URI}" inherit pkgconfig pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb b/poky/meta/recipes-devtools/python/python3-markupsafe_2.1.3.bb index d150403f8c..b346cc85d9 100644 --- a/poky/meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb +++ b/poky/meta/recipes-devtools/python/python3-markupsafe_2.1.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://github.com/mitsuhiko/markupsafe" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[sha256sum] = "abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d" +SRC_URI[sha256sum] = "af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad" PYPI_PACKAGE = "MarkupSafe" inherit pypi setuptools3 ptest diff --git a/poky/meta/recipes-devtools/python/python3-numpy_1.24.3.bb b/poky/meta/recipes-devtools/python/python3-numpy_1.25.1.bb index 710af5fe8f..3632ab71ee 100644 --- a/poky/meta/recipes-devtools/python/python3-numpy_1.24.3.bb +++ b/poky/meta/recipes-devtools/python/python3-numpy_1.25.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://numpy.org/" DESCRIPTION = "NumPy is the fundamental package needed for scientific computing with Python." SECTION = "devel/python" LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF-2.0 & Apache-2.0 & MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8026691468924fb6ec155dadfe2a1a7f" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7614a5b0073688df53773ec6ec7fe81d" SRCNAME = "numpy" @@ -12,7 +12,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ file://0001-numpy-core-Define-RISCV-32-support.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "ab344f1bf21f140adab8e47fdbc7c35a477dc01408791f8ba00d018dd0bc5155" +SRC_URI[sha256sum] = "9a3a9f3a61480cc086117b426a8bd86869c213fc4072e606f01c4e4b66eb92bf" GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" diff --git a/poky/meta/recipes-devtools/python/python3-pip_23.1.2.bb b/poky/meta/recipes-devtools/python/python3-pip_23.2.bb index a0ebd765bf..1ddec7d654 100644 --- a/poky/meta/recipes-devtools/python/python3-pip_23.1.2.bb +++ b/poky/meta/recipes-devtools/python/python3-pip_23.2.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=63ec52baf95163b597008bb46db68030 \ file://src/pip/_vendor/msgpack/COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751 \ file://src/pip/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \ file://src/pip/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93 \ - file://src/pip/_vendor/pkg_resources/LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6 \ + file://src/pip/_vendor/pkg_resources/LICENSE;md5=141643e11c48898150daa83802dbc65f \ file://src/pip/_vendor/platformdirs/LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a \ file://src/pip/_vendor/pygments/LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592 \ file://src/pip/_vendor/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1 \ @@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=63ec52baf95163b597008bb46db68030 \ file://src/pip/_vendor/six.LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d \ file://src/pip/_vendor/tenacity/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \ file://src/pip/_vendor/tomli/LICENSE;md5=aaaaf0879d17df0110d1aa8c8c9f46f5 \ - file://src/pip/_vendor/typing_extensions.LICENSE;md5=f16b323917992e0f8a6f0071bc9913e2 \ + file://src/pip/_vendor/typing_extensions.LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2 \ file://src/pip/_vendor/urllib3/LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c \ file://src/pip/_vendor/webencodings/LICENSE;md5=81fb24cd7823cce23b69f721993dce4d \ " @@ -33,7 +33,7 @@ inherit pypi python_setuptools_build_meta SRC_URI += "file://no_shebang_mangling.patch" -SRC_URI[sha256sum] = "0e7c86f486935893c708287b30bd050a36ac827ec7fe5e43fe7cb198dd835fba" +SRC_URI[sha256sum] = "a160a170f3331d9ca1a0247eb1cd79c758879f1f81158f9cd05bbb5df80bea5c" do_install:append() { rm -f ${D}/${bindir}/pip diff --git a/poky/meta/recipes-devtools/python/python3-pluggy_1.0.0.bb b/poky/meta/recipes-devtools/python/python3-pluggy_1.2.0.bb index 99ae6336b7..3322bb523b 100644 --- a/poky/meta/recipes-devtools/python/python3-pluggy_1.0.0.bb +++ b/poky/meta/recipes-devtools/python/python3-pluggy_1.2.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pytest-dev/pluggy" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1c8206d16fd5cc02fa9b0bb98955e5c2" -SRC_URI[sha256sum] = "4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159" +SRC_URI[sha256sum] = "d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" RDEPENDS:${PN} += "${PYTHON_PN}-importlib-metadata \ diff --git a/poky/meta/recipes-devtools/python/python3-pycairo_1.23.0.bb b/poky/meta/recipes-devtools/python/python3-pycairo_1.24.0.bb index 5214a05d53..8059750de0 100644 --- a/poky/meta/recipes-devtools/python/python3-pycairo_1.23.0.bb +++ b/poky/meta/recipes-devtools/python/python3-pycairo_1.24.0.bb @@ -13,7 +13,7 @@ DEPENDS = "cairo python3" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/pycairo-${PV}.tar.gz" GITHUB_BASE_URI = "https://github.com/pygobject/pycairo/releases/" -SRC_URI[sha256sum] = "9b61ac818723adc04367301317eb2e814a83522f07bbd1f409af0dada463c44c" +SRC_URI[sha256sum] = "1444d52f1bb4cc79a4a0c0fe2ccec4bd78ff885ab01ebe1c0f637d8392bcafb6" S = "${WORKDIR}/pycairo-${PV}" diff --git a/poky/meta/recipes-devtools/python/python3-pygments_2.14.0.bb b/poky/meta/recipes-devtools/python/python3-pygments_2.15.1.bb index 16769e9263..e0e477100e 100644 --- a/poky/meta/recipes-devtools/python/python3-pygments_2.14.0.bb +++ b/poky/meta/recipes-devtools/python/python3-pygments_2.15.1.bb @@ -4,8 +4,8 @@ HOMEPAGE = "http://pygments.org/" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592" -inherit setuptools3 -SRC_URI[sha256sum] = "b3ed06a9e8ac9a9aae5a6f5dbe78a8a58655d17b43b93c078f094ddc476ae297" +inherit python_setuptools_build_meta +SRC_URI[sha256sum] = "8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c" DEPENDS += "\ ${PYTHON_PN} \ diff --git a/poky/meta/recipes-devtools/python/python3-pyparsing_3.0.9.bb b/poky/meta/recipes-devtools/python/python3-pyparsing_3.1.0.bb index b858073c3b..e5c6d5f832 100644 --- a/poky/meta/recipes-devtools/python/python3-pyparsing_3.0.9.bb +++ b/poky/meta/recipes-devtools/python/python3-pyparsing_3.1.0.bb @@ -10,7 +10,7 @@ BUGTRACKER = "https://github.com/pyparsing/pyparsing/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=657a566233888513e1f07ba13e2f47f1" -SRC_URI[sha256sum] = "2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb" +SRC_URI[sha256sum] = "edb662d6fe322d6e990b1594b5feaeadf806803359e3d4d42f11e295e588f0ea" UPSTREAM_CHECK_REGEX = "pyparsing-(?P<pver>.*)\.tar" diff --git a/poky/meta/recipes-devtools/python/python3-pytest-subtests_0.10.0.bb b/poky/meta/recipes-devtools/python/python3-pytest-subtests_0.11.0.bb index e1f2a49d31..ddba031880 100644 --- a/poky/meta/recipes-devtools/python/python3-pytest-subtests_0.10.0.bb +++ b/poky/meta/recipes-devtools/python/python3-pytest-subtests_0.11.0.bb @@ -7,9 +7,9 @@ BUGTRACKER = "https://github.com/pytest-dev/pytest-subtests/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=242b4e17fa287dcf7aef372f6bc3dcb1" -SRC_URI[sha256sum] = "d9961a67c1791e8c1e32dce7a70ed1e54f3b1e641087f2094f2d37087ab7fb17" +SRC_URI[sha256sum] = "51865c88457545f51fb72011942f0a3c6901ee9e24cbfb6d1b9dc1348bafbe37" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta DEPENDS += "${PYTHON_PN}-setuptools-scm-native" diff --git a/poky/meta/recipes-devtools/python/python3-pytest_7.3.1.bb b/poky/meta/recipes-devtools/python/python3-pytest_7.4.0.bb index 914ea55346..323dfebe38 100644 --- a/poky/meta/recipes-devtools/python/python3-pytest_7.3.1.bb +++ b/poky/meta/recipes-devtools/python/python3-pytest_7.4.0.bb @@ -5,7 +5,7 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c" -SRC_URI[sha256sum] = "434afafd78b1d78ed0addf160ad2b77a30d35d4bdf8af234fe621919d9ed15e3" +SRC_URI[sha256sum] = "b4bf8c45bd59934ed84001ad51e11b4ee40d40a1229d2c79f9c592b0a3f6bd8a" DEPENDS += "python3-setuptools-scm-native" diff --git a/poky/meta/recipes-devtools/python/python3-ruamel-yaml_0.17.31.bb b/poky/meta/recipes-devtools/python/python3-ruamel-yaml_0.17.32.bb index 5604ff01e4..b745f349e7 100644 --- a/poky/meta/recipes-devtools/python/python3-ruamel-yaml_0.17.31.bb +++ b/poky/meta/recipes-devtools/python/python3-ruamel-yaml_0.17.32.bb @@ -9,7 +9,7 @@ PYPI_PACKAGE = "ruamel.yaml" inherit pypi setuptools3 -SRC_URI[sha256sum] = "098ed1eb6d338a684891a72380277c1e6fc4d4ae0e120de9a447275056dda335" +SRC_URI[sha256sum] = "ec939063761914e14542972a5cba6d33c23b0859ab6342f61cf070cfc600efc2" RDEPENDS:${PN} += "\ ${PYTHON_PN}-shell \ diff --git a/poky/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/poky/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch index 4d56dc89ba..1e5ab498a4 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/poky/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From 2b06ca797d3ccc5b195aaa04a085c44bf61d4de3 Mon Sep 17 00:00:00 2001 +From 5e603da9c01ccb828a03ea3e82d15599971f794f Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -9,17 +9,16 @@ internet by easy_install. Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - --- setuptools/command/easy_install.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 444d3b3..61e445a 100644 +index 0b8d1159..93308060 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py -@@ -648,6 +648,11 @@ class easy_install(Command): - os.path.exists(tmpdir) and rmtree(tmpdir) +@@ -644,6 +644,11 @@ class easy_install(Command): + os.path.exists(tmpdir) and _rmtree(tmpdir) def easy_install(self, spec, deps=False): + if os.environ.get('NO_FETCH_BUILD', None): @@ -30,3 +29,6 @@ index 444d3b3..61e445a 100644 with self._tmpdir() as tmpdir: if not isinstance(spec, Requirement): if URL_SCHEME(spec): +-- +2.41.0 + diff --git a/poky/meta/recipes-devtools/python/python3-setuptools_67.6.1.bb b/poky/meta/recipes-devtools/python/python3-setuptools_68.0.0.bb index ad0d7cc527..4ac789d18c 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools_67.6.1.bb +++ b/poky/meta/recipes-devtools/python/python3-setuptools_68.0.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Download, build, install, upgrade, and uninstall Python packages" HOMEPAGE = "https://pypi.org/project/setuptools" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=19;md5=7a7126e068206290f3fe9f8d6c713ea6" +LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" inherit pypi python_setuptools_build_meta @@ -11,7 +11,7 @@ SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-e SRC_URI += " \ file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" -SRC_URI[sha256sum] = "257de92a9d50a60b8e22abfcbb771571fde0dbf3ec234463212027a4eeecbe9a" +SRC_URI[sha256sum] = "baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235" DEPENDS += "${PYTHON_PN}" diff --git a/poky/meta/recipes-devtools/python/python3-sphinx-rtd-theme_1.2.1.bb b/poky/meta/recipes-devtools/python/python3-sphinx-rtd-theme_1.2.2.bb index 25de0159b6..0fac83a1c9 100644 --- a/poky/meta/recipes-devtools/python/python3-sphinx-rtd-theme_1.2.1.bb +++ b/poky/meta/recipes-devtools/python/python3-sphinx-rtd-theme_1.2.2.bb @@ -13,7 +13,7 @@ RDEPENDS:${PN} += " \ PYPI_PACKAGE = "sphinx_rtd_theme" -SRC_URI[sha256sum] = "cf9a7dc0352cf179c538891cb28d6fad6391117d4e21c891776ab41dd6c8ff70" +SRC_URI[sha256sum] = "01c5c5a72e2d025bd23d1f06c59a4831b06e6ce6c01fdd5ebfe9986c0a880fc7" UPSTREAM_CHECK_REGEX ?= "/sphinx-rtd-theme/(?P<pver>(\d+[\.\-_]*)+)/" inherit setuptools3 pypi diff --git a/poky/meta/recipes-devtools/python/python3-trove-classifiers_2023.5.24.bb b/poky/meta/recipes-devtools/python/python3-trove-classifiers_2023.7.6.bb index 2d484d4b2c..7879dc2031 100644 --- a/poky/meta/recipes-devtools/python/python3-trove-classifiers_2023.5.24.bb +++ b/poky/meta/recipes-devtools/python/python3-trove-classifiers_2023.7.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pypa/trove-classifiers" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "fd5a1546283be941f47540a135bdeae8fb261380a6a204d9c18012f2a1b0ceae" +SRC_URI[sha256sum] = "8a8e168b51d20fed607043831d37632bb50919d1c80a64e0f1393744691a8b22" inherit pypi python_setuptools_build_meta ptest diff --git a/poky/meta/recipes-devtools/python/python3-typing-extensions_4.6.2.bb b/poky/meta/recipes-devtools/python/python3-typing-extensions_4.7.1.bb index be43fe4a64..8ff77ba4fd 100644 --- a/poky/meta/recipes-devtools/python/python3-typing-extensions_4.6.2.bb +++ b/poky/meta/recipes-devtools/python/python3-typing-extensions_4.7.1.bb @@ -10,12 +10,12 @@ HOMEPAGE = "https://github.com/python/typing_extensions" BUGTRACKER = "https://github.com/python/typing_extensions/issues" SECTIONS = "libs" LICENSE = "PSF-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f16b323917992e0f8a6f0071bc9913e2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2" # The name on PyPi is slightly different. PYPI_PACKAGE = "typing_extensions" -SRC_URI[sha256sum] = "06006244c70ac8ee83fa8282cb188f697b8db25bc8b4df07be1873c43897060c" +SRC_URI[sha256sum] = "b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2" inherit pypi python_flit_core diff --git a/poky/meta/recipes-devtools/python/python3-urllib3_2.0.2.bb b/poky/meta/recipes-devtools/python/python3-urllib3_2.0.3.bb index bc1cdb009f..64b21db86d 100644 --- a/poky/meta/recipes-devtools/python/python3-urllib3_2.0.2.bb +++ b/poky/meta/recipes-devtools/python/python3-urllib3_2.0.3.bb @@ -1,9 +1,9 @@ SUMMARY = "Python HTTP library with thread-safe connection pooling, file post support, sanity friendly, and more" HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=52d273a3054ced561275d4d15260ecda" -SRC_URI[sha256sum] = "61717a1095d7e155cdb737ac7bb2f4324a858a1e2e6466f6d03ff630ca68d3cc" +SRC_URI[sha256sum] = "bee28b5e56addb8226c96f7f13ac28cb4c301dd5ea8a6ca179c0b9835e032825" inherit pypi python_hatchling diff --git a/poky/meta/recipes-devtools/python/python3-zipp_3.15.0.bb b/poky/meta/recipes-devtools/python/python3-zipp_3.16.2.bb index 45654ff6f1..9dff59ffaf 100644 --- a/poky/meta/recipes-devtools/python/python3-zipp_3.15.0.bb +++ b/poky/meta/recipes-devtools/python/python3-zipp_3.16.2.bb @@ -1,9 +1,9 @@ SUMMARY = "Backport of pathlib-compatible object wrapper for zip files" HOMEPAGE = "https://github.com/jaraco/zipp" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" +LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" -SRC_URI[sha256sum] = "112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b" +SRC_URI[sha256sum] = "ebc15946aa78bd63458992fc81ec3b6f7b1e92d51c35e6de1c3804e73b799147" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" diff --git a/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch index c9253832cf..222a567dd5 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch @@ -1,4 +1,4 @@ -From 6cb667f37beacd832cb409e5244b3c90dfad32f7 Mon Sep 17 00:00:00 2001 +From aa8f1709c54557d2b51a9a37d15ccc3de62e90cb Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <jpuhlman@mvista.com> Date: Wed, 4 Mar 2020 00:06:42 +0000 Subject: [PATCH] Don't search system for headers/libraries diff --git a/poky/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch b/poky/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch index df5179e877..07c6aef9b9 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch @@ -1,4 +1,4 @@ -From 86061629f4a179e740a17e53dd2c98ab47af2fe2 Mon Sep 17 00:00:00 2001 +From 7b0a14e7320078ac891d415cab9b7568e3f52ad8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex@linutronix.de> Date: Thu, 16 Sep 2021 16:35:37 +0200 Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O @@ -30,18 +30,18 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/pty.py b/Lib/pty.py -index 8d8ce40..35439c6 100644 +index fefb63a..4cef056 100644 --- a/Lib/pty.py +++ b/Lib/pty.py -@@ -154,7 +154,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read): - os.write(STDOUT_FILENO, data) +@@ -184,7 +184,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read): + i_buf = i_buf[n:] - if STDIN_FILENO in rfds: + if stdin_avail and STDIN_FILENO in rfds: - data = stdin_read(STDIN_FILENO) + try: + data = stdin_read(STDIN_FILENO) + except OSError: + data = b"" if not data: - fds.remove(STDIN_FILENO) + stdin_avail = False else: diff --git a/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch index d5b7ce2b95..a0f3d72992 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch @@ -1,4 +1,4 @@ -From 4ed481f4928c361970e78f27c4d9be8700af176b Mon Sep 17 00:00:00 2001 +From 512c617bd00b74b30a80dd56a12391de46e2b6cf Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex@linutronix.de> Date: Fri, 10 Sep 2021 12:28:31 +0200 Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration diff --git a/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index 5ee4e4f126..bbdd8b586e 100644 --- a/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch @@ -1,4 +1,4 @@ -From 4c39252c71d8bca81fdc43753c83a59f8668c619 Mon Sep 17 00:00:00 2001 +From 843574d5a5b0818e83e20f8c0389d567bd4733fb Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes diff --git a/poky/meta/recipes-devtools/python/python3/get_module_deps3.py b/poky/meta/recipes-devtools/python/python3/get_module_deps3.py index 0ca687d2eb..8e432b49af 100644 --- a/poky/meta/recipes-devtools/python/python3/get_module_deps3.py +++ b/poky/meta/recipes-devtools/python/python3/get_module_deps3.py @@ -32,7 +32,7 @@ def fix_path(dep_path): dep_path = dep_path[dep_path.find(pivot)+len(pivot):] if '/usr/bin' in dep_path: - dep_path = dep_path.replace('/usr/bin''${bindir}') + dep_path = dep_path.replace('/usr/bin','${bindir}') # Handle multilib, is there a better way? if '/usr/lib32' in dep_path: diff --git a/poky/meta/recipes-devtools/python/python3/makerace.patch b/poky/meta/recipes-devtools/python/python3/makerace.patch index 979fc9dc36..c71c1e15de 100644 --- a/poky/meta/recipes-devtools/python/python3/makerace.patch +++ b/poky/meta/recipes-devtools/python/python3/makerace.patch @@ -1,4 +1,4 @@ -From 4f52aaf2a548b3356c6f1369c62b11335dc27464 Mon Sep 17 00:00:00 2001 +From dde5cb74f55b6dd39d25cff639d16940d9dad505 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Tue, 13 Jul 2021 23:19:29 +0100 Subject: [PATCH] python3: Fix make race @@ -18,11 +18,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7558f0c..8cec819 100644 +index c6d7e85..205af6c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2005,7 +2005,7 @@ TESTSUBDIRS= ctypes/test \ - unittest/test unittest/test/testmock +@@ -2045,7 +2045,7 @@ TESTSUBDIRS= ctypes/test \ + unittest/test/testmock TEST_MODULES=@TEST_MODULES@ -libinstall: all $(srcdir)/Modules/xxmodule.c diff --git a/poky/meta/recipes-devtools/python/python3/run-ptest b/poky/meta/recipes-devtools/python/python3/run-ptest index 05396e91ab..efa84555a5 100644 --- a/poky/meta/recipes-devtools/python/python3/run-ptest +++ b/poky/meta/recipes-devtools/python/python3/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -SETUPTOOLS_USE_DISTUTILS=nonlocal python3 -m test -v | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -r -e '/\.\.\. (ERROR|FAIL)/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' +{ SETUPTOOLS_USE_DISTUTILS=nonlocal python3 -m test -v -j 4 || echo "FAIL: python3" ; } | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -r -e '/\.\.\. (ERROR|FAIL)/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' diff --git a/poky/meta/recipes-devtools/python/python3_3.11.3.bb b/poky/meta/recipes-devtools/python/python3_3.11.4.bb index c7974849b6..b3534ad678 100644 --- a/poky/meta/recipes-devtools/python/python3_3.11.3.bb +++ b/poky/meta/recipes-devtools/python/python3_3.11.4.bb @@ -39,7 +39,7 @@ SRC_URI:append:class-native = " \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://0001-Don-t-search-system-for-headers-libraries.patch \ " -SRC_URI[sha256sum] = "8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e" +SRC_URI[sha256sum] = "2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" @@ -47,15 +47,13 @@ UPSTREAM_CHECK_URI = "https://www.python.org/downloads/source/" CVE_PRODUCT = "python" -# Upstream consider this expected behaviour -CVE_CHECK_IGNORE += "CVE-2007-4559" -# This is not exploitable when glibc has CVE-2016-10739 fixed. -CVE_CHECK_IGNORE += "CVE-2019-18348" -# These are specific to Microsoft Windows -CVE_CHECK_IGNORE += "CVE-2020-15523 CVE-2022-26488" -# The mailcap module is insecure by design, so this can't be fixed in a meaningful way. +CVE_STATUS[CVE-2007-4559] = "disputed: Upstream consider this expected behaviour" +CVE_STATUS[CVE-2019-18348] = "not-applicable-config: This is not exploitable when glibc has CVE-2016-10739 fixed" +CVE_STATUS[CVE-2020-15523] = "not-applicable-platform: Issue only applies on Windows" +CVE_STATUS[CVE-2022-26488] = "not-applicable-platform: Issue only applies on Windows" # The module will be removed in the future and flaws documented. -CVE_CHECK_IGNORE += "CVE-2015-20107" +CVE_STATUS[CVE-2015-20107] = "upstream-wontfix: The mailcap module is insecure by design, so this can't be fixed in a meaningful way" +# CVE_STATUS[CVE-2023-36632] = "disputed: Not an issue, in fact expected behaviour" PYTHON_MAJMIN = "3.11" @@ -406,13 +404,13 @@ INSANE_SKIP:${PN}-ptest = "dev-deps" # catch all the rest (unsorted) PACKAGES += "${PN}-misc" RDEPENDS:${PN}-misc += "\ + ${PN}-audio \ + ${PN}-codecs \ ${PN}-core \ ${PN}-email \ - ${PN}-codecs \ - ${PN}-pydoc \ - ${PN}-pickle \ - ${PN}-audio \ ${PN}-numbers \ + ${PN}-pickle \ + ${PN}-pydoc \ " RDEPENDS:${PN}-modules:append:class-target = " ${MLPREFIX}python3-misc" RDEPENDS:${PN}-modules:append:class-nativesdk = " ${MLPREFIX}python3-misc" @@ -426,7 +424,7 @@ FILES:${PN}-man = "${datadir}/man" # See https://bugs.python.org/issue18748 and https://bugs.python.org/issue37395 RDEPENDS:libpython3:append:libc-glibc = " libgcc" RDEPENDS:${PN}-ctypes:append:libc-glibc = " ${MLPREFIX}ldconfig" -RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev unzip bzip2 libgcc tzdata coreutils sed" +RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev ${PN}-cgitb ${PN}-zipapp unzip bzip2 libgcc tzdata coreutils sed gcc g++ binutils" RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-fr-fr locale-base-en-us locale-base-tr-tr locale-base-de-de" RDEPENDS:${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${MLPREFIX}tk ${MLPREFIX}tk-lib', '', d)}" RDEPENDS:${PN}-idle += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${PN}-tkinter ${MLPREFIX}tcl', '', d)}" diff --git a/poky/meta/recipes-devtools/qemu/qemu-native_8.0.0.bb b/poky/meta/recipes-devtools/qemu/qemu-native_8.0.3.bb index 73a0f63f2b..73a0f63f2b 100644 --- a/poky/meta/recipes-devtools/qemu/qemu-native_8.0.0.bb +++ b/poky/meta/recipes-devtools/qemu/qemu-native_8.0.3.bb diff --git a/poky/meta/recipes-devtools/qemu/qemu-system-native_8.0.0.bb b/poky/meta/recipes-devtools/qemu/qemu-system-native_8.0.3.bb index 04c7c2a6ac..04c7c2a6ac 100644 --- a/poky/meta/recipes-devtools/qemu/qemu-system-native_8.0.0.bb +++ b/poky/meta/recipes-devtools/qemu/qemu-system-native_8.0.3.bb diff --git a/poky/meta/recipes-devtools/qemu/qemu.inc b/poky/meta/recipes-devtools/qemu/qemu.inc index 6acda61425..64bade86aa 100644 --- a/poky/meta/recipes-devtools/qemu/qemu.inc +++ b/poky/meta/recipes-devtools/qemu/qemu.inc @@ -30,30 +30,24 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch \ file://qemu-guest-agent.init \ file://qemu-guest-agent.udev \ - file://ppc.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "bb60f0341531181d6cc3969dd19a013d0427a87f918193970d9adb91131e56d0" +SRC_URI[sha256sum] = "ecf4d32cbef9d397bfc8cc50e4d1e92a1b30253bf32e8ee73c7a8dcf9a232b09" 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_IGNORE += "CVE-2017-5957" +CVE_STATUS[CVE-2017-5957] = "cpe-incorrect: Applies against virglrender < 0.6.0 and not qemu itself" -# The VNC server can expose host files uder some circumstances. We don't -# enable it by default. -CVE_CHECK_IGNORE += "CVE-2007-0998" +CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default." -# '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_IGNORE += "CVE-2018-18438" +CVE_STATUS[CVE-2018-18438] = "disputed: The issues identified by this CVE were determined to not constitute a vulnerability." # As per https://nvd.nist.gov/vuln/detail/CVE-2023-0664 # https://bugzilla.redhat.com/show_bug.cgi?id=2167423 -# this bug related to windows specific. -CVE_CHECK_IGNORE += "CVE-2023-0664" +CVE_STATUS[CVE-2023-0664] = "not-applicable-platform: Issue only applies on Windows" COMPATIBLE_HOST:mipsarchn32 = "null" COMPATIBLE_HOST:mipsarchn64 = "null" @@ -215,7 +209,7 @@ PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" # libnfs is currently provided by meta-kodi PACKAGECONFIG[libnfs] = "--enable-libnfs,--disable-libnfs,libnfs" PACKAGECONFIG[pmem] = "--enable-libpmem,--disable-libpmem,pmdk" -PACKAGECONFIG[pulsedio] = "--enable-pa,--disable-pa,pulseaudio" +PACKAGECONFIG[pulseaudio] = "--enable-pa,--disable-pa,pulseaudio" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" PACKAGECONFIG[bpf] = "--enable-bpf,--disable-bpf,libbpf" PACKAGECONFIG[capstone] = "--enable-capstone,--disable-capstone" @@ -236,6 +230,8 @@ PACKAGES =+ "${PN}-system-all ${PN}-user-all" ALLOW_EMPTY:${PN}-system-all = "1" ALLOW_EMPTY:${PN}-user-all = "1" +PACKAGES_DYNAMIC += "^${PN}-user-.* ^${PN}-system-.*" + PACKAGESPLITFUNCS =+ "split_qemu_packages" python split_qemu_packages () { diff --git a/poky/meta/recipes-devtools/qemu/qemu/ppc.patch b/poky/meta/recipes-devtools/qemu/qemu/ppc.patch deleted file mode 100644 index e14c48cf85..0000000000 --- a/poky/meta/recipes-devtools/qemu/qemu/ppc.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 31f02021ac17442c514593f7b9ed750ea87c21b1 Mon Sep 17 00:00:00 2001 -From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Sat, 6 May 2023 07:42:35 +0100 -Cc: VÃctor Colombo <victor.colombo@eldorado.org.br> -Cc: Matheus Ferst <matheus.ferst@eldorado.org.br> -Cc: Daniel Henrique Barboza <danielhb413@gmail.com> -Cc: Richard Henderson <richard.henderson@linaro.org> -Cc: Philippe Mathieu-Daudé <philmd@linaro.org> -Subject: [PATCH v3] target/ppc: Fix fallback to MFSS for MFFS* instructions on - pre 3.0 ISAs - -The following commits changed the code such that the fallback to MFSS for MFFSCRN, -MFFSCRNI, MFFSCE and MFFSL on pre 3.0 ISAs was removed and became an illegal instruction: - - bf8adfd88b547680aa857c46098f3a1e94373160 - target/ppc: Move mffscrn[i] to decodetree - 394c2e2fda70da722f20fb60412d6c0ca4bfaa03 - target/ppc: Move mffsce to decodetree - 3e5bce70efe6bd1f684efbb21fd2a316cbf0657e - target/ppc: Move mffsl to decodetree - -The hardware will handle them as a MFFS instruction as the code did previously. -This means applications that were segfaulting under qemu when encountering these -instructions which is used in glibc libm functions for example. - -The fallback for MFFSCDRN and MFFSCDRNI added in a later patch was also missing. - -This patch restores the fallback to MFSS for these instructions on pre 3.0s ISAs -as the hardware decoder would, fixing the segfaulting libm code. It doesn't have -the fallback for 3.0 onwards to match hardware behaviour. - -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> ---- - target/ppc/insn32.decode | 20 +++++++++++++------- - target/ppc/translate/fp-impl.c.inc | 22 ++++++++++++++++------ - 2 files changed, 29 insertions(+), 13 deletions(-) - -v3 - drop fallback to MFFS for 3.0 ISA to match hardware -v2 - switch to use decodetree pattern groups per feedback - -Upstream-Status: Submitted [https://lore.kernel.org/qemu-devel/20230506065240.3177798-1-richard.purdie@linuxfoundation.org/] - -diff --git a/target/ppc/insn32.decode b/target/ppc/insn32.decode -index f8f589e9fd..4fcf3af8d0 100644 ---- a/target/ppc/insn32.decode -+++ b/target/ppc/insn32.decode -@@ -390,13 +390,19 @@ SETNBCR 011111 ..... ..... ----- 0111100000 - @X_bi - - ### Move To/From FPSCR - --MFFS 111111 ..... 00000 ----- 1001000111 . @X_t_rc --MFFSCE 111111 ..... 00001 ----- 1001000111 - @X_t --MFFSCRN 111111 ..... 10110 ..... 1001000111 - @X_tb --MFFSCDRN 111111 ..... 10100 ..... 1001000111 - @X_tb --MFFSCRNI 111111 ..... 10111 ---.. 1001000111 - @X_imm2 --MFFSCDRNI 111111 ..... 10101 --... 1001000111 - @X_imm3 --MFFSL 111111 ..... 11000 ----- 1001000111 - @X_t -+{ -+ # Before Power ISA v3.0, MFFS bits 11~15 were reserved and should be ignored -+ MFFS_ISA207 111111 ..... ----- ----- 1001000111 . @X_t_rc -+ [ -+ MFFS 111111 ..... 00000 ----- 1001000111 . @X_t_rc -+ MFFSCE 111111 ..... 00001 ----- 1001000111 - @X_t -+ MFFSCRN 111111 ..... 10110 ..... 1001000111 - @X_tb -+ MFFSCDRN 111111 ..... 10100 ..... 1001000111 - @X_tb -+ MFFSCRNI 111111 ..... 10111 ---.. 1001000111 - @X_imm2 -+ MFFSCDRNI 111111 ..... 10101 --... 1001000111 - @X_imm3 -+ MFFSL 111111 ..... 11000 ----- 1001000111 - @X_t -+ ] -+} - - ### Decimal Floating-Point Arithmetic Instructions - -diff --git a/target/ppc/translate/fp-impl.c.inc b/target/ppc/translate/fp-impl.c.inc -index 57d8437851..874774eade 100644 ---- a/target/ppc/translate/fp-impl.c.inc -+++ b/target/ppc/translate/fp-impl.c.inc -@@ -568,6 +568,22 @@ static void store_fpscr_masked(TCGv_i64 fpscr, uint64_t clear_mask, - gen_helper_store_fpscr(cpu_env, fpscr_masked, st_mask); - } - -+static bool trans_MFFS_ISA207(DisasContext *ctx, arg_X_t_rc *a) -+{ -+ if (!(ctx->insns_flags2 & PPC2_ISA300)) { -+ /* -+ * Before Power ISA v3.0, MFFS bits 11~15 were reserved, any instruction -+ * with OPCD=63 and XO=583 should be decoded as MFFS. -+ */ -+ return trans_MFFS(ctx, a); -+ } -+ /* -+ * For Power ISA v3.0+, return false and let the pattern group -+ * select the correct instruction. -+ */ -+ return false; -+} -+ - static bool trans_MFFS(DisasContext *ctx, arg_X_t_rc *a) - { - REQUIRE_FPU(ctx); -@@ -584,7 +600,6 @@ static bool trans_MFFSCE(DisasContext *ctx, arg_X_t *a) - { - TCGv_i64 fpscr; - -- REQUIRE_INSNS_FLAGS2(ctx, ISA300); - REQUIRE_FPU(ctx); - - gen_reset_fpstatus(); -@@ -597,7 +612,6 @@ static bool trans_MFFSCRN(DisasContext *ctx, arg_X_tb *a) - { - TCGv_i64 t1, fpscr; - -- REQUIRE_INSNS_FLAGS2(ctx, ISA300); - REQUIRE_FPU(ctx); - - t1 = tcg_temp_new_i64(); -@@ -614,7 +628,6 @@ static bool trans_MFFSCDRN(DisasContext *ctx, arg_X_tb *a) - { - TCGv_i64 t1, fpscr; - -- REQUIRE_INSNS_FLAGS2(ctx, ISA300); - REQUIRE_FPU(ctx); - - t1 = tcg_temp_new_i64(); -@@ -631,7 +644,6 @@ static bool trans_MFFSCRNI(DisasContext *ctx, arg_X_imm2 *a) - { - TCGv_i64 t1, fpscr; - -- REQUIRE_INSNS_FLAGS2(ctx, ISA300); - REQUIRE_FPU(ctx); - - t1 = tcg_temp_new_i64(); -@@ -647,7 +659,6 @@ static bool trans_MFFSCDRNI(DisasContext *ctx, arg_X_imm3 *a) - { - TCGv_i64 t1, fpscr; - -- REQUIRE_INSNS_FLAGS2(ctx, ISA300); - REQUIRE_FPU(ctx); - - t1 = tcg_temp_new_i64(); -@@ -661,7 +672,6 @@ static bool trans_MFFSCDRNI(DisasContext *ctx, arg_X_imm3 *a) - - static bool trans_MFFSL(DisasContext *ctx, arg_X_t *a) - { -- REQUIRE_INSNS_FLAGS2(ctx, ISA300); - REQUIRE_FPU(ctx); - - gen_reset_fpstatus(); --- -2.39.2 - diff --git a/poky/meta/recipes-devtools/qemu/qemu_8.0.0.bb b/poky/meta/recipes-devtools/qemu/qemu_8.0.3.bb index 42e133967e..42e133967e 100644 --- a/poky/meta/recipes-devtools/qemu/qemu_8.0.0.bb +++ b/poky/meta/recipes-devtools/qemu/qemu_8.0.3.bb diff --git a/poky/meta/recipes-devtools/repo/repo_2.34.1.bb b/poky/meta/recipes-devtools/repo/repo_2.35.bb index 1c5d1a08b3..d34c3db746 100644 --- a/poky/meta/recipes-devtools/repo/repo_2.34.1.bb +++ b/poky/meta/recipes-devtools/repo/repo_2.35.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \ file://0001-python3-shebang.patch \ " -SRCREV = "945c006f406550add8a3cad32ada0791f5a15c53" +SRCREV = "c657844efe40b97700c3654989bdbe3a33e409d7" MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git" diff --git a/poky/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch b/poky/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch new file mode 100644 index 0000000000..470dda1dcf --- /dev/null +++ b/poky/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch @@ -0,0 +1,51 @@ +From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 00:00:00 2001 +From: Panu Matilainen <pmatilai@redhat.com> +Date: Mon, 26 Jun 2023 12:45:09 +0300 +Subject: [PATCH] Don't muck with per-process global sqlite configuration from + the db backend + +sqlite3_config() affects all in-process uses of sqlite. librpm being a +low-level library, it has no business whatsoever making such decisions +for the applications running on top of it. Besides that, the callback can +easily end up pointing to an already closed database, causing an +innocent API user to crash in librpm on an entirely unrelated error on +some other database. "Oops." + +The sqlite API doesn't seem to provide any per-db or non-global context +for logging errors, thus we can only remove the call and let sqlite output +errors the way it pleases (print through stderr, presumably). + +Thanks to Jan Palus for spotting and reporting! + +Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e] +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + lib/backend/sqlite.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c +index 5a029d575a..b612732267 100644 +--- a/lib/backend/sqlite.c ++++ b/lib/backend/sqlite.c +@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc, sqlite3_value **argv) + sqlite3_result_int(sctx, match); + } + +-static void errCb(void *data, int err, const char *msg) +-{ +- rpmdb rdb = data; +- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", +- rdb->db_descr, sqlite3_errstr(err), msg); +-} +- + static int dbiCursorReset(dbiCursor dbc) + { + if (dbc->stmt) { +@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * dbhome) + * the "database is locked" errors at every cost + */ + sqlite3_busy_timeout(sdb, 10000); +- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); + + sqlexec(sdb, "PRAGMA secure_delete = OFF"); + sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); diff --git a/poky/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/poky/meta/recipes-devtools/rpm/rpm_4.18.1.bb index 83537d4761..95a9e92f96 100644 --- a/poky/meta/recipes-devtools/rpm/rpm_4.18.1.bb +++ b/poky/meta/recipes-devtools/rpm/rpm_4.18.1.bb @@ -39,6 +39,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \ file://fix-declaration.patch \ + file://ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch \ " PE = "1" diff --git a/poky/meta/recipes-devtools/rsync/rsync_3.2.7.bb b/poky/meta/recipes-devtools/rsync/rsync_3.2.7.bb index 19574bcb1c..130581a785 100644 --- a/poky/meta/recipes-devtools/rsync/rsync_3.2.7.bb +++ b/poky/meta/recipes-devtools/rsync/rsync_3.2.7.bb @@ -18,9 +18,6 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ " SRC_URI[sha256sum] = "4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb" -# -16548 required for v3.1.3pre1. Already in v3.1.3. -CVE_CHECK_IGNORE += " CVE-2017-16548 " - inherit autotools-brokensep PACKAGECONFIG ??= "acl attr \ diff --git a/poky/meta/recipes-devtools/rust/files/rust-oe-selftest.patch b/poky/meta/recipes-devtools/rust/files/rust-oe-selftest.patch new file mode 100644 index 0000000000..8e9da47761 --- /dev/null +++ b/poky/meta/recipes-devtools/rust/files/rust-oe-selftest.patch @@ -0,0 +1,2324 @@ +Rust testsuite outputs error even on a single testcase failure. +Hence, some test runs are ignored as they fail with error messages. + +Upstream-Status: Inappropriate [Ignore the testcase that errors out] +Signed-off-by: Pgowda <pgowda.cve@gmail.com> +--- + +diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs +index eb8e65a6d..6e65e8787 100644 +--- a/compiler/rustc_interface/src/tests.rs ++++ b/compiler/rustc_interface/src/tests.rs +@@ -103,6 +103,7 @@ fn assert_non_crate_hash_different(x: &Options, y: &Options) { + + // When the user supplies --test we should implicitly supply --cfg test + #[test] ++#[ignore] + fn test_switch_implies_cfg_test() { + rustc_span::create_default_session_globals_then(|| { + let matches = optgroups().parse(&["--test".to_string()]).unwrap(); +@@ -114,6 +115,7 @@ fn test_switch_implies_cfg_test() { + + // When the user supplies --test and --cfg test, don't implicitly add another --cfg test + #[test] ++#[ignore] + fn test_switch_implies_cfg_test_unless_cfg_test() { + rustc_span::create_default_session_globals_then(|| { + let matches = optgroups().parse(&["--test".to_string(), "--cfg=test".to_string()]).unwrap(); +@@ -126,6 +128,7 @@ fn test_switch_implies_cfg_test_unless_cfg_test() { + } + + #[test] ++#[ignore] + fn test_can_print_warnings() { + rustc_span::create_default_session_globals_then(|| { + let matches = optgroups().parse(&["-Awarnings".to_string()]).unwrap(); +diff --git a/library/test/src/stats/tests.rs b/library/test/src/stats/tests.rs +index 3a6e8401b..8442a6b39 100644 +--- a/library/test/src/stats/tests.rs ++++ b/library/test/src/stats/tests.rs +@@ -40,6 +40,7 @@ fn check(samples: &[f64], summ: &Summary) { + } + + #[test] ++#[ignore] + fn test_min_max_nan() { + let xs = &[1.0, 2.0, f64::NAN, 3.0, 4.0]; + let summary = Summary::new(xs); +diff --git a/tests/assembly/asm/aarch64-outline-atomics.rs b/tests/assembly/asm/aarch64-outline-atomics.rs +index c2ec4e911..150d23004 100644 +--- a/tests/assembly/asm/aarch64-outline-atomics.rs ++++ b/tests/assembly/asm/aarch64-outline-atomics.rs +@@ -4,6 +4,7 @@ + // needs-llvm-components: aarch64 + // only-aarch64 + // only-linux ++// ignore-stage1 + + #![crate_type = "rlib"] + +diff --git a/tests/codegen/abi-main-signature-32bit-c-int.rs b/tests/codegen/abi-main-signature-32bit-c-int.rs +index 7f22ddcfc..ec84b72aa 100644 +--- a/tests/codegen/abi-main-signature-32bit-c-int.rs ++++ b/tests/codegen/abi-main-signature-32bit-c-int.rs +@@ -3,6 +3,7 @@ + + // This test is for targets with 32bit c_int only. + // ignore-msp430 ++// ignore-stage1 + + fn main() { + } +diff --git a/tests/codegen/sse42-implies-crc32.rs b/tests/codegen/sse42-implies-crc32.rs +index 47b1a8993..71e2d5ef7 100644 +--- a/tests/codegen/sse42-implies-crc32.rs ++++ b/tests/codegen/sse42-implies-crc32.rs +@@ -1,5 +1,6 @@ + // only-x86_64 + // compile-flags: -Copt-level=3 ++// ignore-stage1 + + #![crate_type = "lib"] + +diff --git a/tests/codegen/thread-local.rs b/tests/codegen/thread-local.rs +index 0f1b29ca7..b2b4fd2ff 100644 +--- a/tests/codegen/thread-local.rs ++++ b/tests/codegen/thread-local.rs +@@ -5,6 +5,7 @@ + // ignore-emscripten globals are used instead of thread locals + // ignore-android does not use #[thread_local] + // ignore-nto does not use #[thread_local] ++// ignore-stage1 + + #![crate_type = "lib"] + +diff --git a/tests/codegen/uninit-consts.rs b/tests/codegen/uninit-consts.rs +index 4c07740b3..dac5da866 100644 +--- a/tests/codegen/uninit-consts.rs ++++ b/tests/codegen/uninit-consts.rs +@@ -1,4 +1,5 @@ + // compile-flags: -C no-prepopulate-passes ++// ignore-stage1 + + // Check that we use undef (and not zero) for uninitialized bytes in constants. + +diff --git a/tests/pretty/raw-str-nonexpr.rs b/tests/pretty/raw-str-nonexpr.rs +index 12440b5ae..5b62d45ff 100644 +--- a/tests/pretty/raw-str-nonexpr.rs ++++ b/tests/pretty/raw-str-nonexpr.rs +@@ -1,5 +1,6 @@ + // needs-asm-support + // pp-exact ++// ignore-stage1 + + #[cfg(foo = r#"just parse this"#)] + extern crate blah as blah; +diff --git a/tests/run-make/issue-36710/Makefile b/tests/run-make/issue-36710/Makefile +index 7b91107a234..e404fcc3996 100644 +--- a/tests/run-make/issue-36710/Makefile ++++ b/tests/run-make/issue-36710/Makefile +@@ -6,6 +6,7 @@ + # ignore-musl FIXME: this makefile needs teaching how to use a musl toolchain + # (see dist-i586-gnu-i586-i686-musl Dockerfile) + # ignore-sgx ++# ignore-stage1 + + include ../tools.mk + +diff --git a/tests/rustdoc-ui/cfg-test.rs b/tests/rustdoc-ui/cfg-test.rs +index d4ca92585..fceb2968d 100644 +--- a/tests/rustdoc-ui/cfg-test.rs ++++ b/tests/rustdoc-ui/cfg-test.rs +@@ -5,6 +5,7 @@ + + // Crates like core have doctests gated on `cfg(not(test))` so we need to make + // sure `cfg(test)` is not active when running `rustdoc --test`. ++// ignore-stage1 + + /// this doctest will be ignored: + /// +diff --git a/tests/rustdoc-ui/check-cfg-test.rs b/tests/rustdoc-ui/check-cfg-test.rs +index 626cc8387..b0f9a1948 100644 +--- a/tests/rustdoc-ui/check-cfg-test.rs ++++ b/tests/rustdoc-ui/check-cfg-test.rs +@@ -3,6 +3,7 @@ + // normalize-stderr-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" ++// ignore-stage1 + + /// The doctest will produce a warning because feature invalid is unexpected + /// ``` +diff --git a/tests/rustdoc-ui/display-output.rs b/tests/rustdoc-ui/display-output.rs +index ec27a9f6b..61655fa6e 100644 +--- a/tests/rustdoc-ui/display-output.rs ++++ b/tests/rustdoc-ui/display-output.rs +@@ -5,6 +5,7 @@ + // compile-flags:--test --test-args=--show-output + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" ++// ignore-stage1 + + /// ``` + /// #![warn(unused)] +diff --git a/tests/rustdoc-ui/doc-comment-multi-line-attr.rs b/tests/rustdoc-ui/doc-comment-multi-line-attr.rs +index 97259f782..50a155fba 100644 +--- a/tests/rustdoc-ui/doc-comment-multi-line-attr.rs ++++ b/tests/rustdoc-ui/doc-comment-multi-line-attr.rs +@@ -3,6 +3,7 @@ + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" + // check-pass ++// ignore-stage1 + + //! ```rust + //! #![deny( +diff --git a/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs b/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs +index b2a8133c9..ea064ba85 100644 +--- a/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs ++++ b/tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs +@@ -2,6 +2,7 @@ + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" + // check-pass ++// ignore-stage1 + + /// ``` + /// # #![cfg_attr(not(dox), deny(missing_abi, +diff --git a/tests/rustdoc-ui/doc-test-doctest-feature.rs b/tests/rustdoc-ui/doc-test-doctest-feature.rs +index 0b79aaece..8cef6d974 100644 +--- a/tests/rustdoc-ui/doc-test-doctest-feature.rs ++++ b/tests/rustdoc-ui/doc-test-doctest-feature.rs +@@ -5,6 +5,7 @@ + + // Make sure `cfg(doctest)` is set when finding doctests but not inside + // the doctests. ++// ignore-stage1 + + /// ``` + /// assert!(!cfg!(doctest)); +diff --git a/tests/rustdoc-ui/doc-test-rustdoc-feature.rs b/tests/rustdoc-ui/doc-test-rustdoc-feature.rs +index bf334c67e..c372097bd 100644 +--- a/tests/rustdoc-ui/doc-test-rustdoc-feature.rs ++++ b/tests/rustdoc-ui/doc-test-rustdoc-feature.rs +@@ -2,6 +2,7 @@ + // compile-flags:--test + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" ++// ignore-stage1 + + #![feature(doc_cfg)] + +diff --git a/tests/rustdoc-ui/doctest-output.rs b/tests/rustdoc-ui/doctest-output.rs +index 2670fa572..b4b612916 100644 +--- a/tests/rustdoc-ui/doctest-output.rs ++++ b/tests/rustdoc-ui/doctest-output.rs +@@ -4,6 +4,7 @@ + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" + // check-pass ++// ignore-stage1 + + //! ``` + //! assert_eq!(1 + 1, 2); +diff --git a/tests/rustdoc-ui/failed-doctest-compile-fail.rs b/tests/rustdoc-ui/failed-doctest-compile-fail.rs +index 6f2ff5d70..2561ffdc3 100644 +--- a/tests/rustdoc-ui/failed-doctest-compile-fail.rs ++++ b/tests/rustdoc-ui/failed-doctest-compile-fail.rs +@@ -5,6 +5,7 @@ + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" + // failure-status: 101 ++// ignore-stage1 + + /// ```compile_fail + /// println!("Hello"); +diff --git a/tests/rustdoc-ui/issue-91134.rs b/tests/rustdoc-ui/issue-91134.rs +index d2ff3a252..90e0816d2 100644 +--- a/tests/rustdoc-ui/issue-91134.rs ++++ b/tests/rustdoc-ui/issue-91134.rs +@@ -4,6 +4,7 @@ + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" + // edition:2021 ++// ignore-stage1 + + /// <https://github.com/rust-lang/rust/issues/91134> + /// +diff --git a/tests/rustdoc-ui/nocapture.rs b/tests/rustdoc-ui/nocapture.rs +index 321f5ca08..463751e48 100644 +--- a/tests/rustdoc-ui/nocapture.rs ++++ b/tests/rustdoc-ui/nocapture.rs +@@ -2,6 +2,7 @@ + // compile-flags:--test -Zunstable-options --nocapture + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" ++// ignore-stage1 + + /// ``` + /// println!("hello!"); +diff --git a/tests/rustdoc-ui/run-directory.rs b/tests/rustdoc-ui/run-directory.rs +index 0d432c1e6..357e3ccc3 100644 +--- a/tests/rustdoc-ui/run-directory.rs ++++ b/tests/rustdoc-ui/run-directory.rs +@@ -6,6 +6,7 @@ + // [incorrect]compile-flags:--test --test-run-directory={{src-base}}/coverage + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" ++// ignore-stage1 + + /// ``` + /// assert_eq!( +diff --git a/tests/rustdoc-ui/test-no_std.rs b/tests/rustdoc-ui/test-no_std.rs +index ee919985e..3e479bf6f 100644 +--- a/tests/rustdoc-ui/test-no_std.rs ++++ b/tests/rustdoc-ui/test-no_std.rs +@@ -2,6 +2,7 @@ + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" + // check-pass ++// ignore-stage1 + + #![no_std] + +diff --git a/tests/rustdoc-ui/test-type.rs b/tests/rustdoc-ui/test-type.rs +index 882da5c25..bc8e8e30f 100644 +--- a/tests/rustdoc-ui/test-type.rs ++++ b/tests/rustdoc-ui/test-type.rs +@@ -2,6 +2,7 @@ + // check-pass + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" ++// ignore-stage1 + + /// ``` + /// let a = true; +diff --git a/tests/ui-fulldeps/internal-lints/default_hash_types.rs b/tests/ui-fulldeps/internal-lints/default_hash_types.rs +index 795c7d2dc..dc6b4f53f 100644 +--- a/tests/ui-fulldeps/internal-lints/default_hash_types.rs ++++ b/tests/ui-fulldeps/internal-lints/default_hash_types.rs +@@ -1,4 +1,5 @@ + // compile-flags: -Z unstable-options ++// ignore-stage1 + + #![feature(rustc_private)] + #![deny(rustc::default_hash_types)] +diff --git a/tests/ui-fulldeps/internal-lints/diagnostics.rs b/tests/ui-fulldeps/internal-lints/diagnostics.rs +index 643e81d99..2433228ef 100644 +--- a/tests/ui-fulldeps/internal-lints/diagnostics.rs ++++ b/tests/ui-fulldeps/internal-lints/diagnostics.rs +@@ -1,4 +1,5 @@ + // compile-flags: -Z unstable-options ++// ignore-stage1 + + #![crate_type = "lib"] + #![feature(rustc_attrs)] +diff --git a/tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs b/tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs +index f6f0c0385..4523e2a6d 100644 +--- a/tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs ++++ b/tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs +@@ -1,4 +1,5 @@ + // compile-flags: -Z unstable-options ++// ignore-stage1 + + #![feature(rustc_private)] + #![deny(rustc::lint_pass_impl_without_macro)] +diff --git a/tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs b/tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs +index 32b987338..6187e2370 100644 +--- a/tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs ++++ b/tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs +@@ -1,4 +1,5 @@ + // compile-flags: -Z unstable-options ++// ignore-stage1 + + #![feature(rustc_private)] + #![deny(rustc::usage_of_qualified_ty)] +diff --git a/tests/ui-fulldeps/internal-lints/query_stability.rs b/tests/ui-fulldeps/internal-lints/query_stability.rs +index 560675b44..e7d5ba583 100644 +--- a/tests/ui-fulldeps/internal-lints/query_stability.rs ++++ b/tests/ui-fulldeps/internal-lints/query_stability.rs +@@ -1,4 +1,5 @@ + // compile-flags: -Z unstable-options ++// ignore-stage1 + + #![feature(rustc_private)] + #![deny(rustc::potential_query_instability)] +diff --git a/tests/ui-fulldeps/internal-lints/rustc_pass_by_value.rs b/tests/ui-fulldeps/internal-lints/rustc_pass_by_value.rs +index 10bab2d88..8e72c8b38 100644 +--- a/tests/ui-fulldeps/internal-lints/rustc_pass_by_value.rs ++++ b/tests/ui-fulldeps/internal-lints/rustc_pass_by_value.rs +@@ -1,4 +1,5 @@ + // compile-flags: -Z unstable-options ++// ignore-stage1 + + #![feature(rustc_attrs)] + #![feature(rustc_private)] +diff --git a/tests/ui-fulldeps/internal-lints/ty_tykind_usage.rs b/tests/ui-fulldeps/internal-lints/ty_tykind_usage.rs +index 2cb1ed6fc..31b5a2131 100644 +--- a/tests/ui-fulldeps/internal-lints/ty_tykind_usage.rs ++++ b/tests/ui-fulldeps/internal-lints/ty_tykind_usage.rs +@@ -1,4 +1,5 @@ + // compile-flags: -Z unstable-options ++// ignore-stage1 + + #![feature(rustc_private)] + +diff --git a/tests/ui-fulldeps/lint-group-denied-lint-allowed.rs b/tests/ui-fulldeps/lint-group-denied-lint-allowed.rs +index 7498745f2..28c00f2f8 100644 +--- a/tests/ui-fulldeps/lint-group-denied-lint-allowed.rs ++++ b/tests/ui-fulldeps/lint-group-denied-lint-allowed.rs +@@ -1,6 +1,7 @@ + // aux-build:lint-group-plugin-test.rs + // check-pass + // compile-flags: -D unused -A unused-variables ++// ignore-stage1 + + fn main() { + let x = 1; +diff --git a/tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs b/tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs +index fc19bc039..9563e9930 100644 +--- a/tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs ++++ b/tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs +@@ -1,5 +1,6 @@ + // aux-build:lint-group-plugin-test.rs + // compile-flags: -F unused -A unused ++// ignore-stage1 + + fn main() { + let x = 1; +diff --git a/tests/ui-fulldeps/lint-pass-macros.rs b/tests/ui-fulldeps/lint-pass-macros.rs +index b3c2a5427..9ed711a34 100644 +--- a/tests/ui-fulldeps/lint-pass-macros.rs ++++ b/tests/ui-fulldeps/lint-pass-macros.rs +@@ -1,5 +1,6 @@ + // compile-flags: -Z unstable-options + // check-pass ++// ignore-stage1 + + #![feature(rustc_private)] + +diff --git a/tests/ui/empty_global_asm.rs b/tests/ui/empty_global_asm.rs +index af13762d1..e9a5433ff 100644 +--- a/tests/ui/empty_global_asm.rs ++++ b/tests/ui/empty_global_asm.rs +@@ -1,5 +1,6 @@ + // needs-asm-support + // run-pass ++// ignore-stage1 + + use std::arch::global_asm; + +diff --git a/tests/ui/linkage-attr/issue-10755.rs b/tests/ui/linkage-attr/issue-10755.rs +index afd2dc46c..f0d4705e4 100644 +--- a/tests/ui/linkage-attr/issue-10755.rs ++++ b/tests/ui/linkage-attr/issue-10755.rs +@@ -2,6 +2,7 @@ + // dont-check-compiler-stderr + // compile-flags: -C linker=llllll -C linker-flavor=ld + // error-pattern: `llllll` ++// ignore-stage1 + + // Before, the error-pattern checked for "not found". On WSL with appendWindowsPath=true, running + // in invalid command returns a PermissionDenied instead. +diff --git a/tests/ui/macros/restricted-shadowing-legacy.rs b/tests/ui/macros/restricted-shadowing-legacy.rs +index f5cac2dfb..d84f8efd6 100644 +--- a/tests/ui/macros/restricted-shadowing-legacy.rs ++++ b/tests/ui/macros/restricted-shadowing-legacy.rs +@@ -74,6 +74,7 @@ + // 62 | Unordered | Unordered | = | +? | + // 63 | Unordered | Unordered | > | +? | + // 64 | Unordered | Unordered | Unordered | + | ++// ignore-stage1 + + #![feature(decl_macro, rustc_attrs)] + +diff --git a/tests/ui/process/nofile-limit.rs b/tests/ui/process/nofile-limit.rs +index 3ddf8d6ef..316823fcc 100644 +--- a/tests/ui/process/nofile-limit.rs ++++ b/tests/ui/process/nofile-limit.rs +@@ -3,6 +3,7 @@ + // test for issue #96621. + // + // run-pass ++// ignore-stage1 + // dont-check-compiler-stderr + // only-linux + // no-prefer-dynamic +diff --git a/tests/ui/process/process-panic-after-fork.rs b/tests/ui/process/process-panic-after-fork.rs +index 6d4d24922..f681526bd 100644 +--- a/tests/ui/process/process-panic-after-fork.rs ++++ b/tests/ui/process/process-panic-after-fork.rs +@@ -6,6 +6,7 @@ + // ignore-emscripten no processes + // ignore-sgx no processes + // ignore-fuchsia no fork ++// ignore-stage1 + + #![feature(rustc_private)] + #![feature(never_type)] +diff --git a/tests/ui/simd/target-feature-mixup.rs b/tests/ui/simd/target-feature-mixup.rs +index 5dd163715..ab8b02f23 100644 +--- a/tests/ui/simd/target-feature-mixup.rs ++++ b/tests/ui/simd/target-feature-mixup.rs +@@ -1,4 +1,6 @@ + // run-pass ++// ignore-stage1 ++ + #![allow(unused_variables)] + #![allow(stable_features)] + #![allow(overflowing_literals)] +diff --git a/tests/ui-fulldeps/internal-lints/bad_opt_access.rs b/tests/ui-fulldeps/internal-lints/bad_opt_access.rs +index d6bd6945e15..a5794e3636a 100644 +--- a/tests/ui-fulldeps/internal-lints/bad_opt_access.rs ++++ b/tests/ui-fulldeps/internal-lints/bad_opt_access.rs +@@ -3,6 +3,7 @@ + // Test that accessing command line options by field access triggers a lint for those fields + // that have wrapper functions which should be used. + ++// ignore-stage1 + #![crate_type = "lib"] + #![feature(rustc_private)] + #![deny(rustc::bad_opt_access)] +diff --git a/tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs b/tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs +index a0a8114e0c5..29faed24e13 100644 +--- a/tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs ++++ b/tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs +@@ -1,5 +1,6 @@ + // rustc-env:CARGO_CRATE_NAME=rustc_dummy + ++// ignore-stage1 + #![feature(rustc_private)] + #![crate_type = "lib"] + +diff --git a/tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs b/tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs +index ff764015dc7..8d0184b40f5 100644 +--- a/tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs ++++ b/tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs +@@ -5,4 +5,5 @@ + // + // Make sure that we don't explode with an error if we don't actually end up emitting any `dwo`s, + // as would be the case if we don't actually codegen anything. ++// ignore-stage1 + #![crate_type="rlib"] +diff --git a/tests/ui/drop/dynamic-drop.rs b/tests/ui/drop/dynamic-drop.rs +index 9e51d3adaaa..296032acebb 100644 +--- a/tests/ui/drop/dynamic-drop.rs ++++ b/tests/ui/drop/dynamic-drop.rs +@@ -1,6 +1,7 @@ + // run-pass + // needs-unwind + ++// ignore-stage1 + #![feature(generators, generator_trait)] + + #![allow(unused_assignments)] +diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs +index 3574f11189e..4f4698a25bd 100644 +--- a/src/bootstrap/builder/tests.rs ++++ b/src/bootstrap/builder/tests.rs +@@ -76,6 +76,7 @@ macro_rules! rustc { + } + + #[test] ++#[ignore] + fn test_valid() { + // make sure multi suite paths are accepted + check_cli(["test", "tests/ui/attr-start.rs", "tests/ui/attr-shebang.rs"]); +@@ -104,6 +105,7 @@ fn test_intersection() { + } + + #[test] ++#[ignore] + fn test_exclude() { + let mut config = configure("test", &["A"], &["A"]); + config.exclude = vec![TaskPath::parse("src/tools/tidy")]; +@@ -117,6 +119,7 @@ fn test_exclude() { + } + + #[test] ++#[ignore] + fn test_exclude_kind() { + let path = PathBuf::from("src/tools/cargotest"); + let exclude = TaskPath::parse("test::src/tools/cargotest"); +@@ -137,6 +140,7 @@ fn test_exclude_kind() { + + /// Ensure that if someone passes both a single crate and `library`, all library crates get built. + #[test] ++#[ignore] + fn alias_and_path_for_library() { + let mut cache = + run_build(&["library".into(), "core".into()], configure("build", &["A"], &["A"])); +@@ -153,6 +157,7 @@ mod defaults { + use pretty_assertions::assert_eq; + + #[test] ++ #[ignore] + fn build_default() { + let mut cache = run_build(&[], configure("build", &["A"], &["A"])); + +@@ -173,6 +178,7 @@ fn build_default() { + } + + #[test] ++ #[ignore] + fn build_stage_0() { + let config = Config { stage: 0, ..configure("build", &["A"], &["A"]) }; + let mut cache = run_build(&[], config); +@@ -190,6 +196,7 @@ fn build_stage_0() { + } + + #[test] ++ #[ignore] + fn build_cross_compile() { + let config = Config { stage: 1, ..configure("build", &["A", "B"], &["A", "B"]) }; + let mut cache = run_build(&[], config); +@@ -233,6 +240,7 @@ fn build_cross_compile() { + } + + #[test] ++ #[ignore] + fn doc_default() { + let mut config = configure("doc", &["A"], &["A"]); + config.compiler_docs = true; +@@ -267,6 +275,7 @@ fn configure(host: &[&str], target: &[&str]) -> Config { + } + + #[test] ++ #[ignore] + fn dist_baseline() { + let mut cache = run_build(&[], configure(&["A"], &["A"])); + +@@ -291,6 +300,7 @@ fn dist_baseline() { + } + + #[test] ++ #[ignore] + fn dist_with_targets() { + let mut cache = run_build(&[], configure(&["A"], &["A", "B"])); + +@@ -320,6 +330,7 @@ fn dist_with_targets() { + } + + #[test] ++ #[ignore] + fn dist_with_hosts() { + let mut cache = run_build(&[], configure(&["A", "B"], &["A", "B"])); + +@@ -362,6 +373,7 @@ fn dist_with_hosts() { + } + + #[test] ++ #[ignore] + fn dist_only_cross_host() { + let b = TargetSelection::from_user("B"); + let mut config = configure(&["A", "B"], &["A", "B"]); +@@ -381,6 +393,7 @@ fn dist_only_cross_host() { + } + + #[test] ++ #[ignore] + fn dist_with_targets_and_hosts() { + let mut cache = run_build(&[], configure(&["A", "B"], &["A", "B", "C"])); + +@@ -415,6 +428,7 @@ fn dist_with_targets_and_hosts() { + } + + #[test] ++ #[ignore] + fn dist_with_empty_host() { + let config = configure(&[], &["C"]); + let mut cache = run_build(&[], config); +@@ -431,6 +445,7 @@ fn dist_with_empty_host() { + } + + #[test] ++ #[ignore] + fn dist_with_same_targets_and_hosts() { + let mut cache = run_build(&[], configure(&["A", "B"], &["A", "B"])); + +@@ -482,6 +497,7 @@ fn dist_with_same_targets_and_hosts() { + } + + #[test] ++ #[ignore] + fn build_all() { + let build = Build::new(configure(&["A", "B"], &["A", "B", "C"])); + let mut builder = Builder::new(&build); +@@ -515,6 +531,7 @@ fn build_all() { + } + + #[test] ++ #[ignore] + fn build_with_empty_host() { + let config = configure(&[], &["C"]); + let build = Build::new(config); +@@ -542,6 +559,7 @@ fn build_with_empty_host() { + } + + #[test] ++ #[ignore] + fn test_with_no_doc_stage0() { + let mut config = configure(&["A"], &["A"]); + config.stage = 0; +@@ -585,6 +603,7 @@ fn test_with_no_doc_stage0() { + } + + #[test] ++ #[ignore] + fn doc_ci() { + let mut config = configure(&["A"], &["A"]); + config.compiler_docs = true; +@@ -613,6 +632,7 @@ fn doc_ci() { + } + + #[test] ++ #[ignore] + fn test_docs() { + // Behavior of `x.py test` doing various documentation tests. + let mut config = configure(&["A"], &["A"]); +diff --git a/tests/ui-fulldeps/internal-lints/bad_opt_access.stderr b/tests/ui-fulldeps/internal-lints/bad_opt_access.stderr +--- a/tests/ui-fulldeps/internal-lints/bad_opt_access.stderr 2023-01-10 10:47:33.000000000 -0800 ++++ b/tests/ui-fulldeps/internal-lints/bad_opt_access.stderr 2023-01-20 03:49:06.575109271 -0800 +@@ -1,20 +1,11 @@ +-error: use `Session::split_debuginfo` instead of this field +- --> $DIR/bad_opt_access.rs:14:13 ++error[E0463]: can't find crate for `rustc_macros` which `rustc_session` depends on ++ --> $DIR/bad_opt_access.rs:10:1 + | +-LL | let _ = sess.opts.cg.split_debuginfo; +- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ++LL | extern crate rustc_session; ++ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate + | +-note: the lint level is defined here +- --> $DIR/bad_opt_access.rs:8:9 +- | +-LL | #![deny(rustc::bad_opt_access)] +- | ^^^^^^^^^^^^^^^^^^^^^ +- +-error: use `Session::crate_types` instead of this field +- --> $DIR/bad_opt_access.rs:17:13 +- | +-LL | let _ = sess.opts.crate_types; +- | ^^^^^^^^^^^^^^^^^^^^^ ++ = help: maybe you need to install the missing components with: `rustup component add rust-src rustc-dev llvm-tools-preview` + +-error: aborting due to 2 previous errors ++error: aborting due to previous error + ++For more information about this error, try `rustc --explain E0463`. +diff --git a/tests/ui/process/process-sigpipe.rs b/tests/ui/process/process-sigpipe.rs +--- a/tests/ui/process/process-sigpipe.rs 2023-01-10 10:47:33.000000000 -0800 ++++ b/tests/ui/process/process-sigpipe.rs 2023-01-27 01:07:05.335718181 -0800 +@@ -1,4 +1,5 @@ + // run-pass ++// ignore-stage1 + #![allow(unused_imports)] + #![allow(deprecated)] + +diff --git a/tests/run-make/static-pie/Makefile b/tests/run-make/static-pie/Makefile +--- a/tests/run-make/static-pie/Makefile 2023-02-21 02:25:36.553233415 -0800 ++++ b/tests/run-make/static-pie/Makefile 2023-02-21 02:19:45.848629908 -0800 +@@ -3,6 +3,7 @@ include ../../run-make-fulldeps/tools.mk + # only-x86_64 + # only-linux + # ignore-32bit ++# ignore-stage1 + + # How to manually run this + # $ ./x.py test --target x86_64-unknown-linux-[musl,gnu] tests/run-make/static-pie +diff --git a/tests/codegen/repr-transparent-aggregates-3.rs b/tests/codegen/repr-transparent-aggregates-3.rs +index 0db17e6b13a..6e9cb7224c8 100644 +--- a/tests/codegen/repr-transparent-aggregates-3.rs ++++ b/tests/codegen/repr-transparent-aggregates-3.rs +@@ -3,6 +3,7 @@ + + // only-mips64 + // See repr-transparent.rs ++// ignore-stage1 + + #![feature(transparent_unions)] + +diff --git a/tests/codegen/abi-repr-ext.rs b/tests/codegen/abi-repr-ext.rs +index 23ade3c7216..addd8a2ebdc 100644 +--- a/tests/codegen/abi-repr-ext.rs ++++ b/tests/codegen/abi-repr-ext.rs +@@ -1,4 +1,5 @@ + // compile-flags: -O ++// ignore-stage1 + + // revisions:x86_64 i686 aarch64-apple aarch64-windows aarch64-linux arm riscv + +diff --git a/tests/codegen/abi-x86-interrupt.rs b/tests/codegen/abi-x86-interrupt.rs +index 928ad5a9bbd..5185edaae40 100644 +--- a/tests/codegen/abi-x86-interrupt.rs ++++ b/tests/codegen/abi-x86-interrupt.rs +@@ -4,6 +4,7 @@ + + // needs-llvm-components: x86 + // compile-flags: -C no-prepopulate-passes --target=x86_64-unknown-linux-gnu -Copt-level=0 ++// ignore-stage1 + + #![crate_type = "lib"] + #![no_core] +diff --git a/tests/codegen/branch-protection.rs b/tests/codegen/branch-protection.rs +index 994c71b2619..5d83a29da74 100644 +--- a/tests/codegen/branch-protection.rs ++++ b/tests/codegen/branch-protection.rs +@@ -7,6 +7,7 @@ + // [LEAF] compile-flags: -Z branch-protection=pac-ret,leaf + // [BKEY] compile-flags: -Z branch-protection=pac-ret,b-key + // compile-flags: --target aarch64-unknown-linux-gnu ++// ignore-stage1 + + #![crate_type = "lib"] + #![feature(no_core, lang_items)] +diff --git a/tests/codegen/catch-unwind.rs b/tests/codegen/catch-unwind.rs +index b90ef104ce7..12d5d1451a2 100644 +--- a/tests/codegen/catch-unwind.rs ++++ b/tests/codegen/catch-unwind.rs +@@ -10,6 +10,7 @@ + // ignore-riscv64 FIXME + // On s390x the closure is also in another function + // ignore-s390x FIXME ++// ignore-stage1 + + #![crate_type = "lib"] + #![feature(c_unwind)] +diff --git a/tests/codegen/cf-protection.rs b/tests/codegen/cf-protection.rs +index ccbc863f571..f4281d87abf 100644 +--- a/tests/codegen/cf-protection.rs ++++ b/tests/codegen/cf-protection.rs +@@ -8,6 +8,7 @@ + // [return] compile-flags: -Z cf-protection=return + // [full] compile-flags: -Z cf-protection=full + // compile-flags: --target x86_64-unknown-linux-gnu ++// ignore-stage1 + + #![crate_type = "lib"] + #![feature(no_core, lang_items)] +diff --git a/tests/codegen/enum-bounds-check-derived-idx.rs b/tests/codegen/enum-bounds-check-derived-idx.rs +index aa66c2ed08e..db6c87c7338 100644 +--- a/tests/codegen/enum-bounds-check-derived-idx.rs ++++ b/tests/codegen/enum-bounds-check-derived-idx.rs +@@ -1,7 +1,7 @@ + // This test checks an optimization that is not guaranteed to work. This test case should not block + // a future LLVM update. + // compile-flags: -O +- ++// ignore-stage1 + #![crate_type = "lib"] + + pub enum Bar { +diff --git a/tests/codegen/force-unwind-tables.rs b/tests/codegen/force-unwind-tables.rs +index 4c0a5602c6d..d5faf190290 100644 +--- a/tests/codegen/force-unwind-tables.rs ++++ b/tests/codegen/force-unwind-tables.rs +@@ -1,5 +1,5 @@ + // compile-flags: -C no-prepopulate-passes -C force-unwind-tables=y +- ++// ignore-stage1 + #![crate_type="lib"] + + // CHECK: attributes #{{.*}} uwtable +diff --git a/tests/codegen/intrinsic-no-unnamed-attr.rs b/tests/codegen/intrinsic-no-unnamed-attr.rs +index c8a8e0b3e7a..f779f5cc27e 100644 +--- a/tests/codegen/intrinsic-no-unnamed-attr.rs ++++ b/tests/codegen/intrinsic-no-unnamed-attr.rs +@@ -1,5 +1,5 @@ + // compile-flags: -C no-prepopulate-passes +- ++// ignore-stage1 + #![feature(intrinsics)] + + extern "rust-intrinsic" { +diff --git a/tests/codegen/issues/issue-103840.rs b/tests/codegeni/issues/issue-103840.rs +index f19d7031bb3..92408e75964 100644 +--- a/tests/codegen/issues/issue-103840.rs ++++ b/tests/codegen/issues/issue-103840.rs +@@ -1,5 +1,6 @@ + // compile-flags: -O + #![crate_type = "lib"] ++// ignore-stage1 + + pub fn foo(t: &mut Vec<usize>) { + // CHECK-NOT: __rust_dealloc +diff --git a/tests/codegen/issues/issue-47278.rs b/tests/codegen/issues/issue-47278.rs +index 9076274f45e..de7203e139b 100644 +--- a/tests/codegen/issues/issue-47278.rs ++++ b/tests/codegen/issues/issue-47278.rs +@@ -1,5 +1,6 @@ + // -C no-prepopulate-passes + #![crate_type="staticlib"] ++// ignore-stage1 + + #[repr(C)] + pub struct Foo(u64); +diff --git a/tests/codegen/issues/issue-73827-bounds-check-index-in-subexpr.rs b/tests/codegen/issues/issue-73827-bounds-check-index-in-subexpr.rs +index 1ad05906e21..8df862aeee5 100644 +--- a/tests/codegen/issues/issue-73827-bounds-check-index-in-subexpr.rs ++++ b/tests/codegen/issues/issue-73827-bounds-check-index-in-subexpr.rs +@@ -2,6 +2,7 @@ + // index is part of a (x | y) < C style condition + + // compile-flags: -O ++// ignore-stage1 + + #![crate_type = "lib"] + +diff --git a/tests/codegen/lifetime_start_end.rs b/tests/codegen/lifetime_start_end.rs +index 471a0b8cedd..356650de0c1 100644 +--- a/tests/codegen/lifetime_start_end.rs ++++ b/tests/codegen/lifetime_start_end.rs +@@ -1,4 +1,5 @@ + // compile-flags: -O -C no-prepopulate-passes -Zmir-opt-level=0 ++// ignore-stage1 + + #![crate_type = "lib"] + +diff --git a/tests/codegen/local-generics-in-exe-internalized.rs b/tests/codegen/local-generics-in-exe-internalized.rs +index 449c5ca75fc..746a7ed1b6f 100644 +--- a/tests/codegen/local-generics-in-exe-internalized.rs ++++ b/tests/codegen/local-generics-in-exe-internalized.rs +@@ -1,4 +1,5 @@ + // compile-flags: -C no-prepopulate-passes -Zshare-generics=yes ++// ignore-stage1 + + // Check that local generics are internalized if they are in the same CGU + +diff --git a/tests/codegen/match-unoptimized.rs b/tests/codegen/match-unoptimized.rs +index 78ea4f9b409..23b2c62bd38 100644 +--- a/tests/codegen/match-unoptimized.rs ++++ b/tests/codegen/match-unoptimized.rs +@@ -1,4 +1,5 @@ + // compile-flags: -C no-prepopulate-passes -Copt-level=0 ++// ignore-stage1 + + #![crate_type = "lib"] + +diff --git a/tests/codegen/noalias-rwlockreadguard.rs b/tests/codegen/noalias-rwlockreadguard.rs +index 7f7b46c85a8..a32910da3e7 100644 +--- a/tests/codegen/noalias-rwlockreadguard.rs ++++ b/tests/codegen/noalias-rwlockreadguard.rs +@@ -1,4 +1,5 @@ + // compile-flags: -O -C no-prepopulate-passes -Z mutable-noalias=yes ++// ignore-stage1 + + #![crate_type = "lib"] + +diff --git a/tests/codegen/non-terminate/nonempty-infinite-loop.rs b/tests/codegen/non-terminate/nonempty-infinite-loop.rs +index 5e25e04fc24..fce094f7efd 100644 +--- a/tests/codegen/non-terminate/nonempty-infinite-loop.rs ++++ b/tests/codegen/non-terminate/nonempty-infinite-loop.rs +@@ -1,4 +1,5 @@ + // compile-flags: -C opt-level=3 ++// ignore-stage1 + + #![crate_type = "lib"] + +diff --git a/tests/codegen/noreturn-uninhabited.rs b/tests/codegen/noreturn-uninhabited.rs +index 49f93cf62c7..2da42faeabd 100644 +--- a/tests/codegen/noreturn-uninhabited.rs ++++ b/tests/codegen/noreturn-uninhabited.rs +@@ -1,4 +1,5 @@ + // compile-flags: -g -C no-prepopulate-passes ++// ignore-stage1 + + #![crate_type = "lib"] + +diff --git a/tests/rustdoc/async-move-doctest.rs b/tests/rustdoc/async-move-doctest.rs +index 2ba61388c9e..402c5bbaaf7 100644 +--- a/tests/rustdoc/async-move-doctest.rs ++++ b/tests/rustdoc/async-move-doctest.rs +@@ -1,5 +1,6 @@ + // compile-flags:--test + // edition:2018 ++// ignore-stage1 + + // Prior to setting the default edition for the doctest pre-parser, + // this doctest would fail due to a fatal parsing error. +diff --git a/tests/rustdoc/async-trait.rs b/tests/rustdoc/async-trait.rs +index a473e467473..df3be5adc17 100644 +--- a/tests/rustdoc/async-trait.rs ++++ b/tests/rustdoc/async-trait.rs +@@ -1,5 +1,6 @@ + // aux-build:async-trait-dep.rs + // edition:2021 ++// ignore-stage1 + + #![feature(async_fn_in_trait)] + #![allow(incomplete_features)] +diff --git a/tests/rustdoc/check-source-code-urls-to-def.rs b/tests/rustdoc/check-source-code-urls-to-def.rs +index 41b9d41fa44..0805a07a0c9 100644 +--- a/tests/rustdoc/check-source-code-urls-to-def.rs ++++ b/tests/rustdoc/check-source-code-urls-to-def.rs +@@ -1,6 +1,7 @@ + // compile-flags: -Zunstable-options --generate-link-to-definition + // aux-build:source_code.rs + // build-aux-docs ++// ignore-stage1 + + #![feature(rustc_attrs)] + +diff --git a/tests/rustdoc/comment-in-doctest.rs b/tests/rustdoc/comment-in-doctest.rs +index 5691d173569..a57c0e1f3bd 100644 +--- a/tests/rustdoc/comment-in-doctest.rs ++++ b/tests/rustdoc/comment-in-doctest.rs +@@ -1,4 +1,5 @@ + // compile-flags:--test ++// ignore-stage1 + + // comments, both doc comments and regular ones, used to trick rustdoc's doctest parser into + // thinking that everything after it was part of the regular program. combined with the librustc_ast +diff --git a/tests/rustdoc/const-generics/const-generics-docs.rs b/tests/rustdoc/const-generics/const-generics-docs.rs +index 828486a41d4..02a934996f8 100644 +--- a/tests/rustdoc/const-generics/const-generics-docs.rs ++++ b/tests/rustdoc/const-generics/const-generics-docs.rs +@@ -1,5 +1,7 @@ + // edition:2018 + // aux-build: extern_crate.rs ++// ignore-stage1 ++ + #![crate_name = "foo"] + + extern crate extern_crate; +diff --git a/tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs b/tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs +index d02bc4fe712..6f432da06bf 100644 +--- a/tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs ++++ b/tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs +@@ -1,5 +1,6 @@ + // Regression test for issue #95717 + // Hide cross-crate `#[doc(hidden)]` associated items in trait impls. ++// ignore-stage1 + + #![crate_name = "dependent"] + // edition:2021 +diff --git a/tests/rustdoc/cross-crate-hidden-impl-parameter.rs b/tests/rustdoc/cross-crate-hidden-impl-parameter.rs +index eb2ced2f7f4..08a6f8b27f3 100644 +--- a/tests/rustdoc/cross-crate-hidden-impl-parameter.rs ++++ b/tests/rustdoc/cross-crate-hidden-impl-parameter.rs +@@ -1,4 +1,6 @@ + // Issue #86448: test for cross-crate `doc(hidden)` ++// ignore-stage1 ++ + #![crate_name = "foo"] + + // aux-build:cross-crate-hidden-impl-parameter.rs +diff --git a/tests/rustdoc/cross-crate-links.rs b/tests/rustdoc/cross-crate-links.rs +index 7c736a4cc11..a0be9a367c6 100644 +--- a/tests/rustdoc/cross-crate-links.rs ++++ b/tests/rustdoc/cross-crate-links.rs +@@ -1,5 +1,6 @@ + // aux-build:all-item-types.rs + // build-aux-docs ++// ignore-stage1 + + #![crate_name = "foo"] + +diff --git a/tests/rustdoc/cross-crate-primitive-doc.rs b/tests/rustdoc/cross-crate-primitive-doc.rs +index 4ba296ee04a..51fa62ffb53 100644 +--- a/tests/rustdoc/cross-crate-primitive-doc.rs ++++ b/tests/rustdoc/cross-crate-primitive-doc.rs +@@ -1,6 +1,7 @@ + // aux-build:primitive-doc.rs + // compile-flags: --extern-html-root-url=primitive_doc=../ -Z unstable-options + // only-linux ++// ignore-stage1 + + #![feature(no_core)] + #![no_core] +diff --git a/tests/rustdoc/doctest-manual-crate-name.rs b/tests/rustdoc/doctest-manual-crate-name.rs +index 3a5e3734e14..2b4b19b4708 100644 +--- a/tests/rustdoc/doctest-manual-crate-name.rs ++++ b/tests/rustdoc/doctest-manual-crate-name.rs +@@ -1,4 +1,5 @@ + // compile-flags:--test ++// ignore-stage1 + + //! ``` + //! #![crate_name="asdf"] +diff --git a/tests/rustdoc/edition-doctest.rs b/tests/rustdoc/edition-doctest.rs +index 6de25996bed..4acb562a29c 100644 +--- a/tests/rustdoc/edition-doctest.rs ++++ b/tests/rustdoc/edition-doctest.rs +@@ -1,4 +1,5 @@ + // compile-flags:--test ++// ignore-stage1 + + /// ```rust,edition2018 + /// #![feature(try_blocks)] +diff --git a/tests/rustdoc/edition-flag.rs b/tests/rustdoc/edition-flag.rs +index e54c7d2969b..4cee5e1a3cf 100644 +--- a/tests/rustdoc/edition-flag.rs ++++ b/tests/rustdoc/edition-flag.rs +@@ -1,5 +1,6 @@ + // compile-flags:--test + // edition:2018 ++// ignore-stage1 + + /// ```rust + /// fn main() { +diff --git a/tests/rustdoc/elided-lifetime.rs b/tests/rustdoc/elided-lifetime.rs +index 006132ef8aa..75ac6496dfb 100644 +--- a/tests/rustdoc/elided-lifetime.rs ++++ b/tests/rustdoc/elided-lifetime.rs +@@ -4,6 +4,7 @@ + // + // Since Rust 2018 we encourage writing out <'_> explicitly to make it clear + // that borrowing is occurring. Make sure rustdoc is following the same idiom. ++// ignore-stage1 + + #![crate_name = "foo"] + +diff --git a/tests/rustdoc/extern-html-root-url.rs b/tests/rustdoc/extern-html-root-url.rs +index 17eedcf2ab8..429bf78b9d5 100644 +--- a/tests/rustdoc/extern-html-root-url.rs ++++ b/tests/rustdoc/extern-html-root-url.rs +@@ -2,6 +2,7 @@ + // aux-build:html_root.rs + // aux-build:no_html_root.rs + // NOTE: intentionally does not build any auxiliary docs ++// ignore-stage1 + + extern crate html_root; + extern crate no_html_root; +diff --git a/tests/rustdoc/extern-impl-trait.rs b/tests/rustdoc/extern-impl-trait.rs +index 8ab026afd1b..c47d6802211 100644 +--- a/tests/rustdoc/extern-impl-trait.rs ++++ b/tests/rustdoc/extern-impl-trait.rs +@@ -1,4 +1,5 @@ + // aux-build:extern-impl-trait.rs ++// ignore-stage1 + + #![crate_name = "foo"] + +diff --git a/tests/rustdoc/external-macro-src.rs b/tests/rustdoc/external-macro-src.rs +index 359551ab78d..86499a0bf2e 100644 +--- a/tests/rustdoc/external-macro-src.rs ++++ b/tests/rustdoc/external-macro-src.rs +@@ -1,4 +1,5 @@ + // aux-build:external-macro-src.rs ++// ignore-stage1 + + #![crate_name = "foo"] + +diff --git a/tests/rustdoc/hide-unstable-trait.rs b/tests/rustdoc/hide-unstable-trait.rs +index 0bf7cabc43b..9ceeccfead8 100644 +--- a/tests/rustdoc/hide-unstable-trait.rs ++++ b/tests/rustdoc/hide-unstable-trait.rs +@@ -1,4 +1,5 @@ + // aux-build:unstable-trait.rs ++// ignore-stage1 + + #![crate_name = "foo"] + #![feature(private_trait)] +diff --git a/tests/rustdoc/inline_cross/add-docs.rs b/tests/rustdoc/inline_cross/add-docs.rs +index a1124d2094c..a11b866647d 100644 +--- a/tests/rustdoc/inline_cross/add-docs.rs ++++ b/tests/rustdoc/inline_cross/add-docs.rs +@@ -1,4 +1,5 @@ + // aux-build:add-docs.rs ++// ignore-stage1 + + extern crate inner; + +diff --git a/tests/rustdoc/inline_cross/default-trait-method.rs b/tests/rustdoc/inline_cross/default-trait-method.rs +index a4ec73a127d..8db38c99791 100644 +--- a/tests/rustdoc/inline_cross/default-trait-method.rs ++++ b/tests/rustdoc/inline_cross/default-trait-method.rs +@@ -1,4 +1,5 @@ + // aux-build:default-trait-method.rs ++// ignore-stage1 + + extern crate foo; + +diff --git a/tests/rustdoc/inline_cross/impl_trait.rs b/tests/rustdoc/inline_cross/impl_trait.rs +index b6a1552bc00..85377b19e0d 100644 +--- a/tests/rustdoc/inline_cross/impl_trait.rs ++++ b/tests/rustdoc/inline_cross/impl_trait.rs +@@ -1,5 +1,6 @@ + // aux-build:impl_trait_aux.rs + // edition:2018 ++// ignore-stage1 + + extern crate impl_trait_aux; + +diff --git a/tests/rustdoc/inline_cross/issue-24183.rs b/tests/rustdoc/inline_cross/issue-24183.rs +index 751a32385e8..d25211cb2b0 100644 +--- a/tests/rustdoc/inline_cross/issue-24183.rs ++++ b/tests/rustdoc/inline_cross/issue-24183.rs +@@ -1,5 +1,6 @@ + #![crate_type = "lib"] + #![crate_name = "usr"] ++// ignore-stage1 + + // aux-crate:issue_24183=issue-24183.rs + // edition: 2021 +diff --git a/tests/rustdoc/inline_cross/macros.rs b/tests/rustdoc/inline_cross/macros.rs +index a41b9c5b197..1b4bccee176 100644 +--- a/tests/rustdoc/inline_cross/macros.rs ++++ b/tests/rustdoc/inline_cross/macros.rs +@@ -1,5 +1,6 @@ + // aux-build:macros.rs + // build-aux-docs ++// ignore-stage1 + + #![feature(macro_test)] + #![crate_name = "foo"] +diff --git a/tests/rustdoc/inline_cross/trait-vis.rs b/tests/rustdoc/inline_cross/trait-vis.rs +index b646babacc5..b77e966afe3 100644 +--- a/tests/rustdoc/inline_cross/trait-vis.rs ++++ b/tests/rustdoc/inline_cross/trait-vis.rs +@@ -1,4 +1,5 @@ + // aux-build:trait-vis.rs ++// ignore-stage1 + + extern crate inner; + +diff --git a/tests/rustdoc/inline_cross/use_crate.rs b/tests/rustdoc/inline_cross/use_crate.rs +index 00e0f041c56..c5bf6010d93 100644 +--- a/tests/rustdoc/inline_cross/use_crate.rs ++++ b/tests/rustdoc/inline_cross/use_crate.rs +@@ -3,6 +3,7 @@ + // build-aux-docs + // edition:2018 + // compile-flags:--extern use_crate --extern use_crate_2 ++// ignore-stage1 + + // During the buildup to Rust 2018, rustdoc would eagerly inline `pub use some_crate;` as if it + // were a module, so we changed it to make `pub use`ing crate roots remain as a `pub use` statement +diff --git a/tests/rustdoc/intra-doc-crate/self.rs b/tests/rustdoc/intra-doc-crate/self.rs +index 8c36a7fa002..848e17a18a1 100644 +--- a/tests/rustdoc/intra-doc-crate/self.rs ++++ b/tests/rustdoc/intra-doc-crate/self.rs +@@ -1,5 +1,6 @@ + // aux-build:self.rs + // build-aux-docs ++// ignore-stage1 + + extern crate cross_crate_self; + +diff --git a/tests/rustdoc/intra-doc/cross-crate/additional_doc.rs b/tests/rustdoc/intra-doc/cross-crate/additional_doc.rs +index e52fb9b1c9f..765ad78fb4d 100644 +--- a/tests/rustdoc/intra-doc/cross-crate/additional_doc.rs ++++ b/tests/rustdoc/intra-doc/cross-crate/additional_doc.rs +@@ -1,5 +1,7 @@ + // aux-build:additional_doc.rs + // build-aux-docs ++// ignore-stage1 ++ + #![deny(rustdoc::broken_intra_doc_links)] + + extern crate my_rand; +diff --git a/tests/rustdoc/intra-doc/cross-crate/basic.rs b/tests/rustdoc/intra-doc/cross-crate/basic.rs +index ad7454918b4..a959a15a672 100644 +--- a/tests/rustdoc/intra-doc/cross-crate/basic.rs ++++ b/tests/rustdoc/intra-doc/cross-crate/basic.rs +@@ -1,5 +1,7 @@ + // aux-build:intra-doc-basic.rs + // build-aux-docs ++// ignore-stage1 ++ + #![deny(rustdoc::broken_intra_doc_links)] + + // from https://github.com/rust-lang/rust/issues/65983 +diff --git a/tests/rustdoc/intra-doc/cross-crate/crate.rs b/tests/rustdoc/intra-doc/cross-crate/crate.rs +index edf544708b6..735847bcbb5 100644 +--- a/tests/rustdoc/intra-doc/cross-crate/crate.rs ++++ b/tests/rustdoc/intra-doc/cross-crate/crate.rs +@@ -1,5 +1,7 @@ + // aux-build:intra-link-cross-crate-crate.rs + // build-aux-docs ++// ignore-stage1 ++ + #![crate_name = "outer"] + extern crate inner; + // @has outer/fn.f.html '//a[@href="../inner/fn.g.html"]' "crate::g" +diff --git a/tests/rustdoc/intra-doc/cross-crate/hidden.rs b/tests/rustdoc/intra-doc/cross-crate/hidden.rs +index 4f7d075ba48..d7ffed2d19d 100644 +--- a/tests/rustdoc/intra-doc/cross-crate/hidden.rs ++++ b/tests/rustdoc/intra-doc/cross-crate/hidden.rs +@@ -1,5 +1,7 @@ + // aux-build:hidden.rs + // build-aux-docs ++// ignore-stage1 ++ + #![deny(rustdoc::broken_intra_doc_links)] + + // tests https://github.com/rust-lang/rust/issues/73363 +diff --git a/tests/rustdoc/intra-doc/cross-crate/macro.rs b/tests/rustdoc/intra-doc/cross-crate/macro.rs +index 32f0a55d3c6..31add14b3b6 100644 +--- a/tests/rustdoc/intra-doc/cross-crate/macro.rs ++++ b/tests/rustdoc/intra-doc/cross-crate/macro.rs +@@ -1,6 +1,8 @@ + // aux-build:macro_inner.rs + // aux-build:proc_macro.rs + // build-aux-docs ++// ignore-stage1 ++ + #![deny(rustdoc::broken_intra_doc_links)] + extern crate macro_inner; + extern crate proc_macro_inner; +diff --git a/tests/rustdoc/intra-doc/cross-crate/module.rs b/tests/rustdoc/intra-doc/cross-crate/module.rs +index fde9322657d..72e55a83007 100644 +--- a/tests/rustdoc/intra-doc/cross-crate/module.rs ++++ b/tests/rustdoc/intra-doc/cross-crate/module.rs +@@ -1,6 +1,8 @@ + // outer.rs + // aux-build: module.rs + // build-aux-docs ++// ignore-stage1 ++ + #![deny(rustdoc::broken_intra_doc_links)] + extern crate module_inner; + // @has 'module/bar/index.html' '//a[@href="../../module_inner/trait.SomeTrait.html"]' 'SomeTrait' +diff --git a/tests/rustdoc/intra-doc/cross-crate/submodule-inner.rs b/tests/rustdoc/intra-doc/cross-crate/submodule-inner.rs +index 577fe78a508..1da901cd8b8 100644 +--- a/tests/rustdoc/intra-doc/cross-crate/submodule-inner.rs ++++ b/tests/rustdoc/intra-doc/cross-crate/submodule-inner.rs +@@ -1,5 +1,7 @@ + // aux-build:submodule-inner.rs + // build-aux-docs ++// ignore-stage1 ++ + #![deny(rustdoc::broken_intra_doc_links)] + + extern crate a; +diff --git a/tests/rustdoc/intra-doc/cross-crate/submodule-outer.rs b/tests/rustdoc/intra-doc/cross-crate/submodule-outer.rs +index d0c0b7e85ae..39c42c5a684 100644 +--- a/tests/rustdoc/intra-doc/cross-crate/submodule-outer.rs ++++ b/tests/rustdoc/intra-doc/cross-crate/submodule-outer.rs +@@ -1,5 +1,7 @@ + // aux-build:submodule-outer.rs + // edition:2018 ++// ignore-stage1 ++ + #![deny(rustdoc::broken_intra_doc_links)] + + extern crate bar as bar_; +diff --git a/tests/rustdoc/intra-doc/cross-crate/traits.rs b/tests/rustdoc/intra-doc/cross-crate/traits.rs +index 7b9554bfdb0..0417a5f4537 100644 +--- a/tests/rustdoc/intra-doc/cross-crate/traits.rs ++++ b/tests/rustdoc/intra-doc/cross-crate/traits.rs +@@ -1,5 +1,7 @@ + // aux-build:traits.rs + // build-aux-docs ++// ignore-stage1 ++ + #![deny(rustdoc::broken_intra_doc_links)] + + extern crate inner; +diff --git a/tests/rustdoc/intra-doc/extern-builtin-type-impl.rs b/tests/rustdoc/intra-doc/extern-builtin-type-impl.rs +index 7bb1ded3f3c..994ece708ca 100644 +--- a/tests/rustdoc/intra-doc/extern-builtin-type-impl.rs ++++ b/tests/rustdoc/intra-doc/extern-builtin-type-impl.rs +@@ -1,6 +1,7 @@ + // Reexport of a structure that derefs to a type with lang item impls having doc links in their + // comments. The doc link points to an associated item, so we check that traits in scope for that + // link are populated. ++// ignore-stage1 + + // aux-build:extern-builtin-type-impl-dep.rs + +diff --git a/tests/rustdoc/intra-doc/extern-crate-only-used-in-link.rs b/tests/rustdoc/intra-doc/extern-crate-only-used-in-link.rs +index ad50887e922..69d5aa1717a 100644 +--- a/tests/rustdoc/intra-doc/extern-crate-only-used-in-link.rs ++++ b/tests/rustdoc/intra-doc/extern-crate-only-used-in-link.rs +@@ -7,6 +7,7 @@ + // aux-crate:priv:empty2=empty2.rs + // build-aux-docs + // compile-flags:-Z unstable-options --edition 2018 ++// ignore-stage1 + + // @has extern_crate_only_used_in_link/index.html + // @has - '//a[@href="../issue_66159_1/struct.Something.html"]' 'issue_66159_1::Something' +diff --git a/tests/rustdoc/intra-doc/extern-crate.rs b/tests/rustdoc/intra-doc/extern-crate.rs +index 4e4438dea03..b6793531515 100644 +--- a/tests/rustdoc/intra-doc/extern-crate.rs ++++ b/tests/rustdoc/intra-doc/extern-crate.rs +@@ -3,6 +3,7 @@ + // When loading `extern crate` statements, we would pull in their docs at the same time, even + // though they would never actually get displayed. This tripped intra-doc-link resolution failures, + // for items that aren't under our control, and not actually getting documented! ++// ignore-stage1 + + #![deny(rustdoc::broken_intra_doc_links)] + +diff --git a/tests/rustdoc/intra-doc/extern-inherent-impl.rs b/tests/rustdoc/intra-doc/extern-inherent-impl.rs +index 2e41c2214f4..8851071adbd 100644 +--- a/tests/rustdoc/intra-doc/extern-inherent-impl.rs ++++ b/tests/rustdoc/intra-doc/extern-inherent-impl.rs +@@ -1,5 +1,6 @@ + // Reexport of a structure with public inherent impls having doc links in their comments. The doc + // link points to an associated item, so we check that traits in scope for that link are populated. ++// ignore-stage1 + + // aux-build:extern-inherent-impl-dep.rs + +diff --git a/tests/rustdoc/intra-doc/extern-reference-link.rs b/tests/rustdoc/intra-doc/extern-reference-link.rs +index bad6ec75579..43cf0c23e8b 100644 +--- a/tests/rustdoc/intra-doc/extern-reference-link.rs ++++ b/tests/rustdoc/intra-doc/extern-reference-link.rs +@@ -1,5 +1,6 @@ + // compile-flags: --extern pub_struct + // aux-build:pub-struct.rs ++// ignore-stage1 + + /// [SomeStruct] + /// +diff --git a/tests/rustdoc/intra-doc/issue-103463.rs b/tests/rustdoc/intra-doc/issue-103463.rs +index 4adf8a9a8a4..3b965529577 100644 +--- a/tests/rustdoc/intra-doc/issue-103463.rs ++++ b/tests/rustdoc/intra-doc/issue-103463.rs +@@ -1,6 +1,7 @@ + // The `Trait` is not pulled into the crate resulting in doc links in its methods being resolved. + + // aux-build:issue-103463-aux.rs ++// ignore-stage1 + + extern crate issue_103463_aux; + use issue_103463_aux::Trait; +diff --git a/tests/rustdoc/intra-doc/issue-104145.rs b/tests/rustdoc/intra-doc/issue-104145.rs +index 9ce36740d60..74c790ddd45 100644 +--- a/tests/rustdoc/intra-doc/issue-104145.rs ++++ b/tests/rustdoc/intra-doc/issue-104145.rs +@@ -1,6 +1,7 @@ + // Doc links in `Trait`'s methods are resolved because it has a local impl. + + // aux-build:issue-103463-aux.rs ++// ignore-stage1 + + extern crate issue_103463_aux; + use issue_103463_aux::Trait; +diff --git a/tests/rustdoc/intra-doc/issue-66159.rs b/tests/rustdoc/intra-doc/issue-66159.rs +index 56742b39790..64ef5f3d07c 100644 +--- a/tests/rustdoc/intra-doc/issue-66159.rs ++++ b/tests/rustdoc/intra-doc/issue-66159.rs +@@ -1,5 +1,6 @@ + // aux-crate:priv:pub_struct=pub-struct.rs + // compile-flags:-Z unstable-options ++// ignore-stage1 + + // The issue was an ICE which meant that we never actually generated the docs + // so if we have generated the docs, we're okay. +diff --git a/tests/rustdoc/intra-doc/pub-use.rs b/tests/rustdoc/intra-doc/pub-use.rs +index 8a998496cf5..26109bc52fc 100644 +--- a/tests/rustdoc/intra-doc/pub-use.rs ++++ b/tests/rustdoc/intra-doc/pub-use.rs +@@ -1,4 +1,5 @@ + // aux-build: intra-link-pub-use.rs ++// ignore-stage1 + #![deny(rustdoc::broken_intra_doc_links)] + #![crate_name = "outer"] + +diff --git a/tests/rustdoc/intra-doc/reexport-additional-docs.rs b/tests/rustdoc/intra-doc/reexport-additional-docs.rs +index 64683bacd65..6ed63e4dd26 100644 +--- a/tests/rustdoc/intra-doc/reexport-additional-docs.rs ++++ b/tests/rustdoc/intra-doc/reexport-additional-docs.rs +@@ -1,5 +1,7 @@ + // aux-build:intra-link-reexport-additional-docs.rs + // build-aux-docs ++// ignore-stage1 ++ + #![crate_name = "foo"] + extern crate inner; + +diff --git a/tests/rustdoc/issue-18199.rs b/tests/rustdoc/issue-18199.rs +index bc0c4a56502..1995fd2ec7d 100644 +--- a/tests/rustdoc/issue-18199.rs ++++ b/tests/rustdoc/issue-18199.rs +@@ -1,4 +1,5 @@ + // compile-flags:--test ++// ignore-stage1 + + #![doc(test(attr(feature(staged_api))))] + +diff --git a/tests/rustdoc/issue-23106.rs b/tests/rustdoc/issue-23106.rs +index 8cda2fc3380..e7b5c1e28c5 100644 +--- a/tests/rustdoc/issue-23106.rs ++++ b/tests/rustdoc/issue-23106.rs +@@ -1,4 +1,5 @@ + // compile-flags:--test ++// ignore-stage1 + + /// ``` + /// # +diff --git a/tests/rustdoc/issue-23744.rs b/tests/rustdoc/issue-23744.rs +index 642817396b2..780b131a842 100644 +--- a/tests/rustdoc/issue-23744.rs ++++ b/tests/rustdoc/issue-23744.rs +@@ -1,4 +1,5 @@ + // compile-flags:--test ++// ignore-stage1 + + /// Example of rustdoc incorrectly parsing <code>```rust,should_panic</code>. + /// +diff --git a/tests/rustdoc/issue-25944.rs b/tests/rustdoc/issue-25944.rs +index 49625294bbe..b6df4518de4 100644 +--- a/tests/rustdoc/issue-25944.rs ++++ b/tests/rustdoc/issue-25944.rs +@@ -1,4 +1,5 @@ + // compile-flags:--test ++// ignore-stage1 + + /// ``` + /// let a = r#" +diff --git a/tests/rustdoc/issue-30252.rs b/tests/rustdoc/issue-30252.rs +index c3777362a66..a80f92dc754 100644 +--- a/tests/rustdoc/issue-30252.rs ++++ b/tests/rustdoc/issue-30252.rs +@@ -1,4 +1,5 @@ + // compile-flags:--test --cfg feature="bar" ++// ignore-stage1 + + /// ```rust + /// assert_eq!(cfg!(feature = "bar"), true); +diff --git a/tests/rustdoc/issue-38129.rs b/tests/rustdoc/issue-38129.rs +index 156d50fa52a..60ab5dd1885 100644 +--- a/tests/rustdoc/issue-38129.rs ++++ b/tests/rustdoc/issue-38129.rs +@@ -1,4 +1,5 @@ + // compile-flags:--test ++// ignore-stage1 + + // This file tests the source-partitioning behavior of rustdoc. + // Each test contains some code that should be put into the generated +diff --git a/tests/rustdoc/issue-40936.rs b/tests/rustdoc/issue-40936.rs +index 4d2e4c17b1f..8dcfc4068d3 100644 +--- a/tests/rustdoc/issue-40936.rs ++++ b/tests/rustdoc/issue-40936.rs +@@ -1,5 +1,6 @@ + // aux-build:issue-40936.rs + // build-aux-docs ++// ignore-stage1 + + #![crate_name = "foo"] + +diff --git a/tests/rustdoc/issue-43153.rs b/tests/rustdoc/issue-43153.rs +index 0fe680f10af..8c67d64826a 100644 +--- a/tests/rustdoc/issue-43153.rs ++++ b/tests/rustdoc/issue-43153.rs +@@ -1,5 +1,6 @@ + // Test that `include!` in a doc test searches relative to the directory in + // which the test is declared. ++// ignore-stage1 + + // compile-flags:--test + +diff --git a/tests/rustdoc/issue-46727.rs b/tests/rustdoc/issue-46727.rs +index 8cfc4827a7f..55f155e0219 100644 +--- a/tests/rustdoc/issue-46727.rs ++++ b/tests/rustdoc/issue-46727.rs +@@ -1,4 +1,5 @@ + // aux-build:issue-46727.rs ++// ignore-stage1 + + extern crate issue_46727; + +diff --git a/tests/rustdoc/issue-48377.rs b/tests/rustdoc/issue-48377.rs +index c32bcf380ea..c196b77a3e7 100644 +--- a/tests/rustdoc/issue-48377.rs ++++ b/tests/rustdoc/issue-48377.rs +@@ -1,4 +1,5 @@ + // compile-flags:--test ++// ignore-stage1 + + //! This is a doc comment + //! +diff --git a/tests/rustdoc/issue-48414.rs b/tests/rustdoc/issue-48414.rs +index b35743d887b..e8ade910228 100644 +--- a/tests/rustdoc/issue-48414.rs ++++ b/tests/rustdoc/issue-48414.rs +@@ -1,4 +1,5 @@ + // aux-build:issue-48414.rs ++// ignore-stage1 + + // ICE when resolving paths for a trait that linked to another trait, when both were in an external + // crate +diff --git a/tests/rustdoc/issue-53689.rs b/tests/rustdoc/issue-53689.rs +index 832140e061b..9a40ea6bc1b 100644 +--- a/tests/rustdoc/issue-53689.rs ++++ b/tests/rustdoc/issue-53689.rs +@@ -1,4 +1,5 @@ + // aux-build:issue-53689.rs ++// ignore-stage1 + + #![crate_name = "foo"] + +diff --git a/tests/rustdoc/issue-54478-demo-allocator.rs b/tests/rustdoc/issue-54478-demo-allocator.rs +index 4811f363bc9..f4d12f6f630 100644 +--- a/tests/rustdoc/issue-54478-demo-allocator.rs ++++ b/tests/rustdoc/issue-54478-demo-allocator.rs +@@ -1,5 +1,6 @@ + // Issue #54478: regression test showing that we can demonstrate + // `#[global_allocator]` in code blocks built by `rustdoc`. ++// ignore-stage1 + // + // ## Background + // +@@ -11,6 +12,7 @@ + // Rather than try to revise the visbility semanics, we instead + // decided to change `rustdoc` to behave more like the compiler's + // default setting, by leaving off `-C prefer-dynamic`. ++// ignore-stage1 + + // compile-flags:--test + +diff --git a/tests/rustdoc/issue-57180.rs b/tests/rustdoc/issue-57180.rs +index 14bd2b0fec0..5f89e5d42f5 100644 +--- a/tests/rustdoc/issue-57180.rs ++++ b/tests/rustdoc/issue-57180.rs +@@ -1,4 +1,5 @@ + // aux-build:issue-57180.rs ++// ignore-stage1 + + extern crate issue_57180; + use issue_57180::Trait; +diff --git a/tests/rustdoc/issue-61592.rs b/tests/rustdoc/issue-61592.rs +index 4b6c37b94aa..048487390bb 100644 +--- a/tests/rustdoc/issue-61592.rs ++++ b/tests/rustdoc/issue-61592.rs +@@ -1,4 +1,5 @@ + // aux-build:issue-61592.rs ++// ignore-stage1 + + extern crate foo; + +diff --git a/tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs b/tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs +index 2700f2370ee..d883c03d7d2 100644 +--- a/tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs ++++ b/tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs +@@ -1,4 +1,5 @@ + // Regression test for ICE #73061 ++// ignore-stage1 + + // aux-build:issue-73061.rs + +diff --git a/tests/rustdoc/issue-75588.rs b/tests/rustdoc/issue-75588.rs +index 3b11059a755..e78cdfa236e 100644 +--- a/tests/rustdoc/issue-75588.rs ++++ b/tests/rustdoc/issue-75588.rs +@@ -1,5 +1,6 @@ + // aux-build:realcore.rs + // aux-build:real_gimli.rs ++// ignore-stage1 + + // Ensure unstably exported traits have their Implementors sections. + +diff --git a/tests/rustdoc/issue-85454.rs b/tests/rustdoc/issue-85454.rs +index 5a49a9d0651..fd2f4f8b535 100644 +--- a/tests/rustdoc/issue-85454.rs ++++ b/tests/rustdoc/issue-85454.rs +@@ -1,4 +1,5 @@ + // aux-build:issue-85454.rs ++// ignore-stage1 + // build-aux-docs + #![crate_name = "foo"] + +diff --git a/tests/rustdoc/issue-86620.rs b/tests/rustdoc/issue-86620.rs +index ef15946ec50..675a12b4d14 100644 +--- a/tests/rustdoc/issue-86620.rs ++++ b/tests/rustdoc/issue-86620.rs +@@ -1,4 +1,5 @@ + // aux-build:issue-86620-1.rs ++// ignore-stage1 + + extern crate issue_86620_1; + +diff --git a/tests/rustdoc/macro_pub_in_module.rs b/tests/rustdoc/macro_pub_in_module.rs +index 42f760cff6a..1a51aef9a8a 100644 +--- a/tests/rustdoc/macro_pub_in_module.rs ++++ b/tests/rustdoc/macro_pub_in_module.rs +@@ -1,5 +1,6 @@ + // aux-build:macro_pub_in_module.rs + // edition:2018 ++// ignore-stage1 + // build-aux-docs + + //! See issue #74355 +diff --git a/tests/rustdoc/masked.rs b/tests/rustdoc/masked.rs +index 875c026fd05..416d8fbabd0 100644 +--- a/tests/rustdoc/masked.rs ++++ b/tests/rustdoc/masked.rs +@@ -1,4 +1,5 @@ + // aux-build:masked.rs ++// ignore-stage1 + + #![feature(doc_masked)] + +diff --git a/tests/rustdoc/no-stack-overflow-25295.rs b/tests/rustdoc/no-stack-overflow-25295.rs +index dd79f1e4baa..0bc58afa4cb 100644 +--- a/tests/rustdoc/no-stack-overflow-25295.rs ++++ b/tests/rustdoc/no-stack-overflow-25295.rs +@@ -1,5 +1,6 @@ + // Ensure this code doesn't stack overflow. + // aux-build:enum-primitive.rs ++// ignore-stage1 + + #[macro_use] extern crate enum_primitive; + +diff --git a/tests/rustdoc/normalize-assoc-item.rs b/tests/rustdoc/normalize-assoc-item.rs +index c6fd5e1101e..945a31853f4 100644 +--- a/tests/rustdoc/normalize-assoc-item.rs ++++ b/tests/rustdoc/normalize-assoc-item.rs +@@ -1,4 +1,5 @@ + // ignore-tidy-linelength ++// ignore-stage1 + // aux-build:normalize-assoc-item.rs + // build-aux-docs + // compile-flags:-Znormalize-docs +diff --git a/tests/rustdoc/primitive-reexport.rs b/tests/rustdoc/primitive-reexport.rs +index 10a8a47db52..ecdb4848265 100644 +--- a/tests/rustdoc/primitive-reexport.rs ++++ b/tests/rustdoc/primitive-reexport.rs +@@ -1,5 +1,6 @@ + // aux-build: primitive-reexport.rs + // compile-flags:--extern foo --edition 2018 ++// ignore-stage1 + + #![crate_name = "bar"] + +diff --git a/tests/rustdoc/process-termination.rs b/tests/rustdoc/process-termination.rs +index 32258792b6e..2236842afc9 100644 +--- a/tests/rustdoc/process-termination.rs ++++ b/tests/rustdoc/process-termination.rs +@@ -1,4 +1,5 @@ + // compile-flags:--test ++// ignore-stage1 + + /// A check of using various process termination strategies + /// +diff --git a/tests/rustdoc/pub-extern-crate.rs b/tests/rustdoc/pub-extern-crate.rs +index 26747a4d1ac..98b3068cfd5 100644 +--- a/tests/rustdoc/pub-extern-crate.rs ++++ b/tests/rustdoc/pub-extern-crate.rs +@@ -1,4 +1,5 @@ + // aux-build:pub-extern-crate.rs ++// ignore-stage1 + + // @has pub_extern_crate/index.html + // @!has - '//code' 'pub extern crate inner' +diff --git a/tests/rustdoc/pub-use-extern-macros.rs b/tests/rustdoc/pub-use-extern-macros.rs +index eefe6b4b073..f67ec499459 100644 +--- a/tests/rustdoc/pub-use-extern-macros.rs ++++ b/tests/rustdoc/pub-use-extern-macros.rs +@@ -1,4 +1,5 @@ + // aux-build:pub-use-extern-macros.rs ++// ignore-stage1 + + extern crate macros; + +diff --git a/tests/rustdoc/reexport-check.rs b/tests/rustdoc/reexport-check.rs +index 5908d2150f2..9e3c825558e 100644 +--- a/tests/rustdoc/reexport-check.rs ++++ b/tests/rustdoc/reexport-check.rs +@@ -1,4 +1,6 @@ + // aux-build:reexport-check.rs ++// ignore-stage1 ++ + #![crate_name = "foo"] + + extern crate reexport_check; +diff --git a/tests/rustdoc/reexport-dep-foreign-fn.rs b/tests/rustdoc/reexport-dep-foreign-fn.rs +index e7f5720d583..f09e2da12f8 100644 +--- a/tests/rustdoc/reexport-dep-foreign-fn.rs ++++ b/tests/rustdoc/reexport-dep-foreign-fn.rs +@@ -1,4 +1,5 @@ + // aux-build:all-item-types.rs ++// ignore-stage1 + + // This test is to ensure there is no problem on handling foreign functions + // coming from a dependency. +diff --git a/tests/rustdoc/reexport-doc.rs b/tests/rustdoc/reexport-doc.rs +index df2c889b4d5..52558b39068 100644 +--- a/tests/rustdoc/reexport-doc.rs ++++ b/tests/rustdoc/reexport-doc.rs +@@ -1,4 +1,5 @@ + // aux-build:reexport-doc-aux.rs ++// ignore-stage1 + + extern crate reexport_doc_aux as dep; + +diff --git a/tests/rustdoc/reexports-priv.rs b/tests/rustdoc/reexports-priv.rs +index 571d7f06fdc..bec1096ad14 100644 +--- a/tests/rustdoc/reexports-priv.rs ++++ b/tests/rustdoc/reexports-priv.rs +@@ -1,4 +1,5 @@ + // aux-build: reexports.rs ++// ignore-stage1 + // compile-flags: --document-private-items + + #![crate_name = "foo"] +diff --git a/tests/rustdoc/reexports.rs b/tests/rustdoc/reexports.rs +index 3c51ac395af..018abbfd277 100644 +--- a/tests/rustdoc/reexports.rs ++++ b/tests/rustdoc/reexports.rs +@@ -1,4 +1,5 @@ + // aux-build: reexports.rs ++// ignore-stage1 + + #![crate_name = "foo"] + +diff --git a/tests/rustdoc/rustc-incoherent-impls.rs b/tests/rustdoc/rustc-incoherent-impls.rs +index 3fdefbecc54..c8382a50679 100644 +--- a/tests/rustdoc/rustc-incoherent-impls.rs ++++ b/tests/rustdoc/rustc-incoherent-impls.rs +@@ -1,4 +1,5 @@ + // aux-build:incoherent-impl-types.rs ++// ignore-stage1 + // build-aux-docs + + #![crate_name = "foo"] +diff --git a/tests/rustdoc/test_option_check/bar.rs b/tests/rustdoc/test_option_check/bar.rs +index 50a182cf7e0..6f48c9c923b 100644 +--- a/tests/rustdoc/test_option_check/bar.rs ++++ b/tests/rustdoc/test_option_check/bar.rs +@@ -1,5 +1,6 @@ + // compile-flags: --test + // check-test-line-numbers-match ++// ignore-stage1 + + /// This looks like another awesome test! + /// +diff --git a/tests/rustdoc/test_option_check/test.rs b/tests/rustdoc/test_option_check/test.rs +index 964e8e37ed5..208bccafe4c 100644 +--- a/tests/rustdoc/test_option_check/test.rs ++++ b/tests/rustdoc/test_option_check/test.rs +@@ -1,4 +1,5 @@ + // compile-flags: --test ++// ignore-stage1 + // check-test-line-numbers-match + + pub mod bar; +diff --git a/tests/rustdoc/trait-alias-mention.rs b/tests/rustdoc/trait-alias-mention.rs +index 6da0dc68785..8916e1321c7 100644 +--- a/tests/rustdoc/trait-alias-mention.rs ++++ b/tests/rustdoc/trait-alias-mention.rs +@@ -1,5 +1,6 @@ + // aux-build:trait-alias-mention.rs + // build-aux-docs ++// ignore-stage1 + + #![crate_name = "foo"] + +diff --git a/tests/rustdoc/trait-visibility.rs b/tests/rustdoc/trait-visibility.rs +index 8ba3ee03a74..9bd62dd5c0a 100644 +--- a/tests/rustdoc/trait-visibility.rs ++++ b/tests/rustdoc/trait-visibility.rs +@@ -1,4 +1,5 @@ + // aux-build:trait-visibility.rs ++// ignore-stage1 + + #![crate_name = "foo"] + +diff --git a/tests/rustdoc/unit-return.rs b/tests/rustdoc/unit-return.rs +index 6ddfa0c4d5c..a144308a581 100644 +--- a/tests/rustdoc/unit-return.rs ++++ b/tests/rustdoc/unit-return.rs +@@ -1,4 +1,5 @@ + // aux-build:unit-return.rs ++// ignore-stage1 + + #![crate_name = "foo"] + +diff --git a/tests/ui-fulldeps/deriving-encodable-decodable-box.rs b/tests/ui-fulldeps/deriving-encodable-decodable-box.rs +index 1c376f59e51..8f852db5efd 100644 +--- a/tests/ui-fulldeps/deriving-encodable-decodable-box.rs ++++ b/tests/ui-fulldeps/deriving-encodable-decodable-box.rs +@@ -1,4 +1,5 @@ + // run-pass ++// ignore-stage1 + + #![allow(unused_imports)] + #![feature(rustc_private)] +diff --git a/tests/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs b/tests/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs +index 844d40f2ecd..d0d530ac79f 100644 +--- a/tests/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs ++++ b/tests/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs +@@ -1,4 +1,5 @@ + // run-pass ++// ignore-stage1 + + #![allow(unused_imports)] + // This briefly tests the capability of `Cell` and `RefCell` to implement the +diff --git a/tests/ui-fulldeps/deriving-global.rs b/tests/ui-fulldeps/deriving-global.rs +index 214bb4368ff..7ff6e31f09e 100644 +--- a/tests/ui-fulldeps/deriving-global.rs ++++ b/tests/ui-fulldeps/deriving-global.rs +@@ -1,4 +1,5 @@ + // run-pass ++// ignore-stage1 + + #![feature(rustc_private)] + +diff --git a/tests/ui-fulldeps/deriving-hygiene.rs b/tests/ui-fulldeps/deriving-hygiene.rs +index e1084a08fec..f18b703116a 100644 +--- a/tests/ui-fulldeps/deriving-hygiene.rs ++++ b/tests/ui-fulldeps/deriving-hygiene.rs +@@ -1,4 +1,5 @@ + // run-pass ++// ignore-stage1 + + #![allow(non_upper_case_globals)] + #![feature(rustc_private)] +diff --git a/tests/ui-fulldeps/dropck_tarena_sound_drop.rs b/tests/ui-fulldeps/dropck_tarena_sound_drop.rs +index ffad80171da..d60062be118 100644 +--- a/tests/ui-fulldeps/dropck_tarena_sound_drop.rs ++++ b/tests/ui-fulldeps/dropck_tarena_sound_drop.rs +@@ -1,4 +1,5 @@ + // run-pass ++// ignore-stage1 + + #![allow(unknown_lints)] + // Check that an arena (TypedArena) can carry elements whose drop +diff --git a/tests/ui-fulldeps/empty-struct-braces-derive.rs b/tests/ui-fulldeps/empty-struct-braces-derive.rs +index 10e8beaa7b1..29419f97aa1 100644 +--- a/tests/ui-fulldeps/empty-struct-braces-derive.rs ++++ b/tests/ui-fulldeps/empty-struct-braces-derive.rs +@@ -1,5 +1,6 @@ + // run-pass + // `#[derive(Trait)]` works for empty structs/variants with braces or parens. ++// ignore-stage1 + + #![feature(rustc_private)] + +diff --git a/tests/ui-fulldeps/issue-14021.rs b/tests/ui-fulldeps/issue-14021.rs +index 309b5c4a03d..5b9fb023d85 100644 +--- a/tests/ui-fulldeps/issue-14021.rs ++++ b/tests/ui-fulldeps/issue-14021.rs +@@ -1,4 +1,5 @@ + // run-pass ++// ignore-stage1 + + #![allow(unused_mut)] + #![allow(unused_imports)] +diff --git a/tests/ui-fulldeps/regions-mock-tcx.rs b/tests/ui-fulldeps/regions-mock-tcx.rs +index 63975ef62c5..24e008bb76b 100644 +--- a/tests/ui-fulldeps/regions-mock-tcx.rs ++++ b/tests/ui-fulldeps/regions-mock-tcx.rs +@@ -1,4 +1,5 @@ + // run-pass ++// ignore-stage1 + + #![allow(dead_code)] + #![allow(unused_imports)] +diff --git a/tests/ui-fulldeps/rustc_encodable_hygiene.rs b/tests/ui-fulldeps/rustc_encodable_hygiene.rs +index 509a6b1d22c..ab5f4aed548 100644 +--- a/tests/ui-fulldeps/rustc_encodable_hygiene.rs ++++ b/tests/ui-fulldeps/rustc_encodable_hygiene.rs +@@ -1,4 +1,5 @@ + // run-pass ++// ignore-stage1 + + #![feature(rustc_private)] + +diff --git a/tests/run-make/cdylib-fewer-symbols/foo.rs b/tests/run-make/cdylib-fewer-symbols/foo.rs +index af37bc8e953..2f080fb37b2 100644 +--- a/tests/run-make/cdylib-fewer-symbols/foo.rs ++++ b/tests/run-make/cdylib-fewer-symbols/foo.rs +@@ -1,5 +1,5 @@ + #![crate_type = "cdylib"] +- ++#[ignore] + #[no_mangle] + pub extern "C" fn foo() -> u32 { + 3 +diff --git a/tests/run-make/doctests-keep-binaries/t.rs b/tests/run-make/doctests-keep-binaries/t.rs +index c38cf0a0b25..13b89c05e03 100644 +--- a/tests/run-make/doctests-keep-binaries/t.rs ++++ b/tests/run-make/doctests-keep-binaries/t.rs +@@ -1,3 +1,4 @@ ++// ignore-stage1 + /// Fungle the foople. + /// ``` + /// t::foople(); +diff --git a/tests/rustdoc-ui/doctest-multiline-crate-attribute.rs b/tests/rustdoc-ui/doctest-multiline-crate-attribute.rs +index 260f5a7a64f..c05f9adf46b 100644 +--- a/tests/rustdoc-ui/doctest-multiline-crate-attribute.rs ++++ b/tests/rustdoc-ui/doctest-multiline-crate-attribute.rs +@@ -2,6 +2,7 @@ + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" + // check-pass ++// ignore-stage1 + + /// ``` + /// #![deprecated(since = "5.2", note = "foo was rarely used. \ +diff --git a/tests/rustdoc-ui/issue-80992.rs b/tests/rustdoc-ui/issue-80992.rs +index 80ff225b879..e589999ae29 100644 +--- a/tests/rustdoc-ui/issue-80992.rs ++++ b/tests/rustdoc-ui/issue-80992.rs +@@ -2,6 +2,7 @@ + // compile-flags:--test + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" ++// ignore-stage1 + + pub fn test() -> Result<(), ()> { + //! ```compile_fail +diff --git a/tests/rustdoc-ui/no-run-flag.rs b/tests/rustdoc-ui/no-run-flag.rs +index 181730eb416..33fa85d7d9d 100644 +--- a/tests/rustdoc-ui/no-run-flag.rs ++++ b/tests/rustdoc-ui/no-run-flag.rs +@@ -4,6 +4,7 @@ + // compile-flags:-Z unstable-options --test --no-run --test-args=--test-threads=1 + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" ++// ignore-stage1 + + /// ``` + /// let a = true; +diff --git a/tests/rustdoc-ui/nocapture-fail.rs b/tests/rustdoc-ui/nocapture-fail.rs +index 9a3fb592c63..9899183cdf6 100644 +--- a/tests/rustdoc-ui/nocapture-fail.rs ++++ b/tests/rustdoc-ui/nocapture-fail.rs +@@ -3,6 +3,7 @@ + // normalize-stderr-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" ++// ignore-stage1 + + /// ```compile_fail + /// fn foo() { +diff --git a/tests/run-make/issue-22131/foo.rs b/tests/run-make/issue-22131/foo.rs +index 33255d76879..56ffc4224e4 100644 +--- a/tests/run-make/issue-22131/foo.rs ++++ b/tests/run-make/issue-22131/foo.rs +@@ -1,5 +1,6 @@ + /// ```rust + /// assert_eq!(foo::foo(), 1); + /// ``` ++// ignore-stage1 + #[cfg(feature = "bar")] + pub fn foo() -> i32 { 1 } +diff --git a/tests/rustdoc/auto-traits.rs b/tests/rustdoc/auto-traits.rs +index 93d4bf2f656..b0eb5f1af7c 100644 +--- a/tests/rustdoc/auto-traits.rs ++++ b/tests/rustdoc/auto-traits.rs +@@ -1,4 +1,5 @@ + // aux-build:auto-traits.rs ++// ignore-stage1 + + #![feature(auto_traits)] + +diff --git a/tests/rustdoc/inline_cross/dyn_trait.rs b/tests/rustdoc/inline_cross/dyn_trait.rs +index 649d98f7139..82f88a4713c 100644 +--- a/tests/rustdoc/inline_cross/dyn_trait.rs ++++ b/tests/rustdoc/inline_cross/dyn_trait.rs +@@ -1,4 +1,5 @@ + #![crate_name = "user"] ++// ignore-stage1 + + // aux-crate:dyn_trait=dyn_trait.rs + // edition:2021 +diff --git a/tests/ui/abi/stack-probes-lto.rs b/tests/ui/abi/stack-probes-lto.rs +index 0dccb633df9..36e4d04ccaa 100644 +--- a/tests/ui/abi/stack-probes-lto.rs ++++ b/tests/ui/abi/stack-probes-lto.rs +@@ -13,6 +13,7 @@ + // ignore-fuchsia no exception handler registered for segfault + // compile-flags: -C lto + // no-prefer-dynamic ++// ignore-stage1 + // ignore-nto Crash analysis impossible at SIGSEGV in QNX Neutrino + + include!("stack-probes.rs"); +diff --git a/tests/ui/abi/stack-probes.rs b/tests/ui/abi/stack-probes.rs +index 8137c92304d..9f4edca3caf 100644 +--- a/tests/ui/abi/stack-probes.rs ++++ b/tests/ui/abi/stack-probes.rs +@@ -11,6 +11,7 @@ + // ignore-sgx no processes + // ignore-fuchsia no exception handler registered for segfault + // ignore-nto Crash analysis impossible at SIGSEGV in QNX Neutrino ++// ignore-stage1 + + use std::env; + use std::mem::MaybeUninit; +diff --git a/tests/ui/array-slice-vec/subslice-patterns-const-eval-match.rs b/tests/ui/array-slice-vec/subslice-patterns-const-eval-match.rs +index 5a6283e9f13..c036f7f03e6 100644 +--- a/tests/ui/array-slice-vec/subslice-patterns-const-eval-match.rs ++++ b/tests/ui/array-slice-vec/subslice-patterns-const-eval-match.rs +@@ -1,7 +1,7 @@ + // Test that slice subslice patterns are correctly handled in const evaluation. + + // run-pass +- ++// ignore-stage1 + #[derive(PartialEq, Debug, Clone)] + struct N(u8); + +diff --git a/tests/ui/asm/x86_64/sym.rs b/tests/ui/asm/x86_64/sym.rs +index 93ef4f09062..6b076924bda 100644 +--- a/tests/ui/asm/x86_64/sym.rs ++++ b/tests/ui/asm/x86_64/sym.rs +@@ -2,6 +2,7 @@ + // only-linux + // needs-asm-support + // run-pass ++// ignore-stage1 + + #![feature(thread_local)] + +diff --git a/tests/ui/associated-type-bounds/fn-apit.rs b/tests/ui/associated-type-bounds/fn-apit.rs +index 3c9f511338f..e8fd5fc3c3e 100644 +--- a/tests/ui/associated-type-bounds/fn-apit.rs ++++ b/tests/ui/associated-type-bounds/fn-apit.rs +@@ -1,6 +1,6 @@ + // run-pass + // aux-build:fn-aux.rs +- ++// ignore-stage1 + #![allow(unused)] + #![feature(associated_type_bounds)] + +diff --git a/tests/ui/associated-type-bounds/fn-dyn-apit.rs b/tests/ui/associated-type-bounds/fn-dyn-apit.rs +index c4e8092c211..7c690f42846 100644 +--- a/tests/ui/associated-type-bounds/fn-dyn-apit.rs ++++ b/tests/ui/associated-type-bounds/fn-dyn-apit.rs +@@ -1,6 +1,7 @@ + // run-pass + // aux-build:fn-dyn-aux.rs + ++// ignore-stage1 + #![allow(unused)] + #![feature(associated_type_bounds)] + +diff --git a/tests/ui/associated-type-bounds/fn-wrap-apit.rs b/tests/ui/associated-type-bounds/fn-wrap-apit.rs +index 96df13e372a..b1df6e867f2 100644 +--- a/tests/ui/associated-type-bounds/fn-wrap-apit.rs ++++ b/tests/ui/associated-type-bounds/fn-wrap-apit.rs +@@ -1,6 +1,7 @@ + // run-pass + // aux-build:fn-aux.rs + ++// ignore-stage1 + #![feature(associated_type_bounds)] + #![allow(dead_code)] + +diff --git a/tests/ui/structs-enums/multiple-reprs.rs b/tests/ui/structs-enums/multiple-reprs.rs +index 4be503a0ef4..2cf0875fc5c 100644 +--- a/tests/ui/structs-enums/multiple-reprs.rs ++++ b/tests/ui/structs-enums/multiple-reprs.rs +@@ -1,4 +1,5 @@ + // run-pass ++// ignore-stage1 + + #![allow(dead_code)] + +diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs +--- a/src/tools/compiletest/src/common.rs ++++ b/src/tools/compiletest/src/common.rs +@@ -431,7 +431,6 @@ + .unwrap() + }; + +- let mut current = None; + let mut all_targets = HashSet::new(); + let mut all_archs = HashSet::new(); + let mut all_oses = HashSet::new(); +@@ -452,14 +451,11 @@ + } + all_pointer_widths.insert(format!("{}bit", cfg.pointer_width)); + +- if target == config.target { +- current = Some(cfg); +- } + all_targets.insert(target.into()); + } + + Self { +- current: current.expect("current target not found"), ++ current: Self::get_current_target_config(config), + all_targets, + all_archs, + all_oses, +@@ -471,6 +467,89 @@ + } + } + ++ fn get_current_target_config(config: &Config) -> TargetCfg { ++ let mut arch = None; ++ let mut os = None; ++ let mut env = None; ++ let mut abi = None; ++ let mut families = Vec::new(); ++ let mut pointer_width = None; ++ let mut endian = None; ++ let mut panic = None; ++ ++ for config in ++ rustc_output(config, &["--print=cfg", "--target", &config.target]).trim().lines() ++ { ++ let (name, value) = config ++ .split_once("=\"") ++ .map(|(name, value)| { ++ ( ++ name, ++ Some( ++ value ++ .strip_suffix("\"") ++ .expect("key-value pair should be properly quoted"), ++ ), ++ ) ++ }) ++ .unwrap_or_else(|| (config, None)); ++ ++ match name { ++ "target_arch" => { ++ arch = Some(value.expect("target_arch should be a key-value pair").to_string()); ++ } ++ "target_os" => { ++ os = Some(value.expect("target_os sould be a key-value pair").to_string()); ++ } ++ "target_env" => { ++ env = Some(value.expect("target_env should be a key-value pair").to_string()); ++ } ++ "target_abi" => { ++ abi = Some(value.expect("target_abi should be a key-value pair").to_string()); ++ } ++ "target_family" => { ++ families ++ .push(value.expect("target_family should be a key-value pair").to_string()); ++ } ++ "target_pointer_width" => { ++ pointer_width = Some( ++ value ++ .expect("target_pointer_width should be a key-value pair") ++ .parse::<u32>() ++ .expect("target_pointer_width should be a valid u32"), ++ ); ++ } ++ "target_endian" => { ++ endian = Some(match value.expect("target_endian should be a key-value pair") { ++ "big" => Endian::Big, ++ "little" => Endian::Little, ++ _ => panic!("target_endian should be either 'big' or 'little'"), ++ }); ++ } ++ "panic" => { ++ panic = Some(match value.expect("panic should be a key-value pair") { ++ "abort" => PanicStrategy::Abort, ++ "unwind" => PanicStrategy::Unwind, ++ _ => panic!("panic should be either 'abort' or 'unwind'"), ++ }); ++ } ++ _ => (), ++ } ++ } ++ ++ TargetCfg { ++ arch: arch.expect("target configuration should specify target_arch"), ++ os: os.expect("target configuration should specify target_os"), ++ env: env.expect("target configuration should specify target_env"), ++ abi: abi.expect("target configuration should specify target_abi"), ++ families, ++ pointer_width: pointer_width ++ .expect("target configuration should specify target_pointer_width"), ++ endian: endian.expect("target configuration should specify target_endian"), ++ panic: panic.expect("target configuration should specify panic"), ++ } ++ } ++ + // #[cfg(bootstrap)] + // Needed only for one cycle, remove during the bootstrap bump. + fn collect_all_slow(config: &Config) -> HashMap<String, TargetCfg> { +diff --git a/tests/run-make/issue-47551/Makefile b/tests/run-make/issue-47551/Makefile +index 5a6ac725701..9290f2e0555 100644 +--- a/tests/run-make/issue-47551/Makefile ++++ b/tests/run-make/issue-47551/Makefile +@@ -1,3 +1,4 @@ ++# ignore-stage1 + # only-linux + # ignore-32bit + +diff --git a/tests/run-make/pgo-branch-weights/Makefile b/tests/run-make/pgo-branch-weights/Makefile +index c60206a1f34..4666be03b85 100644 +--- a/tests/run-make/pgo-branch-weights/Makefile ++++ b/tests/run-make/pgo-branch-weights/Makefile +@@ -1,3 +1,4 @@ ++# ignore-stage1 + # needs-profiler-support + # ignore-windows-gnu + +diff --git a/tests/run-make/pgo-gen-lto/Makefile b/tests/run-make/pgo-gen-lto/Makefile +index 3f2f6a838b5..9e4f555d21c 100644 +--- a/tests/run-make/pgo-gen-lto/Makefile ++++ b/tests/run-make/pgo-gen-lto/Makefile +@@ -1,3 +1,4 @@ ++# ignore-stage1 + # needs-profiler-support + # ignore-windows-gnu + +diff --git a/tests/run-make/pgo-gen/Makefile b/tests/run-make/pgo-gen/Makefile +index 4623a74957b..22aed059cf4 100644 +--- a/tests/run-make/pgo-gen/Makefile ++++ b/tests/run-make/pgo-gen/Makefile +@@ -1,3 +1,4 @@ ++# ignore-stage1 + # needs-profiler-support + # ignore-windows-gnu + +diff --git a/tests/run-make/pgo-indirect-call-promotion/Makefile b/tests/run-make/pgo-indirect-call-promotion/Makefile +index 45302215cc6..519447882ea 100644 +--- a/tests/run-make/pgo-indirect-call-promotion/Makefile ++++ b/tests/run-make/pgo-indirect-call-promotion/Makefile +@@ -1,3 +1,4 @@ ++# ignore-stage1 + # needs-profiler-support + # ignore-windows-gnu + +diff --git a/tests/run-make/pgo-use/Makefile b/tests/run-make/pgo-use/Makefile +index 3bac9b77aa3..5c64b2342e1 100644 +--- a/tests/run-make/pgo-use/Makefile ++++ b/tests/run-make/pgo-use/Makefile +@@ -1,3 +1,4 @@ ++# ignore-stage1 + # needs-profiler-support + # ignore-windows-gnu + +diff --git a/tests/run-make/profile/Makefile b/tests/run-make/profile/Makefile +index fffc051adbf..42a63a871d6 100644 +--- a/tests/run-make/profile/Makefile ++++ b/tests/run-make/profile/Makefile +@@ -1,3 +1,4 @@ ++# ignore-stage1 + # needs-profiler-support + + include ../tools.mk +diff --git a/tests/run-make/sysroot-crates-are-unstable/Makefile b/tests/run-make/sysroot-crates-are-unstable/Makefile +index 1e267fb9576..e3e83c52cc2 100644 +--- a/tests/run-make/sysroot-crates-are-unstable/Makefile ++++ b/tests/run-make/sysroot-crates-are-unstable/Makefile +@@ -1,2 +1,3 @@ ++# ignore-stage1 + all: + '$(PYTHON)' test.py +diff --git a/tests/run-make/target-specs/Makefile b/tests/run-make/target-specs/Makefile +index a33f5368e3c..84459293364 100644 +--- a/tests/run-make/target-specs/Makefile ++++ b/tests/run-make/target-specs/Makefile +@@ -1,3 +1,4 @@ ++# ignore-stage1 + include ../tools.mk + all: + $(RUSTC) foo.rs --target=my-awesome-platform.json --crate-type=lib --emit=asm +diff --git a/tests/ui/functions-closures/fn-help-with-err.rs b/tests/ui/functions-closures/fn-help-with-err.rs +index 612fe1b8419..d021f33c550 100644 +--- a/tests/ui/functions-closures/fn-help-with-err.rs ++++ b/tests/ui/functions-closures/fn-help-with-err.rs +@@ -1,4 +1,5 @@ + // This test case checks the behavior of typeck::check::method::suggest::is_fn on Ty::Error. ++// ignore-stage1 + + struct Foo; + +diff --git a/tests/run-make/pointer-auth-link-with-c/Makefile b/tests/run-make/pointer-auth-link-with-c/Makefile +index dffbd303582..5347d0a90f1 100644 +--- a/tests/run-make/pointer-auth-link-with-c/Makefile ++++ b/tests/run-make/pointer-auth-link-with-c/Makefile +@@ -1,3 +1,4 @@ ++# ignore-stage1 + include ../tools.mk + + # only-aarch64 diff --git a/poky/meta/recipes-devtools/rust/rust-source.inc b/poky/meta/recipes-devtools/rust/rust-source.inc index fbe2492fb4..0009c50172 100644 --- a/poky/meta/recipes-devtools/rust/rust-source.inc +++ b/poky/meta/recipes-devtools/rust/rust-source.inc @@ -6,6 +6,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://0001-Do-not-use-LFS64-on-linux-with-musl.patch;patchdir=${RUSTSRC} \ file://zlib-off64_t.patch;patchdir=${RUSTSRC} \ file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC} \ + file://rust-oe-selftest.patch;patchdir=${RUSTSRC} \ " SRC_URI[rust.sha256sum] = "bb8e9c564566b2d3228d95de9063a9254182446a161353f1d843bfbaf5c34639" @@ -16,8 +17,3 @@ export TARGET_VENDOR UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html" UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src" - -# see recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch -# we need to link with ssp_nonshared on musl to avoid "undefined reference to `__stack_chk_fail_local'" -# when building MACHINE=qemux86 for musl -WRAPPER_TARGET_EXTRALD:libc-musl = "-lssp_nonshared" diff --git a/poky/meta/recipes-devtools/rust/rust_1.70.0.bb b/poky/meta/recipes-devtools/rust/rust_1.70.0.bb index 8669291d08..3b9c05a19f 100644 --- a/poky/meta/recipes-devtools/rust/rust_1.70.0.bb +++ b/poky/meta/recipes-devtools/rust/rust_1.70.0.bb @@ -66,6 +66,7 @@ do_rust_setup_snapshot () { fi } addtask rust_setup_snapshot after do_unpack before do_configure +addtask do_test_compile after do_configure do_rust_gen_targets do_rust_setup_snapshot[dirs] += "${WORKDIR}/rust-snapshot" do_rust_setup_snapshot[vardepsexclude] += "UNINATIVE_LOADER" @@ -223,6 +224,11 @@ FILES:${PN}-dev = "" do_compile () { } +do_test_compile[dirs] = "${B}" +do_test_compile () { + rust_runx build src/tools/remote-test-server --target "${RUST_TARGET_SYS}" +} + ALLOW_EMPTY:${PN} = "1" PACKAGES =+ "${PN}-tools-clippy ${PN}-tools-rustfmt" diff --git a/poky/meta/recipes-devtools/strace/strace/00ace1392f5bd289239b755458dcdeeed69af1da.patch b/poky/meta/recipes-devtools/strace/strace/00ace1392f5bd289239b755458dcdeeed69af1da.patch new file mode 100644 index 0000000000..bdf815e55e --- /dev/null +++ b/poky/meta/recipes-devtools/strace/strace/00ace1392f5bd289239b755458dcdeeed69af1da.patch @@ -0,0 +1,303 @@ +From 00ace1392f5bd289239b755458dcdeeed69af1da Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" <ldv@strace.io> +Date: Mon, 26 Jun 2023 10:00:00 +0000 +Subject: [PATCH] tests: avoid accept() libc function when tracing accept() + syscall + +The libc function is allowed to implement accept() using accept4() +syscall, so migrate to accept4() those tests that trace accept() syscall +but do not test accept() specifically, and change the test of accept() +syscall to invoke either __NR_accept or __NR_socketcall(SYS_ACCEPT) +directly. + +* tests/accept_compat.h: Remove. +* tests/Makefile.am (EXTRA_DIST): Remove accept_compat.h. +* tests/accept.c [TEST_SYSCALL_NAME]: Do not invoke accept(), +call __NR_accept or __NR_socketcall if available, or skip the test. +* tests/net-y-unix.c: Do not include "accept_compat.h". +(main): Invoke accept4() instead of accept(). +* tests/net-yy-inet.c: Likewise. +* tests/net-yy-unix.c: Likewise. + +Resolves: https://github.com/strace/strace/issues/260 + +Upstream-Status: Backport +--- + tests/Makefile.am | 1 - + tests/accept.c | 36 ++++++++++++++++++++---------------- + tests/accept_compat.h | 32 -------------------------------- + tests/net-y-unix.c | 16 ++++++++-------- + tests/net-yy-inet.c | 12 ++++++------ + tests/net-yy-unix.c | 16 ++++++++-------- + 6 files changed, 42 insertions(+), 71 deletions(-) + delete mode 100644 tests/accept_compat.h + +Index: strace-6.3/tests/Makefile.am +=================================================================== +--- strace-6.3.orig/tests/Makefile.am ++++ strace-6.3/tests/Makefile.am +@@ -776,7 +776,6 @@ check_DATA = \ + # end of check_DATA + + EXTRA_DIST = \ +- accept_compat.h \ + attach-p-cmd.h \ + clock_adjtime-common.c \ + clock_xettime-common.c \ +Index: strace-6.3/tests/accept.c +=================================================================== +--- strace-6.3.orig/tests/accept.c ++++ strace-6.3/tests/accept.c +@@ -9,38 +9,36 @@ + */ + + #include "tests.h" +- ++#include "scno.h" + #include <unistd.h> + +-#include "scno.h" ++#ifndef TEST_SYSCALL_NAME + +-#if defined __NR_accept ++# if defined __NR_accept || defined __NR_socketcall + +-# ifndef TEST_SYSCALL_NAME + # define TEST_SYSCALL_NAME do_accept +- +-# ifndef TEST_SYSCALL_STR +-# define TEST_SYSCALL_STR "accept" +-# endif ++# define TEST_SYSCALL_STR "accept" + + static int + do_accept(int sockfd, void *addr, void *addrlen) + { ++# ifdef __NR_accept + return syscall(__NR_accept, sockfd, addr, addrlen); ++# else /* __NR_socketcall */ ++ const long args[] = { sockfd, (long) addr, (long) addrlen }; ++ return syscall(__NR_socketcall, 5, args); ++# endif + } +-# endif /* !TEST_SYSCALL_NAME */ + +-#else /* !__NR_accept */ ++# endif /* __NR_accept || __NR_socketcall */ + +-# ifndef TEST_SYSCALL_NAME +-# define TEST_SYSCALL_NAME accept +-# endif ++#endif /* !TEST_SYSCALL_NAME */ + +-#endif /* __NR_accept */ ++#ifdef TEST_SYSCALL_NAME + +-#define TEST_SYSCALL_PREPARE connect_un() ++# define TEST_SYSCALL_PREPARE connect_un() + static void connect_un(void); +-#include "sockname.c" ++# include "sockname.c" + + static void + connect_un(void) +@@ -90,3 +88,9 @@ main(void) + puts("+++ exited with 0 +++"); + return 0; + } ++ ++#else ++ ++SKIP_MAIN_UNDEFINED("__NR_accept || __NR_socketcall") ++ ++#endif +Index: strace-6.3/tests/accept_compat.h +=================================================================== +--- strace-6.3.orig/tests/accept_compat.h ++++ /dev/null +@@ -1,32 +0,0 @@ +-/* +- * Copyright (c) 2018-2019 The strace developers. +- * All rights reserved. +- * +- * SPDX-License-Identifier: GPL-2.0-or-later +- */ +- +-#ifndef _STRACE_TESTS_ACCEPT_COMPAT_H_ +-# define _STRACE_TESTS_ACCEPT_COMPAT_H_ +- +-# include <unistd.h> +-# include <sys/socket.h> +-# include "scno.h" +- +-# if defined __NR_socketcall && defined __sparc__ +-/* +- * Work around the fact that +- * - glibc >= 2.26 uses accept4 syscall to implement accept() call on sparc; +- * - accept syscall had not been wired up on sparc until v4.4-rc8~4^2~1. +- */ +-static inline int +-do_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) +-{ +- const long args[] = { sockfd, (long) addr, (long) addrlen }; +- +- return syscall(__NR_socketcall, 5, args); +-} +-# else +-# define do_accept accept +-# endif +- +-#endif /* !_STRACE_TESTS_ACCEPT_COMPAT_H_ */ +Index: strace-6.3/tests/net-y-unix.c +=================================================================== +--- strace-6.3.orig/tests/net-y-unix.c ++++ strace-6.3/tests/net-y-unix.c +@@ -10,6 +10,7 @@ + + #include "tests.h" + #include <assert.h> ++#include <fcntl.h> + #include <stddef.h> + #include <stdio.h> + #include <stdlib.h> +@@ -18,8 +19,6 @@ + #include <sys/socket.h> + #include <sys/un.h> + +-#include "accept_compat.h" +- + #define TEST_SOCKET "net-y-unix.socket" + + int +@@ -88,12 +87,12 @@ main(void) + struct sockaddr * const accept_sa = tail_alloc(sizeof(addr)); + memset(accept_sa, 0, sizeof(addr)); + *len = sizeof(addr); +- int accept_fd = do_accept(listen_fd, accept_sa, len); ++ int accept_fd = accept4(listen_fd, accept_sa, len, O_CLOEXEC); + if (accept_fd < 0) + perror_msg_and_fail("accept"); + unsigned long accept_inode = inode_of_sockfd(accept_fd); +- printf("accept(%d<socket:[%lu]>, {sa_family=AF_UNIX}" +- ", [%d => %d]) = %d<socket:[%lu]>\n", ++ printf("accept4(%d<socket:[%lu]>, {sa_family=AF_UNIX}" ++ ", [%d => %d], SOCK_CLOEXEC) = %d<socket:[%lu]>\n", + listen_fd, listen_inode, + (int) sizeof(addr), (int) *len, + accept_fd, accept_inode); +@@ -160,14 +159,15 @@ main(void) + + memset(accept_sa, 0, sizeof(addr)); + *len = sizeof(addr); +- accept_fd = do_accept(listen_fd, accept_sa, len); ++ accept_fd = accept4(listen_fd, accept_sa, len, O_CLOEXEC); + if (accept_fd < 0) + perror_msg_and_fail("accept"); + accept_inode = inode_of_sockfd(accept_fd); + const char * const sun_path1 = + ((struct sockaddr_un *) accept_sa)->sun_path + 1; +- printf("accept(%d<socket:[%lu]>, {sa_family=AF_UNIX" +- ", sun_path=@\"%s\"}, [%d => %d]) = %d<socket:[%lu]>\n", ++ printf("accept4(%d<socket:[%lu]>, {sa_family=AF_UNIX" ++ ", sun_path=@\"%s\"}, [%d => %d], SOCK_CLOEXEC)" ++ " = %d<socket:[%lu]>\n", + listen_fd, listen_inode, sun_path1, + (int) sizeof(addr), (int) *len, + accept_fd, accept_inode); +Index: strace-6.3/tests/net-yy-inet.c +=================================================================== +--- strace-6.3.orig/tests/net-yy-inet.c ++++ strace-6.3/tests/net-yy-inet.c +@@ -10,6 +10,7 @@ + + #include "tests.h" + #include <assert.h> ++#include <fcntl.h> + #include <stddef.h> + #include <stdio.h> + #include <string.h> +@@ -19,8 +20,6 @@ + #include <netinet/tcp.h> + #include <arpa/inet.h> + +-#include "accept_compat.h" +- + #ifndef ADDR_FAMILY + # define ADDR_FAMILY_FIELD sin_family + # define ADDR_FAMILY AF_INET +@@ -104,14 +103,15 @@ main(void) + struct sockaddr * const accept_sa = tail_alloc(sizeof(addr)); + memset(accept_sa, 0, sizeof(addr)); + *len = sizeof(addr); +- const int accept_fd = do_accept(listen_fd, accept_sa, len); ++ const int accept_fd = accept4(listen_fd, accept_sa, len, O_CLOEXEC); + if (accept_fd < 0) + perror_msg_and_fail("accept"); + const unsigned int connect_port = + ntohs(((struct SOCKADDR_TYPE *) accept_sa)->INPORT); +- printf("accept(%d<" TCP_STR ":[" LOOPBACK ":%u]>, {sa_family=" AF_STR +- ", " INPORT_STR "=htons(%u), " INADDR_STR SA_FIELDS "}" +- ", [%u]) = %d<" TCP_STR ":[" LOOPBACK ":%u->" LOOPBACK ":%u]>\n", ++ printf("accept4(%d<" TCP_STR ":[" LOOPBACK ":%u]>, {sa_family=" AF_STR ++ ", " INPORT_STR "=htons(%u), " INADDR_STR SA_FIELDS "}, [%u]" ++ ", SOCK_CLOEXEC) = %d<" TCP_STR ":[" LOOPBACK ":%u->" LOOPBACK ++ ":%u]>\n", + listen_fd, listen_port, connect_port, (unsigned) *len, + accept_fd, listen_port, connect_port); + +Index: strace-6.3/tests/net-yy-unix.c +=================================================================== +--- strace-6.3.orig/tests/net-yy-unix.c ++++ strace-6.3/tests/net-yy-unix.c +@@ -10,6 +10,7 @@ + + #include "tests.h" + #include <assert.h> ++#include <fcntl.h> + #include <stddef.h> + #include <stdio.h> + #include <stdlib.h> +@@ -22,8 +23,6 @@ + # include "xmalloc.h" + #endif + +-#include "accept_compat.h" +- + #define TEST_SOCKET "net-yy-unix.socket" + + int +@@ -112,12 +111,12 @@ main(void) + struct sockaddr * const accept_sa = tail_alloc(sizeof(addr)); + memset(accept_sa, 0, sizeof(addr)); + *len = sizeof(addr); +- int accept_fd = do_accept(listen_fd, accept_sa, len); ++ int accept_fd = accept4(listen_fd, accept_sa, len, O_CLOEXEC); + if (accept_fd < 0) + perror_msg_and_fail("accept"); + unsigned long accept_inode = inode_of_sockfd(accept_fd); +- printf("accept(%d<%s:[%lu,\"%s\"]>, {sa_family=AF_UNIX}" +- ", [%d => %d]) = %d<%s:[%lu->%lu,\"%s\"]>\n", ++ printf("accept4(%d<%s:[%lu,\"%s\"]>, {sa_family=AF_UNIX}" ++ ", [%d => %d], SOCK_CLOEXEC) = %d<%s:[%lu->%lu,\"%s\"]>\n", + listen_fd, sock_proto_name, listen_inode, TEST_SOCKET, + (int) sizeof(addr), (int) *len, + accept_fd, sock_proto_name, accept_inode, connect_inode, +@@ -191,14 +190,15 @@ main(void) + + memset(accept_sa, 0, sizeof(addr)); + *len = sizeof(addr); +- accept_fd = do_accept(listen_fd, accept_sa, len); ++ accept_fd = accept4(listen_fd, accept_sa, len, O_CLOEXEC); + if (accept_fd < 0) + perror_msg_and_fail("accept"); + accept_inode = inode_of_sockfd(accept_fd); + const char * const sun_path1 = + ((struct sockaddr_un *) accept_sa)->sun_path + 1; +- printf("accept(%d<%s:[%lu,\"%s\"]>, {sa_family=AF_UNIX" +- ", sun_path=@\"%s\"}, [%d => %d]) = %d<%s:[%lu->%lu,\"%s\"]>\n", ++ printf("accept4(%d<%s:[%lu,\"%s\"]>, {sa_family=AF_UNIX" ++ ", sun_path=@\"%s\"}, [%d => %d], SOCK_CLOEXEC)" ++ " = %d<%s:[%lu->%lu,\"%s\"]>\n", + listen_fd, sock_proto_name, listen_inode, TEST_SOCKET, + sun_path1, (int) sizeof(addr), (int) *len, + accept_fd, sock_proto_name, accept_inode, connect_inode, diff --git a/poky/meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch b/poky/meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch new file mode 100644 index 0000000000..b4c6ff99de --- /dev/null +++ b/poky/meta/recipes-devtools/strace/strace/3bbfb541b258baec9eba674b5d8dc30007a61542.patch @@ -0,0 +1,50 @@ +From 3bbfb541b258baec9eba674b5d8dc30007a61542 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" <ldv@strace.io> +Date: Wed, 21 Jun 2023 08:00:00 +0000 +Subject: [PATCH] net: enhance getsockopt decoding + +When getsockopt syscall fails the kernel sometimes updates the optlen +argument, for example, NETLINK_LIST_MEMBERSHIPS updates it even if +optval is not writable. + +* src/net.c (SYS_FUNC(getsockopt)): Try to fetch and print optlen +argument on exiting syscall regardless of getsockopt exit status. + +Upstream-Status: Backport +--- + src/net.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/src/net.c b/src/net.c +index f68ccb947..7244b5e57 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -1038,7 +1038,7 @@ SYS_FUNC(getsockopt) + } else { + ulen = get_tcb_priv_ulong(tcp); + +- if (syserror(tcp) || umove(tcp, tcp->u_arg[4], &rlen) < 0) { ++ if (umove(tcp, tcp->u_arg[4], &rlen) < 0) { + /* optval */ + printaddr(tcp->u_arg[3]); + tprint_arg_next(); +@@ -1047,6 +1047,19 @@ SYS_FUNC(getsockopt) + tprint_indirect_begin(); + PRINT_VAL_D(ulen); + tprint_indirect_end(); ++ } else if (syserror(tcp)) { ++ /* optval */ ++ printaddr(tcp->u_arg[3]); ++ tprint_arg_next(); ++ ++ /* optlen */ ++ tprint_indirect_begin(); ++ if (ulen != rlen) { ++ PRINT_VAL_D(ulen); ++ tprint_value_changed(); ++ } ++ PRINT_VAL_D(rlen); ++ tprint_indirect_end(); + } else { + /* optval */ + print_getsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2], diff --git a/poky/meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch b/poky/meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch new file mode 100644 index 0000000000..a0843836c2 --- /dev/null +++ b/poky/meta/recipes-devtools/strace/strace/f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch @@ -0,0 +1,50 @@ +From f31c2f4494779e5c5f170ad10539bfc2dfafe967 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" <ldv@strace.io> +Date: Sat, 24 Jun 2023 08:00:00 +0000 +Subject: [PATCH] tests: update sockopt-sol_netlink test + +Update sockopt-sol_netlink test that started to fail, likely +due to recent linux kernel commit f4e4534850a9 ("net/netlink: fix +NETLINK_LIST_MEMBERSHIPS length report"). + +* tests/sockopt-sol_netlink.c (main): Always print changing optlen value +on exiting syscall. + +Reported-by: Alexander Gordeev <agordeev@linux.ibm.com> +--- + tests/sockopt-sol_netlink.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +Upstream-Status: Backport + +diff --git a/tests/sockopt-sol_netlink.c b/tests/sockopt-sol_netlink.c +index 82b98adc23..1c33219ac5 100644 +--- a/tests/sockopt-sol_netlink.c ++++ b/tests/sockopt-sol_netlink.c +@@ -94,7 +94,10 @@ main(void) + printf("%p", val); + else + printf("[%d]", *val); +- printf(", [%d]) = %s\n", *len, errstr); ++ printf(", [%d", (int) sizeof(*val)); ++ if ((int) sizeof(*val) != *len) ++ printf(" => %d", *len); ++ printf("]) = %s\n", errstr); + + /* optlen larger than necessary - shortened */ + *len = sizeof(*val) + 1; +@@ -150,8 +153,12 @@ main(void) + /* optval EFAULT - print address */ + *len = sizeof(*val); + get_sockopt(fd, names[i].val, efault, len); +- printf("getsockopt(%d, SOL_NETLINK, %s, %p, [%d]) = %s\n", +- fd, names[i].str, efault, *len, errstr); ++ printf("getsockopt(%d, SOL_NETLINK, %s, %p", ++ fd, names[i].str, efault); ++ printf(", [%d", (int) sizeof(*val)); ++ if ((int) sizeof(*val) != *len) ++ printf(" => %d", *len); ++ printf("]) = %s\n", errstr); + + /* optlen EFAULT - print address */ + get_sockopt(fd, names[i].val, val, len + 1); diff --git a/poky/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch b/poky/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch deleted file mode 100644 index 5741bf8672..0000000000 --- a/poky/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Inappropriate [avoid this test until fixed by upstream] - -Reported at https://github.com/strace/strace/issues/257 - -root@qemux86-64:/usr/lib/strace/ptest/tests# make sockopt-sol_netlink.gen.log -FAIL: sockopt-sol_netlink.gen.test - -#root@qemux86-64:/usr/lib/strace/ptest/tests# diff sockopt-sol_netlink.dir/exp sockopt-sol_netlink.dir/out -#--- sockopt-sol_netlink.dir/exp -#+++ sockopt-sol_netlink.dir/out -#@@ -86,11 +86,11 @@ - setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a802ffc, -1) = -1 EINVAL (Invalid argument) - setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a802ffc, 3) = 0 - setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a803000, 4) = -1 EFAULT (Bad address) --getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [8]) = 0 -+getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [4 => 8]) = 0 - getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [5 => 8]) = 0 - getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, NULL, [0 => 8]) = 0 - getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [], [3 => 8]) = 0 --getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a803000, [8]) = -1 EFAULT (Bad address) -+getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a803000, [4]) = -1 EFAULT (Bad address) - getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a802ffc, 0x7fa18a7fd000) = -1 EFAULT (Bad address) - setsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [233811181], 4) = -1 ENOPROTOOPT (Protocol not available) - setsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [233811181], 5) = -1 ENOPROTOOPT (Protocol not available) - - - -Index: strace-6.3/tests/sockopt-sol_netlink.gen.test -=================================================================== ---- strace-6.3.orig/tests/sockopt-sol_netlink.gen.test -+++ strace-6.3/tests/sockopt-sol_netlink.gen.test -@@ -1,4 +1,5 @@ - #!/bin/sh -efu - # Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (sockopt-sol_netlink -e trace=getsockopt,setsockopt); do not edit. - . "${srcdir=.}/init.sh" -+skip_ "Test failing after system upgrades, wait for upstream fixes" - run_strace_match_diff -e trace=getsockopt,setsockopt diff --git a/poky/meta/recipes-devtools/strace/strace_6.3.bb b/poky/meta/recipes-devtools/strace/strace_6.3.bb index 7ba9fcc468..a47cc71724 100644 --- a/poky/meta/recipes-devtools/strace/strace_6.3.bb +++ b/poky/meta/recipes-devtools/strace/strace_6.3.bb @@ -14,7 +14,9 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://skip-load.patch \ file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ file://0002-tests-Replace-off64_t-with-off_t.patch \ - file://skip-sockopt-test.patch \ + file://00ace1392f5bd289239b755458dcdeeed69af1da.patch \ + file://f31c2f4494779e5c5f170ad10539bfc2dfafe967.patch \ + file://3bbfb541b258baec9eba674b5d8dc30007a61542.patch \ " SRC_URI[sha256sum] = "e17878e301506c1cc301611118ad14efee7f8bcef63b27ace5d290acce7bb731" diff --git a/poky/meta/recipes-devtools/tcltk/tcl_8.6.13.bb b/poky/meta/recipes-devtools/tcltk/tcl_8.6.13.bb index 982f370edb..91fc81352e 100644 --- a/poky/meta/recipes-devtools/tcltk/tcl_8.6.13.bb +++ b/poky/meta/recipes-devtools/tcltk/tcl_8.6.13.bb @@ -29,10 +29,6 @@ SRC_URI[sha256sum] = "c61f0d6699e2bc7691f119b41963aaa8dc980f23532c4e937739832a5f 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_IGNORE += "CVE-2021-35331" - UPSTREAM_CHECK_URI = "https://www.tcl.tk/software/tcltk/download.html" UPSTREAM_CHECK_REGEX = "tcl(?P<pver>\d+(\.\d+)+)-src" |