unfs3: correct upstream version check
PATCH 1/23 unfs3: correct upstream version check
--- meta/recipes-devtools/unfs3/unfs3_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/unfs3/unfs3_git.bb +1 -1
@@ -28,7 +28,7 @@ SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master \ file://no-yywrap.patch \ " SRCREV = "c12a5c69a8d59be6916cbd0e0f41c159f1962425" -UPSTREAM_CHECK_GITTAGREGEX = "unfs3\-(?P<pver>.+)" +UPSTREAM_CHECK_GITTAGREGEX = "unfs3\-(?P<pver>\d+(\.\d+)+)" PV = "0.9.22+${SRCPV}"
Signature · 1 line
2.30.2
PATCH 2/23 gnu-config: update to latest revision
--- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/gnu-config/gnu-config_git.bb +2 -2
@@ -9,8 +9,8 @@ DEPENDS:class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "02ba26b218d3d3db6c56e014655faf463cefa983" -PV = "20220525+git${SRCPV}" +SRCREV = "20403c5701973a4cbd7e0b4bbeb627fcd424a0f1" +PV = "20220927+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/git/config.git;protocol=https;branch=master \ file://gnu-configize.in"
Signature · 1 line
2.30.2
PATCH 3/23 go: update 1.19 -> 1.19.1
In reply to Alexander Kanavin---
meta/recipes-devtools/go/{go-1.19.inc => go-1.19.1.inc} | 2 +-
...o-binary-native_1.19.bb => go-binary-native_1.19.1.bb} | 4 ++--
...cross-canadian_1.19.bb => go-cross-canadian_1.19.1.bb} | 0
.../go/{go-cross_1.19.bb => go-cross_1.19.1.bb} | 0
.../go/{go-crosssdk_1.19.bb => go-crosssdk_1.19.1.bb} | 0
.../go/{go-native_1.19.bb => go-native_1.19.1.bb} | 0
.../go/{go-runtime_1.19.bb => go-runtime_1.19.1.bb} | 0
...go-make-content-based-hash-generation-less-pedan.patch | 8 ++++----
meta/recipes-devtools/go/{go_1.19.bb => go_1.19.1.bb} | 0
9 files changed, 7 insertions(+), 7 deletions(-)
rename meta/recipes-devtools/go/{go-1.19.inc => go-1.19.1.inc} (89%)
rename meta/recipes-devtools/go/{go-binary-native_1.19.bb => go-binary-native_1.19.1.bb} (83%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.19.bb => go-cross-canadian_1.19.1.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.19.bb => go-cross_1.19.1.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.19.bb => go-crosssdk_1.19.1.bb} (100%)
rename meta/recipes-devtools/go/{go-native_1.19.bb => go-native_1.19.1.bb} (100%)
rename meta/recipes-devtools/go/{go-runtime_1.19.bb => go-runtime_1.19.1.bb} (100%)
rename meta/recipes-devtools/go/{go_1.19.bb => go_1.19.1.bb} (100%)meta/recipes-devtools/go/go-1.19.1.inc renamed from meta/recipes-devtools/go/go-1.19.inc +1 -1
@@ -16,4 +16,4 @@ SRC_URI += "\ file://filter-build-paths.patch \ file://stack-protector.patch \ " -SRC_URI[main.sha256sum] = "9419cc70dc5a2523f29a77053cafff658ed21ef3561d9b6b020280ebceab28b9" +SRC_URI[main.sha256sum] = "27871baa490f3401414ad793fba49086f6c855b1c584385ed7771e1204c7e179"
meta/recipes-devtools/go/go-binary-native_1.19.1.bb renamed from meta/recipes-devtools/go/go-binary-native_1.19.bb +2 -2
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" PROVIDES = "go-native" 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] = "464b6b66591f6cf055bc5df90a9750bf5fbc9d038722bb84a9d56a2bea974be6" -SRC_URI[go_linux_arm64.sha256sum] = "efa97fac9574fc6ef6c9ff3e3758fb85f1439b046573bf434cccb5e012bd00c8" +SRC_URI[go_linux_amd64.sha256sum] = "acc512fbab4f716a8f97a8b3fbaa9ddd39606a28be6c2515ef7c6c6311acffde" +SRC_URI[go_linux_arm64.sha256sum] = "49960821948b9c6b14041430890eccee58c76b52e2dbaafce971c3c38d43df9f" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
meta/recipes-devtools/go/go-cross-canadian_1.19.1.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.19.bb +0 -0
meta/recipes-devtools/go/go-cross_1.19.1.bb renamed from meta/recipes-devtools/go/go-cross_1.19.bb +0 -0
meta/recipes-devtools/go/go-crosssdk_1.19.1.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.19.bb +0 -0
meta/recipes-devtools/go/go-native_1.19.1.bb renamed from meta/recipes-devtools/go/go-native_1.19.bb +0 -0
meta/recipes-devtools/go/go-runtime_1.19.1.bb renamed from meta/recipes-devtools/go/go-runtime_1.19.bb +0 -0
meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch +4 -4
@@ -1,4 +1,4 @@ -From a3db4da51df37d163ff9e8c1e1057280c648c545 Mon Sep 17 00:00:00 2001 +From fb22e586871cc6be0b7041e86d2daceee06ea568 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 28 Mar 2022 10:59:03 -0700 Subject: [PATCH] cmd/go: make content-based hash generation less pedantic
@@ -32,13 +32,13 @@ Signed-off-by: Khem Raj <[email protected]> 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 529351d..df791b0 100644 +index 81ee859..2db3898 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go @@ -176,7 +176,7 @@ func ExtraEnvVars() []cfg.EnvVar { func ExtraEnvVarsCostly() []cfg.EnvVar { - var b work.Builder - b.Init() + b := work.NewBuilder("") + - cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}) + cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}, false) if err != nil {
meta/recipes-devtools/go/go_1.19.1.bb renamed from meta/recipes-devtools/go/go_1.19.bb +0 -0
Signature · 1 line
2.30.2
Re: [OE-core] [PATCH 03/23] go: update 1.19 -> 1.19.1
Hello Alex,
Do you mind rebasing on master, I guess there is the ppc64 checksum to add.
Quoted 116 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-devtools/go/{go-1.19.inc => go-1.19.1.inc} | 2 +- ...o-binary-native_1.19.bb => go-binary-native_1.19.1.bb} | 4 ++-- ...cross-canadian_1.19.bb => go-cross-canadian_1.19.1.bb} | 0 .../go/{go-cross_1.19.bb => go-cross_1.19.1.bb} | 0 .../go/{go-crosssdk_1.19.bb => go-crosssdk_1.19.1.bb} | 0 .../go/{go-native_1.19.bb => go-native_1.19.1.bb} | 0 .../go/{go-runtime_1.19.bb => go-runtime_1.19.1.bb} | 0 ...go-make-content-based-hash-generation-less-pedan.patch | 8 ++++---- meta/recipes-devtools/go/{go_1.19.bb => go_1.19.1.bb} | 0 9 files changed, 7 insertions(+), 7 deletions(-) rename meta/recipes-devtools/go/{go-1.19.inc => go-1.19.1.inc} (89%) rename meta/recipes-devtools/go/{go-binary-native_1.19.bb => go-binary-native_1.19.1.bb} (83%) rename meta/recipes-devtools/go/{go-cross-canadian_1.19.bb => go-cross-canadian_1.19.1.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.19.bb => go-cross_1.19.1.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.19.bb => go-crosssdk_1.19.1.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.19.bb => go-native_1.19.1.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.19.bb => go-runtime_1.19.1.bb} (100%) rename meta/recipes-devtools/go/{go_1.19.bb => go_1.19.1.bb} (100%)meta/recipes-devtools/go/go-1.19.1.inc renamed from meta/recipes-devtools/go/go-1.19.inc +1
-1@@ -16,4 +16,4 @@ SRC_URI += "\ file://filter-build-paths.patch \ file://stack-protector.patch \ " -SRC_URI[main.sha256sum] = "9419cc70dc5a2523f29a77053cafff658ed21ef3561d9b6b020280ebceab28b9" +SRC_URI[main.sha256sum] = "27871baa490f3401414ad793fba49086f6c855b1c584385ed7771e1204c7e179"meta/recipes-devtools/go/go-binary-native_1.19.1.bb renamed from meta/recipes-devtools/go/go-binary-native_1.19.bb +2
-2@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" PROVIDES = "go-native" 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] = "464b6b66591f6cf055bc5df90a9750bf5fbc9d038722bb84a9d56a2bea974be6" -SRC_URI[go_linux_arm64.sha256sum] = "efa97fac9574fc6ef6c9ff3e3758fb85f1439b046573bf434cccb5e012bd00c8" +SRC_URI[go_linux_amd64.sha256sum] = "acc512fbab4f716a8f97a8b3fbaa9ddd39606a28be6c2515ef7c6c6311acffde" +SRC_URI[go_linux_arm64.sha256sum] = "49960821948b9c6b14041430890eccee58c76b52e2dbaafce971c3c38d43df9f" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"meta/recipes-devtools/go/go-cross-canadian_1.19.1.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.19.bb +0
-0meta/recipes-devtools/go/go-cross_1.19.1.bb renamed from meta/recipes-devtools/go/go-cross_1.19.bb +0
-0meta/recipes-devtools/go/go-crosssdk_1.19.1.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.19.bb +0
-0meta/recipes-devtools/go/go-native_1.19.1.bb renamed from meta/recipes-devtools/go/go-native_1.19.bb +0
-0meta/recipes-devtools/go/go-runtime_1.19.1.bb renamed from meta/recipes-devtools/go/go-runtime_1.19.bb +0
-0meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch +4
-4@@ -1,4 +1,4 @@ -From a3db4da51df37d163ff9e8c1e1057280c648c545 Mon Sep 17 00:00:00 2001 +From fb22e586871cc6be0b7041e86d2daceee06ea568 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 28 Mar 2022 10:59:03 -0700 Subject: [PATCH] cmd/go: make content-based hash generation less pedantic@@ -32,13 +32,13 @@ Signed-off-by: Khem Raj <[email protected]> 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 529351d..df791b0 100644 +index 81ee859..2db3898 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go @@ -176,7 +176,7 @@ func ExtraEnvVars() []cfg.EnvVar { func ExtraEnvVarsCostly() []cfg.EnvVar { - var b work.Builder - b.Init() + b := work.NewBuilder("") + - cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}) + cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}, false) if err != nil {meta/recipes-devtools/go/go_1.19.1.bb renamed from meta/recipes-devtools/go/go_1.19.bb +0
-0Signature · 11 lines
2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#172207): https://lists.openembedded.org/g/openembedded-core/message/172207 Mute This Topic: https://lists.openembedded.org/mt/94612924/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 4/23 llvm: update 14.0.6 -> 15.0.1
In reply to Alexander Kanavin'Release' type follows standard practice elsewhere in core, particularly rust-llvm as well.
--- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/llvm/llvm_git.bb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
meta/conf/distro/include/tcmode-default.inc +1 -1
@@ -26,7 +26,7 @@ QEMUVERSION ?= "7.1%" GOVERSION ?= "1.19%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump -LLVMVERSION ?= "14.0.6" +LLVMVERSION ?= "15.0.1" RUSTVERSION ?= "1.64%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
meta/recipes-devtools/llvm/llvm_git.bb +3 -2
@@ -19,14 +19,14 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" -PV = "14.0.6" +PV = "15.0.1" MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "f28c006a5895fc0e329fe15fead81e37457cb1d1" +SRCREV = "b73d2c8c720a8c8e6e73b11be4e27afa6cb75bdf" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \
@@ -80,6 +80,7 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS}' \ -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ + -DCMAKE_BUILD_TYPE=Release \ -G Ninja" EXTRA_OECMAKE:append:class-target = "\
Signature · 1 line
2.30.2
PATCH 5/23 grep: update 3.7 -> 3.8
In reply to Alexander Kanavin---
...a-standard-layout-so-glibc-and-musl-.patch | 32 -------------------
.../grep/{grep_3.7.bb => grep_3.8.bb} | 8 ++---
2 files changed, 3 insertions(+), 37 deletions(-)
delete mode 100644 meta/recipes-extended/grep/grep/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch
rename meta/recipes-extended/grep/{grep_3.7.bb => grep_3.8.bb} (84%)meta/recipes-extended/grep/grep/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 981385237834bdf3e468421147eece68d9bfc7e7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 25 Mar 2022 13:34:26 -0700 -Subject: [PATCH] mcontext is not a standard layout so glibc and musl differ - -This is already applied to libsigsegv upstream, hopefully next version -of grep will update its internal copy and we can drop this patch - -Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=libsigsegv.git;a=commitdiff;h=a6ff69873110c0a8ba6f7fd90532dbc11224828c] -Signed-off-by: Khem Raj <[email protected]> ---- - lib/sigsegv.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/sigsegv.c b/lib/sigsegv.c -index 998c827..b6f4841 100644 ---- a/lib/sigsegv.c -+++ b/lib/sigsegv.c -@@ -219,8 +219,8 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] - # else /* 32-bit */ - /* both should be equivalent */ --# if 0 --# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] -+# if ! defined __GLIBC__ -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1] - # else - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] - # endif --- -2.35.1 -
meta/recipes-extended/grep/grep_3.8.bb renamed from meta/recipes-extended/grep/grep_3.7.bb +3 -5
@@ -6,11 +6,9 @@ SECTION = "console/utils" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \ - file://0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch \ - " +SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz" -SRC_URI[sha256sum] = "5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c" +SRC_URI[sha256sum] = "498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382" inherit autotools gettext texinfo pkgconfig
@@ -36,7 +34,7 @@ do_install () { inherit update-alternatives PACKAGECONFIG ??= "pcre" -PACKAGECONFIG[pcre] = "--enable-perl-regexp,--disable-perl-regexp,libpcre" +PACKAGECONFIG[pcre] = "--enable-perl-regexp,--disable-perl-regexp,libpcre2" ALTERNATIVE_PRIORITY = "100"
Signature · 1 line
2.30.2
PATCH 6/23 hdparm: update 9.64 -> 9.65
In reply to Alexander Kanavin---
...parm-Remove-unused-linux-fs.h-header.patch | 32 -------------------
.../hdparm/{hdparm_9.64.bb => hdparm_9.65.bb} | 5 ++-
2 files changed, 2 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-extended/hdparm/hdparm/0001-hdparm-Remove-unused-linux-fs.h-header.patch
rename meta/recipes-extended/hdparm/{hdparm_9.64.bb => hdparm_9.65.bb} (89%)meta/recipes-extended/hdparm/hdparm/0001-hdparm-Remove-unused-linux-fs.h-header.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From c8fc52968f9e97d29ccf6deb348ec02627d74235 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 29 Jul 2022 13:00:40 -0700 -Subject: [PATCH] hdparm: Remove unused linux/fs.h header - -this helps fixing builds with glibc 2.36 where mount.h conflits now with -kernel mount.h which is included indirectly by linux/fs.h see [1] for -details - -[1] https://sourceware.org/glibc/wiki/Release/2.36 - -Upstream-Status: Submitted [https://sourceforge.net/p/hdparm/patches/52/] -Signed-off-by: Khem Raj <[email protected]> ---- - hdparm.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/hdparm.c b/hdparm.c -index fa21e2f..901bdd8 100644 ---- a/hdparm.c -+++ b/hdparm.c -@@ -25,7 +25,6 @@ - #include <sys/mman.h> - #include <sys/user.h> - #include <linux/types.h> --#include <linux/fs.h> - #include <linux/major.h> - #include <endian.h> - #include <asm/byteorder.h> --- -2.37.1 -
meta/recipes-extended/hdparm/hdparm_9.65.bb renamed from meta/recipes-extended/hdparm/hdparm_9.64.bb +2 -3
@@ -24,10 +24,9 @@ RDEPENDS:wiper = "bash gawk coreutils" SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \ file://wiper.sh-fix-stat-path.patch \ - file://0001-hdparm-Remove-unused-linux-fs.h-header.patch \ - " + " -SRC_URI[sha256sum] = "315b956951c3fea027287de204381534217c0bd0f37b4935877fe2db0cab859a" +SRC_URI[sha256sum] = "d14929f910d060932e717e9382425d47c2e7144235a53713d55a94f7de535a4b" EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"'
Signature · 1 line
2.30.2
PATCH 7/23 stress-ng: update 0.14.03 -> 0.14.06
In reply to Alexander Kanavin---
...helper-remove-include-of-sys-mount.h.patch | 34 -------------------
...e-shim-remove-include-of-sys-mount.h.patch | 34 -------------------
...ess-ng_0.14.03.bb => stress-ng_0.14.06.bb} | 7 ++--
3 files changed, 2 insertions(+), 73 deletions(-)
delete mode 100644 meta/recipes-extended/stress-ng/stress-ng/0001-core-helper-remove-include-of-sys-mount.h.patch
delete mode 100644 meta/recipes-extended/stress-ng/stress-ng/0002-core-shim-remove-include-of-sys-mount.h.patch
rename meta/recipes-extended/stress-ng/{stress-ng_0.14.03.bb => stress-ng_0.14.06.bb} (77%)meta/recipes-extended/stress-ng/stress-ng/0001-core-helper-remove-include-of-sys-mount.h.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 627e5227783ff2a0c3b11adee57ef7f0684a367e Mon Sep 17 00:00:00 2001 -From: Colin Ian King <[email protected]> -Date: Mon, 1 Aug 2022 21:39:39 +0100 -Subject: [PATCH 1/2] core-helper: remove include of sys/mount.h - -This is not required in the shim core and it fixes a build issue -with newer glibc 2.36 - -Fixes: https://github.com/ColinIanKing/stress-ng/issues/216 - -Upstream-Status: Backport [https://github.com/ColinIanKing/stress-ng/commit/69f4f4d629c5f4304b5388b6a7fa8616de23f50e] -Signed-off-by: Colin Ian King <[email protected]> ---- - core-helper.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/core-helper.c b/core-helper.c -index 6795410d..9e4533f2 100644 ---- a/core-helper.c -+++ b/core-helper.c -@@ -39,10 +39,6 @@ - #include <sys/loadavg.h> - #endif - --#if defined(HAVE_SYS_MOUNT_H) --#include <sys/mount.h> --#endif -- - #if defined(HAVE_SYS_PRCTL_H) - #include <sys/prctl.h> - #endif --- -2.37.1 -
meta/recipes-extended/stress-ng/stress-ng/0002-core-shim-remove-include-of-sys-mount.h.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 0503ec88e9187c0152b7b2840a1ad5bfb022bbfe Mon Sep 17 00:00:00 2001 -From: Colin Ian King <[email protected]> -Date: Mon, 1 Aug 2022 21:28:49 +0100 -Subject: [PATCH 2/2] core-shim: remove include of sys/mount.h - -This is not required in the shim core and it fixes a build issue -with newer glibc 2.36 - -Fixes: https://github.com/ColinIanKing/stress-ng/issues/216 - -Upstream-Status: Backport [https://github.com/ColinIanKing/stress-ng/commit/0c9a711f213b5734729ab0c5ed90669e9fd11ca2] -Signed-off-by: Colin Ian King <[email protected]> ---- - core-shim.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/core-shim.c b/core-shim.c -index 0343402a..324eba7d 100644 ---- a/core-shim.c -+++ b/core-shim.c -@@ -52,10 +52,6 @@ - #include <asm/ldt.h> - #endif - --#if defined(HAVE_SYS_MOUNT_H) --#include <sys/mount.h> --#endif -- - #if defined(HAVE_SYS_PRCTL_H) - #include <sys/prctl.h> - #endif --- -2.37.1 -
meta/recipes-extended/stress-ng/stress-ng_0.14.06.bb renamed from meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb +2 -5
@@ -5,11 +5,8 @@ HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ - file://0001-core-helper-remove-include-of-sys-mount.h.patch \ - file://0002-core-shim-remove-include-of-sys-mount.h.patch \ -" -SRCREV = "346518caffe5302f9a6d36860459c297c6968aaa" +SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master" +SRCREV = "03493cb69e91c29718ff9f645514355cd99762c6" S = "${WORKDIR}/git" DEPENDS = "coreutils-native"
Signature · 1 line
2.30.2
PATCH 8/23 vulkan: update 1.3.216.0 -> 1.3.224.1
In reply to Alexander Kanavin---
.../0001-generate-glslang-pkg-config.patch | 18 +++++-----
...lang_1.3.216.0.bb => glslang_1.3.224.1.bb} | 2 +-
....3.216.0.bb => spirv-headers_1.3.224.1.bb} | 0
...ult-copy-constructor-in-header.-4879.patch | 34 -------------------
..._1.3.216.0.bb => spirv-tools_1.3.224.1.bb} | 6 ++--
...3.216.0.bb => vulkan-headers_1.3.224.1.bb} | 2 +-
....3.216.0.bb => vulkan-loader_1.3.224.1.bb} | 4 +--
...1.3.216.0.bb => vulkan-tools_1.3.224.1.bb} | 2 +-
8 files changed, 16 insertions(+), 52 deletions(-)
rename meta/recipes-graphics/glslang/{glslang_1.3.216.0.bb => glslang_1.3.224.1.bb} (95%)
rename meta/recipes-graphics/spir/{spirv-headers_1.3.216.0.bb => spirv-headers_1.3.224.1.bb} (100%)
delete mode 100644 meta/recipes-graphics/spir/spirv-tools/0001-Remove-default-copy-constructor-in-header.-4879.patch
rename meta/recipes-graphics/spir/{spirv-tools_1.3.216.0.bb => spirv-tools_1.3.224.1.bb} (88%)
rename meta/recipes-graphics/vulkan/{vulkan-headers_1.3.216.0.bb => vulkan-headers_1.3.224.1.bb} (93%)
rename meta/recipes-graphics/vulkan/{vulkan-loader_1.3.216.0.bb => vulkan-loader_1.3.224.1.bb} (94%)
rename meta/recipes-graphics/vulkan/{vulkan-tools_1.3.216.0.bb => vulkan-tools_1.3.224.1.bb} (96%)meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch +9 -9
@@ -1,4 +1,4 @@ -From 6692611126b40d499c94bbcc8e29604560262072 Mon Sep 17 00:00:00 2001 +From 7161916f69ae257ce06d9c9bf25abf9709bc55cc Mon Sep 17 00:00:00 2001 From: Jose Quaresma <[email protected]> Date: Sun, 7 Feb 2021 01:30:39 +0000 Subject: [PATCH] generate glslang pkg-config
@@ -16,21 +16,21 @@ Signed-off-by: Jose Quaresma <[email protected]> create mode 100644 glslang/glslang.pc.cmake.in diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index 1c7d22a2..10c1e841 100644 +index 45c9813a..cea13975 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt -@@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL) - EXPORT glslangTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() +@@ -221,6 +221,8 @@ if(ENABLE_GLSLANG_INSTALL) + endif() + ") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - + set(ALL_HEADERS + ${GLSLANG_HEADERS} diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in new file mode 100644 -index 00000000..64b6882d +index 00000000..948a0952 --- /dev/null +++ b/glslang/glslang.pc.cmake.in @@ -0,0 +1,11 @@
meta/recipes-graphics/glslang/glslang_1.3.224.1.bb renamed from meta/recipes-graphics/glslang/glslang_1.3.216.0.bb +1 -1
@@ -8,7 +8,7 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" -SRCREV = "adbf0d3106b26daa237b10b9bf72b1af7c31092d" +SRCREV = "10423ec659d301a0ff2daac8bbf38980abf27590" SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \ file://0001-generate-glslang-pkg-config.patch" PE = "1"
meta/recipes-graphics/spir/spirv-headers_1.3.224.1.bb renamed from meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb +0 -0
meta/recipes-graphics/spir/spirv-tools/0001-Remove-default-copy-constructor-in-header.-4879.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From a90ccc240501bf3362b23f67771f65b7dec2ccf9 Mon Sep 17 00:00:00 2001 -From: Jamie Madill <[email protected]> -Date: Fri, 29 Jul 2022 14:26:37 -0400 -Subject: [PATCH] Remove default copy constructor in header. (#4879) - -A recent libc++ roll in Chrome warned of a deprecated copy. We're -still looking if this is a bug in libc++ or a valid warning, but -removing the redundant line is a safe workaround or fix in either -case. - -See discussion in https://crrev.com/c/3791771 - -Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Tools/pull/4879] -Signed-off-by: Khem Raj <[email protected]> ---- - source/opt/merge_return_pass.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/source/opt/merge_return_pass.h b/source/opt/merge_return_pass.h -index a35cf269..d15db2f6 100644 ---- a/source/opt/merge_return_pass.h -+++ b/source/opt/merge_return_pass.h -@@ -118,8 +118,6 @@ class MergeReturnPass : public MemPass { - StructuredControlState(Instruction* break_merge, Instruction* merge) - : break_merge_(break_merge), current_merge_(merge) {} - -- StructuredControlState(const StructuredControlState&) = default; -- - bool InBreakable() const { return break_merge_; } - bool InStructuredFlow() const { return CurrentMergeId() != 0; } - --- -2.37.2 -
meta/recipes-graphics/spir/spirv-tools_1.3.224.1.bb renamed from meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb +2 -4
@@ -7,10 +7,8 @@ SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "c94501352d545e84c821ce031399e76d1af32d18" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https \ - file://0001-Remove-default-copy-constructor-in-header.-4879.patch \ - " +SRCREV = "5e61ea2098220059e89523f1f47b0bcd8c33b89a" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https" PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"
meta/recipes-graphics/vulkan/vulkan-headers_1.3.224.1.bb renamed from meta/recipes-graphics/vulkan/vulkan-headers_1.3.216.0.bb +1 -1
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" -SRCREV = "3ef4c97fd6ea001d75a8e9da408ee473c180e456" +SRCREV = "c896e2f920273bfee852da9cca2a356bc1c2031e" S = "${WORKDIR}/git"
meta/recipes-graphics/vulkan/vulkan-loader_1.3.224.1.bb renamed from meta/recipes-graphics/vulkan/vulkan-loader_1.3.216.0.bb +2 -2
@@ -9,8 +9,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.216;protocol=https" -SRCREV = "322f7e3212b4fd9d70d7f48972963c83d24d06e4" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.224;protocol=https" +SRCREV = "09afdf64210b11ec653a1001e013b5af4fce8559" S = "${WORKDIR}/git"
meta/recipes-graphics/vulkan/vulkan-tools_1.3.224.1.bb renamed from meta/recipes-graphics/vulkan/vulkan-tools_1.3.216.0.bb +1 -1
@@ -7,7 +7,7 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=master;protocol=https" -SRCREV = "ef9db7a8ec52f6c56158d83f5d57ef388c1abec1" +SRCREV = "497f232680b046db34ba9e9da065e6303a125851" S = "${WORKDIR}/git"
Signature · 1 line
2.30.2
PATCH 9/23 wayland-utils: update 1.0.0 -> 1.1.0
In reply to Alexander Kanavin---
...ayland-info-Fix-build-without-libdrm.patch | 42 +++++++++++++++++++
...-utils_1.0.0.bb => wayland-utils_1.1.0.bb} | 5 ++-
2 files changed, 45 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch
rename meta/recipes-graphics/wayland/{wayland-utils_1.0.0.bb => wayland-utils_1.1.0.bb} (69%)meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch new file +42 -0
@@ -0,0 +1,42 @@ +From c79a3fb51718c4286b74edf0f758df9219994844 Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan <[email protected]> +Date: Wed, 14 Sep 2022 09:07:10 +0200 +Subject: [PATCH] wayland-info: Fix build without libdrm + +wayland-info can optionally use libdrm to provide a description of the +dmabuf format modifiers. + +When not using libdrm however, the build fails because "dev_t" is not +defined. + +The definition of "dev_t" comes from <sys/types.h> which is included +from <libdrm.h>, which is not included without libdrm support, hence the +build failure. + +Simply include <sys/types.h> unconditionally to make sure "dev_t" is +defined regardless of libdrm support, to fix the build failure. + +Closes: https://gitlab.freedesktop.org/wayland/wayland-utils/-/issues/6 +Signed-off-by: Olivier Fourdan <[email protected]> +Fixes: 240cb739 - "Add support for linux_dmabuf version 4" +Reviewed-by: Simon Ser <[email protected]> +Reviewed-by: Pekka Paalanen <[email protected]> + +Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/wayland-utils/-/commit/baa65ba9f62e6a05c32b9202b524158a21f24245] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + wayland-info/wayland-info.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/wayland-info/wayland-info.c b/wayland-info/wayland-info.c +index 53cd04b..98ff205 100644 +--- a/wayland-info/wayland-info.c ++++ b/wayland-info/wayland-info.c +@@ -34,6 +34,7 @@ + #include <ctype.h> + #include <unistd.h> + #include <sys/mman.h> ++#include <sys/types.h> + + #include <wayland-client.h> + #if HAVE_HUMAN_FORMAT_MODIFIER
meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb renamed from meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb +3 -2
@@ -9,9 +9,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=548a66038a77415e1df51118625e832f \ " -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ +SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ + file://0001-wayland-info-Fix-build-without-libdrm.patch \ " -SRC_URI[sha256sum] = "64fecc4c58e87ae9b302901abe10c2e8af69c7503c221a96ecd0700e0aa268c0" +SRC_URI[sha256sum] = "9e685863025b4feade36d53bbc8e31b43e26498be743dea84c7a84912959410a" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
Signature · 1 line
2.30.2
PATCH 10/23 libxft: update 2.3.4 -> 2.3.6
In reply to Alexander Kanavin---
.../xorg-lib/{libxft_2.3.4.bb => libxft_2.3.6.bb} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
rename meta/recipes-graphics/xorg-lib/{libxft_2.3.4.bb => libxft_2.3.6.bb} (90%)meta/recipes-graphics/xorg-lib/libxft_2.3.6.bb renamed from meta/recipes-graphics/xorg-lib/libxft_2.3.4.bb +2 -1
@@ -20,7 +20,8 @@ PROVIDES = "xft" PE = "1" -SRC_URI[sha256sum] = "57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd" +XORG_EXT = "tar.xz" +SRC_URI[sha256sum] = "60a6e7319fc938bbb8d098c9bcc86031cc2327b5d086d3335fc5c76323c03022" XORG_PN = "libXft"
Signature · 1 line
2.30.2
PATCH 11/23 pinentry: update 1.2.0 -> 1.2.1
In reply to Alexander Kanavinlibcap support dropped upstream.
---
meta/lib/oeqa/selftest/cases/oescripts.py | 9 ++++-----
.../gpg-error_pkconf.patch | 13 +++++++------
.../libassuan_pkgconf.patch | 0
.../{pinentry_1.2.0.bb => pinentry_1.2.1.bb} | 5 ++---
4 files changed, 13 insertions(+), 14 deletions(-)
rename meta/recipes-support/pinentry/{pinentry-1.2.0 => pinentry-1.2.1}/gpg-error_pkconf.patch (95%)
rename meta/recipes-support/pinentry/{pinentry-1.2.0 => pinentry-1.2.1}/libassuan_pkgconf.patch (100%)
rename meta/recipes-support/pinentry/{pinentry_1.2.0.bb => pinentry_1.2.1.bb} (87%)meta/lib/oeqa/selftest/cases/oescripts.py +4 -5
@@ -148,7 +148,7 @@ class OEListPackageconfigTests(OEScriptTests): results = runCmd('%s/contrib/list-packageconfig-flags.py' % self.scripts_dir) expected_endlines = [] expected_endlines.append("RECIPE NAME PACKAGECONFIG FLAGS") - expected_endlines.append("pinentry gtk2 libcap ncurses qt secret") + expected_endlines.append("pinentry gtk2 ncurses qt secret") expected_endlines.append("tar acl selinux") self.check_endlines(results, expected_endlines)
@@ -166,11 +166,10 @@ class OEListPackageconfigTests(OEScriptTests): def test_packageconfig_flags_option_all(self): results = runCmd('%s/contrib/list-packageconfig-flags.py -a' % self.scripts_dir) expected_endlines = [] - expected_endlines.append("pinentry-1.2.0") - expected_endlines.append("PACKAGECONFIG ncurses libcap") + expected_endlines.append("pinentry-1.2.1") + expected_endlines.append("PACKAGECONFIG ncurses") expected_endlines.append("PACKAGECONFIG[qt] --enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase") expected_endlines.append("PACKAGECONFIG[gtk2] --enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0") - expected_endlines.append("PACKAGECONFIG[libcap] --with-libcap, --without-libcap, libcap") expected_endlines.append("PACKAGECONFIG[ncurses] --enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses") expected_endlines.append("PACKAGECONFIG[secret] --enable-libsecret, --disable-libsecret, libsecret")
@@ -180,7 +179,7 @@ class OEListPackageconfigTests(OEScriptTests): results = runCmd('%s/contrib/list-packageconfig-flags.py -p' % self.scripts_dir) expected_endlines = [] expected_endlines.append("RECIPE NAME PACKAGECONFIG FLAGS") - expected_endlines.append("pinentry gtk2 libcap ncurses qt secret") + expected_endlines.append("pinentry gtk2 ncurses qt secret") self.check_endlines(results, expected_endlines)
meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch renamed from meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch +7 -6
@@ -1,4 +1,4 @@ -From 54a4c9d3e5f1897ed4b978d5cdee646ca7a4f637 Mon Sep 17 00:00:00 2001 +From 785777dc0bc6b69ff68c91547ec6b6634049662f Mon Sep 17 00:00:00 2001 From: Armin Kuster <[email protected]> Date: Fri, 2 Sep 2005 11:50:01 +0000 Subject: [PATCH] Add gtk+, avahi, dbus-0.34 (.36 coming soon) and
@@ -11,14 +11,14 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster <[email protected]> --- - m4/gpg-error.m4 | 159 ++---------------------------------------------- - 1 file changed, 4 insertions(+), 155 deletions(-) + m4/gpg-error.m4 | 160 ++---------------------------------------------- + 1 file changed, 4 insertions(+), 156 deletions(-) diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 -index 56a5d07..c0bec1f 100644 +index 4b5cd40..7dfbb83 100644 --- a/m4/gpg-error.m4 +++ b/m4/gpg-error.m4 -@@ -26,159 +26,12 @@ dnl config script does not match the host specification the script +@@ -26,160 +26,12 @@ dnl config script does not match the host specification the script dnl is added to the gpg_config_script_warn variable. dnl AC_DEFUN([AM_PATH_GPG_ERROR],
@@ -135,6 +135,7 @@ index 56a5d07..c0bec1f 100644 - fi - elif test "$GPG_ERROR_CONFIG" != "no"; then - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` +- unset GPGRT_CONFIG - fi - if test "$GPG_ERROR_CONFIG" != "no"; then - req_major=`echo $min_gpg_error_version | \
@@ -182,7 +183,7 @@ index 56a5d07..c0bec1f 100644 if test x"$gpg_error_config_host" != xnone ; then if test x"$gpg_error_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -193,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], +@@ -194,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], fi fi else
meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch renamed from meta/recipes-support/pinentry/pinentry-1.2.0/libassuan_pkgconf.patch +0 -0
meta/recipes-support/pinentry/pinentry_1.2.1.bb renamed from meta/recipes-support/pinentry/pinentry_1.2.0.bb +2 -3
@@ -16,14 +16,13 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://gpg-error_pkconf.patch \ " -SRC_URI[sha256sum] = "10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470" +SRC_URI[sha256sum] = "457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067" inherit autotools pkgconfig -PACKAGECONFIG ??= "ncurses libcap" +PACKAGECONFIG ??= "ncurses" PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses" -PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0"
Signature · 1 line
2.30.2
PATCH 12/23 ovmf: upgrade edk2-stable202205 -> edk2-stable202208
In reply to Alexander Kanavin--- meta/recipes-core/ovmf/ovmf_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/ovmf/ovmf_git.bb +2 -2
@@ -26,8 +26,8 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://0006-reproducible.patch \ " -PV = "edk2-stable202205" -SRCREV = "16779ede2d366bfc6b702e817356ccf43425bcc8" +PV = "edk2-stable202208" +SRCREV = "ba0e0e4c6a174b71b18ccd6e47319cc45878893c" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" inherit deploy
Signature · 1 line
2.30.2
PATCH 13/23 cmake: update 3.24.0 -> 3.24.2
In reply to Alexander Kanavin---
.../cmake/{cmake-native_3.24.0.bb => cmake-native_3.24.2.bb} | 0
meta/recipes-devtools/cmake/cmake.inc | 2 +-
.../recipes-devtools/cmake/{cmake_3.24.0.bb => cmake_3.24.2.bb} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/cmake/{cmake-native_3.24.0.bb => cmake-native_3.24.2.bb} (100%)
rename meta/recipes-devtools/cmake/{cmake_3.24.0.bb => cmake_3.24.2.bb} (100%)meta/recipes-devtools/cmake/cmake-native_3.24.2.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.24.0.bb +0 -0
meta/recipes-devtools/cmake/cmake.inc +1 -1
@@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "c2b61f7cdecb1576cad25f918a8f42b8685d88a832fd4b62b9e0fa32e915a658" +SRC_URI[sha256sum] = "0d9020f06f3ddf17fb537dc228e1a56c927ee506b486f55fe2dc19f69bf0c8db" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/cmake/cmake_3.24.2.bb renamed from meta/recipes-devtools/cmake/cmake_3.24.0.bb +0 -0
Signature · 1 line
2.30.2
PATCH 14/23 jquery: upgrade 3.6.0 -> 3.6.1
In reply to Alexander Kanavin---
.../jquery/{jquery_3.6.0.bb => jquery_3.6.1.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/jquery/{jquery_3.6.0.bb => jquery_3.6.1.bb} (81%)meta/recipes-devtools/jquery/jquery_3.6.1.bb renamed from meta/recipes-devtools/jquery/jquery_3.6.0.bb +3 -3
@@ -13,9 +13,9 @@ SRC_URI = "\ https://code.jquery.com/${BP}.min.map;name=map;subdir=${BP} \ " -SRC_URI[js.sha256sum] = "1fe2bb5390a75e5d61e72c107cab528fc3c29a837d69aab7d200e1dbb5dcd239" -SRC_URI[min.sha256sum] = "ff1523fb7389539c84c65aba19260648793bb4f5e29329d2ee8804bc37a3fe6e" -SRC_URI[map.sha256sum] = "399548fb0e7b146c12f5ba18099a47d594a970fee96212eee0ab4852f3e56782" +SRC_URI[js.sha256sum] = "df3941e6cdaec28533ad72b7053ec05f7172be88ecada345c42736bc2ffba4d2" +SRC_URI[min.sha256sum] = "a3cf00c109d907e543bc4f6dbc85eb31068f94515251347e9e57509b52ee3d74" +SRC_URI[map.sha256sum] = "856ee620cebac56e872d6e99b09de05f81ccd3f3dc346e9b55eb694611a6d5e1" UPSTREAM_CHECK_REGEX = "jquery-(?P<pver>\d+(\.\d+)+)\.js"
Signature · 1 line
2.30.2
PATCH 15/23 python3-dbus: upgrade 1.2.18 -> 1.3.2
In reply to Alexander KanavinConvert to meson.
License-Update: clarifications about https://reuse.software/ compliancy
---
...{python3-dbus_1.2.18.bb => python3-dbus_1.3.2.bb} | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
rename meta/recipes-devtools/python/{python3-dbus_1.2.18.bb => python3-dbus_1.3.2.bb} (56%)meta/recipes-devtools/python/python3-dbus_1.3.2.bb renamed from meta/recipes-devtools/python/python3-dbus_1.2.18.bb +5 -7
@@ -2,21 +2,19 @@ SUMMARY = "Python bindings for the DBus inter-process communication system" SECTION = "devel/python" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=b03240518994df6d8c974675675e5ca4" +LIC_FILES_CHKSUM = "file://COPYING;md5=97f58951300aa52a9f9e3a62bd5c846c" DEPENDS = "expat dbus glib-2.0 virtual/libintl" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" -SRC_URI[sha256sum] = "92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260" +SRC_URI[sha256sum] = "ad67819308618b5069537be237f8e68ca1c7fcc95ee4a121fe6845b1418248f8" S = "${WORKDIR}/dbus-python-${PV}" -inherit setuptools3-base autotools pkgconfig - -# documentation needs python3-sphinx, which is not in oe-core or meta-python for now -# change to use PACKAGECONFIG when python3-sphinx is added to oe-core -EXTRA_OECONF += "--disable-documentation" +inherit setuptools3-base meson pkgconfig +# requires dbus-run-session +EXTRA_OEMESON += "-Dtests=false" RDEPENDS:${PN} = "python3-io python3-logging python3-stringold python3-threading python3-xml"
Signature · 1 line
2.30.2
PATCH 16/23 python3-hatch-fancy-pypi-readme: add a recipe
In reply to Alexander KanavinThis is a new dependency of python3-jsonschema.
--- meta/conf/distro/include/maintainers.inc | 1 + .../python3-hatch-fancy-pypi-readme_22.7.0.bb | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-hatch-fancy-pypi-readme_22.7.0.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -613,6 +613,7 @@ RECIPE_MAINTAINER:pn-python3-flit-core = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-git = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER:pn-python3-gitdb = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER:pn-python3-hatchling = "Ross Burton <[email protected]>" +RECIPE_MAINTAINER:pn-python3-hatch-fancy-pypi-readme = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-python3-hatch-vcs = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-python3-hypothesis = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-idna = "Bruce Ashfield <[email protected]>"
meta/recipes-devtools/python/python3-hatch-fancy-pypi-readme_22.7.0.bb new file +14 -0
@@ -0,0 +1,14 @@ +SUMMARY = "Hatch plugin for fancy PyPI readmes " +HOMEPAGE = "https://pypi.org/project/hatch-fancy-pypi-readme/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ba5633c60bd3e243091013aa83b4d807" + +inherit pypi python_hatchling + +PYPI_PACKAGE = "hatch_fancy_pypi_readme" + +SRC_URI[sha256sum] = "dedf2ba0b81a2975abb1deee9310b2eb85d22380fda0d52869e760b5435aa596" + +BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_REGEX = "/hatch-fancy-pypi-readme/(?P<pver>(\d+[\.\-_]*)+)/"
Signature · 1 line
2.30.2
PATCH 17/23 python3-jsonschema: upgrade 4.9.1 -> 4.16.0
In reply to Alexander Kanavin---
...thon3-jsonschema_4.9.1.bb => python3-jsonschema_4.16.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-jsonschema_4.9.1.bb => python3-jsonschema_4.16.0.bb} (87%)meta/recipes-devtools/python/python3-jsonschema_4.16.0.bb renamed from meta/recipes-devtools/python/python3-jsonschema_4.9.1.bb +2 -2
@@ -4,14 +4,14 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8 \ file://json/LICENSE;md5=9d4de43111d33570c8fe49b4cb0e01af" -SRC_URI[sha256sum] = "408c4c8ed0dede3b268f7a441784f74206380b04f93eb2d537c7befb3df3099f" +SRC_URI[sha256sum] = "165059f076eff6971bae5b742fc029a7b4ef3f9bcf04c14e4776a7605de14b23" inherit pypi python_hatchling PACKAGES =+ "${PN}-tests" FILES:${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/jsonschema/tests" -DEPENDS += "${PYTHON_PN}-hatch-vcs-native" +DEPENDS += "${PYTHON_PN}-hatch-fancy-pypi-readme-native ${PYTHON_PN}-hatch-vcs-native " PACKAGECONFIG ??= "format" PACKAGECONFIG[format] = ",,,\
Signature · 1 line
2.30.2
PATCH 18/23 shadow: update 4.12.1 -> 4.12.3
In reply to Alexander Kanavin---
meta/recipes-extended/shadow/shadow.inc | 2 +-
.../shadow/{shadow_4.12.1.bb => shadow_4.12.3.bb} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/shadow/{shadow_4.12.1.bb => shadow_4.12.3.bb} (100%)meta/recipes-extended/shadow/shadow.inc +1 -1
@@ -30,7 +30,7 @@ SRC_URI:append:class-native = " \ SRC_URI:append:class-nativesdk = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ " -SRC_URI[sha256sum] = "9fdb73b5d2b44e8ba9fcee1b4493ac75dd5040bda35b9ac8b06570cd192e7ee3" +SRC_URI[sha256sum] = "f525154adc5605e4ebf03d3e7ee8be4d7f3c7cf9df2c2244043406b6eefca2da" # Additional Policy files for PAM
meta/recipes-extended/shadow/shadow_4.12.3.bb renamed from meta/recipes-extended/shadow/shadow_4.12.1.bb +0 -0
Signature · 1 line
2.30.2
PATCH 19/23 lttng-modules: upgrade 2.13.4 -> 2.13.5
In reply to Alexander Kanavin---
.../lttng-modules/0001-fix-compaction.patch | 68 ----------
...c-fix-tracepoint-mm_page_alloc_zone_.patch | 106 ---------------
...oduce-kfree_skb_reason-v5.15.58.v5.1.patch | 53 --------
...ags-parameter-from-aops-write_begin-.patch | 76 -----------
...Fix-type-of-cpu-in-trace-event-v5.19.patch | 124 ------------------
...ules_2.13.4.bb => lttng-modules_2.13.5.bb} | 7 +-
6 files changed, 1 insertion(+), 433 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-compaction.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch
rename meta/recipes-kernel/lttng/{lttng-modules_2.13.4.bb => lttng-modules_2.13.5.bb} (76%)meta/recipes-kernel/lttng/lttng-modules/0001-fix-compaction.patch deleted +0 -68
@@ -1,68 +0,0 @@ -From 8e42c4821fb5f5cb816b6ddf73d9a13ba3298a63 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <[email protected]> -Date: Wed, 10 Aug 2022 11:07:14 -0400 -Subject: [PATCH] fix: tie compaction probe build to CONFIG_COMPACTION - -The definition of 'struct compact_control' in 'mm/internal.h' depends on -CONFIG_COMPACTION being defined. Only build the compaction probe when -this configuration option is enabled. - -Thanks to Bruce Ashfield <[email protected]> for reporting this -issue. - -Upstream-Status: Backport [https://review.lttng.org/c/lttng-modules/+/8660] - -Change-Id: I81e77aa9c1bf10452c152d432fe5224df0db42c9 -Signed-off-by: Michael Jeanson <[email protected]> ---- - src/probes/Kbuild | 34 ++++++++++++++++++---------------- - 1 file changed, 18 insertions(+), 16 deletions(-) - -diff --git a/src/probes/Kbuild b/src/probes/Kbuild -index 2908cf75..3e556b8e 100644 ---- a/src/probes/Kbuild -+++ b/src/probes/Kbuild -@@ -167,22 +167,24 @@ ifneq ($(CONFIG_BTRFS_FS),) - endif # $(wildcard $(btrfs_dep)) - endif # CONFIG_BTRFS_FS - --# A dependency on internal header 'mm/internal.h' was introduced in v5.18 --compaction_dep = $(srctree)/mm/internal.h --compaction_dep_wildcard = $(wildcard $(compaction_dep)) --compaction_dep_check = $(shell \ --if [ \( $(VERSION) -ge 6 \ -- -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \ -- -z "$(compaction_dep_wildcard)" ] ; then \ -- echo "warn" ; \ --else \ -- echo "ok" ; \ --fi ;) --ifeq ($(compaction_dep_check),ok) -- obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o --else -- $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.) --endif # $(wildcard $(compaction_dep)) -+ifneq ($(CONFIG_COMPACTION),) -+ # A dependency on internal header 'mm/internal.h' was introduced in v5.18 -+ compaction_dep = $(srctree)/mm/internal.h -+ compaction_dep_wildcard = $(wildcard $(compaction_dep)) -+ compaction_dep_check = $(shell \ -+ if [ \( $(VERSION) -ge 6 \ -+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \ -+ -z "$(compaction_dep_wildcard)" ] ; then \ -+ echo "warn" ; \ -+ else \ -+ echo "ok" ; \ -+ fi ;) -+ ifeq ($(compaction_dep_check),ok) -+ obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o -+ else -+ $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.) -+ endif # $(wildcard $(compaction_dep)) -+endif # CONFIG_COMPACTION - - ifneq ($(CONFIG_EXT4_FS),) - ext4_dep = $(srctree)/fs/ext4/*.h --- -2.34.1 -
meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch deleted +0 -106
106 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch deleted +0 -53
53 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch deleted +0 -76
76 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch deleted +0 -124
124 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules_2.13.5.bb renamed from meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb +1 -6
@@ -11,17 +11,12 @@ include lttng-platforms.inc SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0009-Rename-genhd-wrapper-to-blkdev.patch \ - file://0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch \ - file://0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch \ - file://0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch \ - file://0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch \ - file://0001-fix-compaction.patch \ " # Use :append here so that the patch is applied also when using devupstream SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" -SRC_URI[sha256sum] = "6159d00e4e1d59546eec8d4a67e1aa39c1084ceb5e5afeb666eab4b8a5b5a9ee" +SRC_URI[sha256sum] = "eceb3428d80e85a9f008425beb9526195c9f7f02b302f28add56df53aef3e708" export INSTALL_MOD_DIR="kernel/lttng-modules"
Signature · 1 line
2.30.2
PATCH 20/23 libsoup: upgrade 3.0.7 -> 3.2.0
In reply to Alexander Kanavin---
.../libsoup/{libsoup_3.0.7.bb => libsoup_3.2.0.bb} | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
rename meta/recipes-support/libsoup/{libsoup_3.0.7.bb => libsoup_3.2.0.bb} (87%)meta/recipes-support/libsoup/libsoup_3.2.0.bb renamed from meta/recipes-support/libsoup/libsoup_3.0.7.bb +5 -3
@@ -12,14 +12,14 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl nghttp2" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" -SRC_URI[sha256sum] = "ebdf90cf3599c11acbb6818a9d9e3fc9d2c68e56eb829b93962972683e1bf7c8" +SRC_URI[sha256sum] = "2832370698ca8f9fbf174c345b73d89b60561103a626c2df70726b0707f79bd3" PROVIDES = "libsoup-3.0" CVE_PRODUCT = "libsoup" S = "${WORKDIR}/libsoup-${PV}" -inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc +inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gi-docgen GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled'
@@ -30,7 +30,9 @@ PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5" EXTRA_OEMESON:append = " -Dvapi=disabled -Dtls_check=false" -GTKDOC_MESON_OPTION = "gtk_doc" +GIDOCGEN_MESON_OPTION = 'docs' +GIDOCGEN_MESON_ENABLE_FLAG = 'enabled' +GIDOCGEN_MESON_DISABLE_FLAG = 'disabled' # When built without gnome support, libsoup will contain only one shared lib # and will therefore become subject to renaming by debian.bbclass. Prevent
Signature · 1 line
2.30.2
PATCH 21/23 libxslt: upgrade 1.1.35 -> 1.1.37
In reply to Alexander KanavinDrop the no longer supported option.
---
.../libxslt/{libxslt_1.1.35.bb => libxslt_1.1.37.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/libxslt/{libxslt_1.1.35.bb => libxslt_1.1.37.bb} (93%)meta/recipes-support/libxslt/libxslt_1.1.37.bb renamed from meta/recipes-support/libxslt/libxslt_1.1.35.bb +2 -2
@@ -15,7 +15,7 @@ DEPENDS = "libxml2" SRC_URI = "https://download.gnome.org/sources/libxslt/1.1/libxslt-${PV}.tar.xz" -SRC_URI[sha256sum] = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79" +SRC_URI[sha256sum] = "3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4" UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar"
@@ -39,7 +39,7 @@ do_configure:prepend () { touch ${S}/doc/xsltproc.1 } -EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto --with-html-subdir=${BPN}" +EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" # older versions of this recipe had ${PN}-utils RPROVIDES:${PN}-bin += "${PN}-utils" RCONFLICTS:${PN}-bin += "${PN}-utils"
Signature · 1 line
2.30.2
PATCH 22/23 quilt: backport a patch to address grep 3.8 failures
In reply to Alexander Kanavin--- meta/recipes-devtools/quilt/quilt.inc | 1 + .../quilt/quilt/fix-grep-3.8.patch | 144 ++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch
meta/recipes-devtools/quilt/quilt.inc +1 -0
@@ -12,6 +12,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ file://Makefile \ file://test.sh \ file://0001-tests-Allow-different-output-from-mv.patch \ + file://fix-grep-3.8.patch \ " SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch"
meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch new file +144 -0
144 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH 23/23 python3: update 3.10.6 -> 3.11.0
In reply to Alexander KanavinThe semaphore fix has landed and is available from 3.11 onwards:
https://github.com/python/cpython/commit/1ee0f94d16f150356a4b9b0a39d44ba1d2d5b9fc
Drop 0001-Mitigate-the-race-condition-in-testSockName.patch as it is merged upstream.
---
meta/classes-recipe/python3-dir.bbclass | 2 +-
...ib-termcap-to-linker-flags-to-avoid-.patch | 8 ++--
...-search-system-for-headers-libraries.patch | 6 +--
...-use-prefix-value-from-build-configu.patch | 14 +++---
...e-the-race-condition-in-testSockName.patch | 47 -------------------
...sts-due-to-load-variability-on-YP-AB.patch | 18 +++----
...FLAG_REF-always-for-interned-strings.patch | 33 -------------
...-detection-of-mips-architecture-for-.patch | 33 ++++++++++---
...fig-append-STAGING_LIBDIR-python-sys.patch | 6 +--
...asename-to-replace-CC-for-checking-c.patch | 44 ++++++++---------
...tutils-prefix-is-inside-staging-area.patch | 10 ++--
.../python3/avoid_warning_about_tkinter.patch | 21 ++++-----
.../python/python3/crosspythonpath.patch | 22 ++++-----
.../python/python3/makerace.patch | 10 ++--
.../{python3_3.10.6.bb => python3_3.11.0.bb} | 11 ++---
15 files changed, 111 insertions(+), 174 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patch
delete mode 100644 meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch
rename meta/recipes-devtools/python/{python3_3.10.6.bb => python3_3.11.0.bb} (98%)meta/classes-recipe/python3-dir.bbclass +1 -1
@@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -PYTHON_BASEVERSION = "3.10" +PYTHON_BASEVERSION = "3.11" PYTHON_ABI = "" PYTHON_DIR = "python${PYTHON_BASEVERSION}" PYTHON_PN = "python3"
meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch +4 -4
@@ -1,4 +1,4 @@ -From 80f872e4573f542d33f91514538755557d566f79 Mon Sep 17 00:00:00 2001 +From 93ae2ed3fc8be0245e35063c4f63626792f4cd0c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 25 Jan 2019 19:04:13 +0100 Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoid host
@@ -12,14 +12,14 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py -index 43e807f..11b5cf5 100644 +index 15d0d45..37ed244 100644 --- a/setup.py +++ b/setup.py -@@ -1149,7 +1149,6 @@ class PyBuildExt(build_ext): +@@ -1109,7 +1109,6 @@ class PyBuildExt(build_ext): 'termcap'): readline_libs.append('termcap') self.add(Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, libraries=readline_libs)) else: + self.missing.append('readline')
meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch +3 -3
@@ -1,4 +1,4 @@ -From 7589ab03ad3f7cb4bb092c31273ff22371ac77e4 Mon Sep 17 00:00:00 2001 +From 910a905aaeb6edb6b042ef65b3e2b73faada80aa Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <[email protected]> Date: Wed, 4 Mar 2020 00:06:42 +0000 Subject: [PATCH] Don't search system for headers/libraries
@@ -11,10 +11,10 @@ Signed-off-by: Jeremy Puhlman <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index c3a6b5e..c892537 100644 +index f29ac86..930cb20 100644 --- a/setup.py +++ b/setup.py -@@ -856,8 +856,8 @@ class PyBuildExt(build_ext): +@@ -877,8 +877,8 @@ class PyBuildExt(build_ext): add_dir_to_list(self.compiler.include_dirs, sysconfig.get_config_var("INCLUDEDIR"))
meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch +7 -7
@@ -1,4 +1,4 @@ -From d82cb96eed1098920ad3cdcb36feb32137618066 Mon Sep 17 00:00:00 2001 +From 05d676ddf675d9c8229b723e64717aa485d6809e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 10 Sep 2021 12:28:31 +0200 Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration
@@ -15,11 +15,11 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 5 insertions(+) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index e64bcdc..40c6b3e 100644 +index 93c6f73..ff399e2 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -613,6 +613,11 @@ def get_config_vars(*args): - _init_non_posix(_CONFIG_VARS) +@@ -668,6 +668,11 @@ def get_config_vars(*args): + _CONFIG_VARS['VPATH'] = sys._vpath if os.name == 'posix': _init_posix(_CONFIG_VARS) + _CONFIG_VARS['installed_base'] = _CONFIG_VARS['prefix']
@@ -27,6 +27,6 @@ index e64bcdc..40c6b3e 100644 + _CONFIG_VARS['installed_platbase'] = _CONFIG_VARS['prefix'] + _CONFIG_VARS['platbase'] = _CONFIG_VARS['prefix'] + _CONFIG_VARS['platlibdir'] = _CONFIG_VARS['PLATLIBDIR'] - # For backward compatibility, see issue19555 - SO = _CONFIG_VARS.get('EXT_SUFFIX') - if SO is not None: + if _HAS_USER_BASE: + # Setting 'userbase' is done below the call to the + # init function to enable using 'get_config_var' in
meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patch deleted +0 -47
47 lines not on this page · raw message
meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch +9 -9
@@ -1,4 +1,4 @@ -From 7171aeee22a0b7ab57cdf3d1ae15530549f8f92a Mon Sep 17 00:00:00 2001 +From 01e02fb4720ecbbc44c694ee1b7fb6d5d95b5fe2 Mon Sep 17 00:00:00 2001 From: Yi Fan Yu <[email protected]> Date: Thu, 1 Apr 2021 13:08:37 -0700 Subject: [PATCH] Skip failing tests due to load variability on YP AB
@@ -17,10 +17,10 @@ Signed-off-by: Yi Fan Yu <[email protected]> 2 files changed, 3 insertions(+) diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py -index 3bc5b8f..a6e106d 100644 +index 599c3f2..23328be 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py -@@ -568,6 +568,7 @@ class _TestProcess(BaseTestCase): +@@ -618,6 +618,7 @@ class _TestProcess(BaseTestCase): close_queue(q)
@@ -28,7 +28,7 @@ index 3bc5b8f..a6e106d 100644 def test_many_processes(self): if self.TYPE == 'threads': self.skipTest('test not appropriate for {}'.format(self.TYPE)) -@@ -4817,6 +4818,7 @@ class TestWait(unittest.TestCase): +@@ -4890,6 +4891,7 @@ class TestWait(unittest.TestCase): sem.release() time.sleep(period)
@@ -37,13 +37,13 @@ index 3bc5b8f..a6e106d 100644 from multiprocessing.connection import wait diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py -index 875615a..aebaa8c 100644 +index 884b142..542e980 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py -@@ -474,6 +474,7 @@ class TimeTestCase(unittest.TestCase): - def test_perf_counter(self): - time.perf_counter() - +@@ -492,6 +492,7 @@ class TimeTestCase(unittest.TestCase): + @unittest.skipIf( + support.is_wasi, "process_time not available on WASI" + ) + @unittest.skip('timing related test, dependent on load') def test_process_time(self): # process_time() should not include time spend during a sleep
meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From d7217b79a4e125d4fcc1087743171b94d91d1121 Mon Sep 17 00:00:00 2001 -From: Inada Naoki <[email protected]> -Date: Sat, 14 Jul 2018 00:46:11 +0900 -Subject: [PATCH] Use FLAG_REF always for interned strings - -Upstream-Status: Submitted [https://github.com/python/cpython/pull/8226] -Signed-off-by: Joshua Watt <[email protected]> - ---- - Python/marshal.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/Python/marshal.c b/Python/marshal.c -index 4125240..341c9aa 100644 ---- a/Python/marshal.c -+++ b/Python/marshal.c -@@ -298,9 +298,14 @@ w_ref(PyObject *v, char *flag, WFILE *p) - if (p->version < 3 || p->hashtable == NULL) - return 0; /* not writing object references */ - -- /* if it has only one reference, it definitely isn't shared */ -- if (Py_REFCNT(v) == 1) -+ /* If it has only one reference, it definitely isn't shared. -+ * But we use TYPE_REF always for interned string, to PYC file stable -+ * as possible. -+ */ -+ if (Py_REFCNT(v) == 1 && -+ !(PyUnicode_CheckExact(v) && PyUnicode_CHECK_INTERNED(v))) { - return 0; -+ } - - entry = _Py_hashtable_get_entry(p->hashtable, v); - if (entry != NULL) {
meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch +27 -6
@@ -1,4 +1,4 @@ -From bb409432f03dd8256865292e382ad16613737829 Mon Sep 17 00:00:00 2001 +From d2abe7328cea770425405aa0da2f4c2dac89fcad Mon Sep 17 00:00:00 2001 From: Matthias Schoepfer <[email protected]> Date: Fri, 31 May 2019 15:34:34 +0200 Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft
@@ -15,19 +15,19 @@ Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196] Signed-off-by: Matthias Schoepfer <[email protected]> --- - configure.ac | 175 +++++++-------------------------------------------- - 1 file changed, 21 insertions(+), 154 deletions(-) + configure.ac | 196 ++++++--------------------------------------------- + 1 file changed, 21 insertions(+), 175 deletions(-) diff --git a/configure.ac b/configure.ac -index 4230ef2..ee08b1b 100644 +index 358b6ea..085fc0b 100644 --- a/configure.ac +++ b/configure.ac -@@ -718,160 +718,27 @@ then +@@ -907,181 +907,27 @@ then fi -AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) --cat >> conftest.c <<EOF +-cat > conftest.c <<EOF -#undef bfin -#undef cris -#undef fr30
@@ -167,6 +167,22 @@ index 4230ef2..ee08b1b 100644 - darwin -#elif defined(__VXWORKS__) - vxworks +-#elif defined(__wasm32__) +-# if defined(__EMSCRIPTEN__) +- wasm32-emscripten +-# elif defined(__wasi__) +- wasm32-wasi +-# else +-# error unknown wasm32 platform +-# endif +-#elif defined(__wasm64__) +-# if defined(__EMSCRIPTEN) +- wasm64-emscripten +-# elif defined(__wasi__) +- wasm64-wasi +-# else +-# error unknown wasm64 platform +-# endif -#else -# error unknown platform triplet -#endif
@@ -175,6 +191,11 @@ index 4230ef2..ee08b1b 100644 - -if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then - PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '` +- case "$build_os" in +- linux-musl*) +- PLATFORM_TRIPLET=`echo "$PLATFORM_TRIPLET" | sed 's/linux-gnu/linux-musl/'` +- ;; +- esac - AC_MSG_RESULT([$PLATFORM_TRIPLET]) -else - AC_MSG_RESULT([none])
meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +3 -3
@@ -1,4 +1,4 @@ -From c24674e0a52367359a1a3d950bab8bc3d282279b Mon Sep 17 00:00:00 2001 +From 9c6b9f46179c8f9c9391767e2b02f268a1ee7a9c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 31 Jan 2019 16:46:30 +0100 Subject: [PATCH] distutils/sysconfig: append
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 2 insertions(+) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 40c6b3e..ac94cc7 100644 +index ff399e2..95844cf 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -474,6 +474,8 @@ def _init_posix(vars): +@@ -528,6 +528,8 @@ def _init_posix(vars): """Initialize the module as appropriate for POSIX systems.""" # _sysconfigdata is generated at build time, see _generate_posix_vars() name = _get_sysconfigdata_name()
meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch +22 -22
104 lines not on this page · raw message
meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +5 -5
@@ -1,4 +1,4 @@ -From 1cc4cab8d579bbccb8a4fc13a28158a58c603cb4 Mon Sep 17 00:00:00 2001 +From 2918d431cb5607933755fc80a6220135dd7fcb1d Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes
@@ -18,10 +18,10 @@ Signed-off-by: Alejandro Hernandez <[email protected]> 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 3414a76..361d3a1 100644 +index 03b8558..57d193d 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py -@@ -277,7 +277,9 @@ def get_python_inc(plat_specific=0, prefix=None): +@@ -272,7 +272,9 @@ def get_python_inc(plat_specific=0, prefix=None): If 'prefix' is supplied, use it instead of sys.base_prefix or sys.base_exec_prefix -- i.e., ignore 'plat_specific'. """
@@ -32,7 +32,7 @@ index 3414a76..361d3a1 100644 prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX if os.name == "posix": if python_build: -@@ -320,7 +322,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): +@@ -315,7 +317,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): If 'prefix' is supplied, use it instead of sys.base_prefix or sys.base_exec_prefix -- i.e., ignore 'plat_specific'. """
@@ -47,7 +47,7 @@ index 3414a76..361d3a1 100644 if standard_lib: prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX else: -@@ -334,7 +342,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): +@@ -329,7 +337,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): else: # Pure Python libdir = "lib"
meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch +10 -11
@@ -1,4 +1,4 @@ -From 6a23d52c905cd1f6a5944255903ec86ea8b904bb Mon Sep 17 00:00:00 2001 +From 627b8fe6b3c11e8bb1bb1ad1d6b816b79b8dd2ce Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <[email protected]> Date: Mon, 28 Jan 2019 15:57:54 +0000 Subject: [PATCH] _tkinter module needs tk module along with tcl. tk is not yet
@@ -9,23 +9,22 @@ Upstream-Status: Inappropriate [distribution] Also simply disable the tk module since its not in DEPENDS. Signed-off-by: Andrei Gherzan <[email protected]> - --- - setup.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + setup.py | 1 - + 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py -index 11b5cf5..2be4738 100644 +index 7555dcd..f29ac86 100644 --- a/setup.py +++ b/setup.py -@@ -1895,8 +1895,8 @@ class PyBuildExt(build_ext): +@@ -1364,7 +1364,6 @@ class PyBuildExt(build_ext): self.detect_decimal() self.detect_ctypes() self.detect_multiprocessing() -- if not self.detect_tkinter(): -- self.missing.append('_tkinter') -+# if not self.detect_tkinter(): -+# self.missing.append('_tkinter') +- self.detect_tkinter() self.detect_uuid() - ## # Uncomment these lines if you want to play with xxmodule.c + # Uncomment the next line if you want to play with xxmodule.c +-- +2.30.2 +
meta/recipes-devtools/python/python3/crosspythonpath.patch +11 -11
@@ -1,4 +1,4 @@ -From baa3a232e64e9bf5ae945366efdb8088ccf9b828 Mon Sep 17 00:00:00 2001 +From 7d5fc6a86103d9bd4a274e9fd31b6987e39998a1 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda <[email protected]> Date: Tue, 18 Nov 2014 03:35:33 -0500 Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for
@@ -20,15 +20,15 @@ Signed-off-by: Ricardo Ribalda <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d0db062..e5e3df8 100644 +index 085fc0b..22790d7 100644 --- a/configure.ac +++ b/configure.ac -@@ -83,7 +83,7 @@ if test "$cross_compiling" = yes; then - AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) - fi - AC_MSG_RESULT($interp) -- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp -+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp - fi - elif test "$cross_compiling" = maybe; then - AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) +@@ -163,7 +163,7 @@ AC_ARG_WITH( + dnl Build Python interpreter is used for regeneration and freezing. + ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python + PYTHON_FOR_FREEZE="$with_build_python" +- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python ++ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python + AC_MSG_RESULT([$with_build_python]) + ], [ + AS_VAR_IF([cross_compiling], [yes],
meta/recipes-devtools/python/python3/makerace.patch +5 -5
@@ -1,4 +1,4 @@ -From 7cc02dfa593d1350a689d64a7a6f2dc6478afe24 Mon Sep 17 00:00:00 2001 +From 4f52aaf2a548b3356c6f1369c62b11335dc27464 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Tue, 13 Jul 2021 23:19:29 +0100 Subject: [PATCH] python3: Fix make race
@@ -18,15 +18,15 @@ Signed-off-by: Richard Purdie <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5e13ba2..026bffd 100644 +index 7558f0c..8cec819 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1527,7 +1527,7 @@ TESTSUBDIRS= ctypes/test \ +@@ -2005,7 +2005,7 @@ TESTSUBDIRS= ctypes/test \ unittest/test unittest/test/testmock TEST_MODULES=@TEST_MODULES@ --libinstall: build_all $(srcdir)/Modules/xxmodule.c -+libinstall: build_all $(srcdir)/Modules/xxmodule.c libainstall +-libinstall: all $(srcdir)/Modules/xxmodule.c ++libinstall: all $(srcdir)/Modules/xxmodule.c libainstall @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ if test ! -d $(DESTDIR)$$i; then \
meta/recipes-devtools/python/python3_3.11.0.bb renamed from meta/recipes-devtools/python/python3_3.10.6.bb +4 -7
@@ -22,7 +22,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \ file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \ file://crosspythonpath.patch \ - file://0001-Use-FLAG_REF-always-for-interned-strings.patch \ file://0001-test_locale.py-correct-the-test-output-format.patch \ file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \
@@ -35,7 +34,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch \ file://deterministic_imports.patch \ file://0001-Avoid-shebang-overflow-on-python-config.py.patch \ - file://0001-Mitigate-the-race-condition-in-testSockName.patch \ " SRC_URI:append:class-native = " \
@@ -44,7 +42,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] = "f795ff87d11d4b0c7c33bc8851b0c28648d8a4583aa2100a98c22b4326b6d3f3" +SRC_URI[sha256sum] = "a57dc82d77358617ba65b9841cee1e3b441f386c3789ddc0676eca077f2951c3" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
@@ -62,7 +60,7 @@ CVE_CHECK_IGNORE += "CVE-2020-15523 CVE-2022-26488" # The module will be removed in the future and flaws documented. CVE_CHECK_IGNORE += "CVE-2015-20107" -PYTHON_MAJMIN = "3.10" +PYTHON_MAJMIN = "3.11" S = "${WORKDIR}/Python-${PV}"
@@ -81,11 +79,10 @@ DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/li DEPENDS:append:class-target = " python3-native" DEPENDS:append:class-nativesdk = " python3-native" -# force to use the mutex+cond implementation (https://bugs.python.org/issue41710) -CFLAGS += "-DHAVE_BROKEN_POSIX_SEMAPHORES" - EXTRA_OECONF = " --without-ensurepip --enable-shared --with-platlibdir=${baselib}" EXTRA_OECONF:append:class-native = " --bindir=${bindir}/${PN}" +EXTRA_OECONF:append:class-target = " --with-build-python=nativepython3" +EXTRA_OECONF:append:class-nativesdk = " --with-build-python=nativepython3" export CROSSPYTHONPATH="${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/"
Signature · 1 line
2.30.2
Re: [OE-core] [PATCH 23/23] python3: update 3.10.6 -> 3.11.0
Yes please. I will help with any breakage on the AB. Thank you Alex!
Quoted 805 lines · Alexander Kanavin
The semaphore fix has landed and is available from 3.11 onwards:
https://github.com/python/cpython/commit/1ee0f94d16f150356a4b9b0a39d44ba1d2d5b9fc
Drop 0001-Mitigate-the-race-condition-in-testSockName.patch as it is merged upstream.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/classes-recipe/python3-dir.bbclass | 2 +- ...ib-termcap-to-linker-flags-to-avoid-.patch | 8 ++-- ...-search-system-for-headers-libraries.patch | 6 +-- ...-use-prefix-value-from-build-configu.patch | 14 +++--- ...e-the-race-condition-in-testSockName.patch | 47 ------------------- ...sts-due-to-load-variability-on-YP-AB.patch | 18 +++---- ...FLAG_REF-always-for-interned-strings.patch | 33 ------------- ...-detection-of-mips-architecture-for-.patch | 33 ++++++++++--- ...fig-append-STAGING_LIBDIR-python-sys.patch | 6 +-- ...asename-to-replace-CC-for-checking-c.patch | 44 ++++++++--------- ...tutils-prefix-is-inside-staging-area.patch | 10 ++-- .../python3/avoid_warning_about_tkinter.patch | 21 ++++----- .../python/python3/crosspythonpath.patch | 22 ++++----- .../python/python3/makerace.patch | 10 ++-- .../{python3_3.10.6.bb => python3_3.11.0.bb} | 11 ++--- 15 files changed, 111 insertions(+), 174 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patch delete mode 100644 meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch rename meta/recipes-devtools/python/{python3_3.10.6.bb =>python3_3.11.0.bb} (98%)
meta/classes-recipe/python3-dir.bbclass +1
-1@@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -PYTHON_BASEVERSION = "3.10" +PYTHON_BASEVERSION = "3.11" PYTHON_ABI = "" PYTHON_DIR = "python${PYTHON_BASEVERSION}" PYTHON_PN = "python3"diff --git
a/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patchb/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patchindex62ef6efc28..16a4185704100644
---a/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch
+++b/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From 80f872e4573f542d33f91514538755557d566f79 Mon Sep 17 00:00:00 2001 +From 93ae2ed3fc8be0245e35063c4f63626792f4cd0c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 25 Jan 2019 19:04:13 +0100 Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoid host@@ -12,14 +12,14 @@ Signed-off-by: Alexander Kanavin <1 file changed, 1 deletion(-)diff --git
a/setup.pyb/setup.pymeta/classes-recipe/python3-dir.bbclass +3
-3-index 43e807f..11b5cf5 100644 +index 15d0d45..37ed244 100644 --- a/setup.py +++ b/setup.py -@@ -1149,7 +1149,6 @@ class PyBuildExt(build_ext): +@@ -1109,7 +1109,6 @@ class PyBuildExt(build_ext): 'termcap'): readline_libs.append('termcap') self.add(Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, libraries=readline_libs)) else: + self.missing.append('readline')diff --git
a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patchb/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patchindexc790c7b886..d6d9e451ff100644
---a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
+++b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patchmeta/classes-recipe/python3-dir.bbclass +3
-3@@ -1,4 +1,4 @@ -From 7589ab03ad3f7cb4bb092c31273ff22371ac77e4 Mon Sep 17 00:00:00 2001 +From 910a905aaeb6edb6b042ef65b3e2b73faada80aa Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <[email protected]> Date: Wed, 4 Mar 2020 00:06:42 +0000 Subject: [PATCH] Don't search system for headers/libraries@@ -11,10 +11,10 @@ Signed-off-by: Jeremy Puhlman <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index c3a6b5e..c892537 100644 +index f29ac86..930cb20 100644 --- a/setup.py +++ b/setup.py -@@ -856,8 +856,8 @@ class PyBuildExt(build_ext): +@@ -877,8 +877,8 @@ class PyBuildExt(build_ext): add_dir_to_list(self.compiler.include_dirs, sysconfig.get_config_var("INCLUDEDIR"))diff --git
a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patchb/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patchindex641017edd5..2f519e4917100644
---a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
+++b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From d82cb96eed1098920ad3cdcb36feb32137618066 Mon Sep 17 00:00:00 2001 +From 05d676ddf675d9c8229b723e64717aa485d6809e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 10 Sep 2021 12:28:31 +0200 Subject: [PATCH] Lib/sysconfig.py: use prefix value from buildconfiguration
meta/classes-recipe/python3-dir.bbclass +6
-6@@ -15,11 +15,11 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 5 insertions(+) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index e64bcdc..40c6b3e 100644 +index 93c6f73..ff399e2 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -613,6 +613,11 @@ def get_config_vars(*args): - _init_non_posix(_CONFIG_VARS) +@@ -668,6 +668,11 @@ def get_config_vars(*args): + _CONFIG_VARS['VPATH'] = sys._vpath if os.name == 'posix': _init_posix(_CONFIG_VARS) + _CONFIG_VARS['installed_base'] = _CONFIG_VARS['prefix']@@ -27,6 +27,6 @@ index e64bcdc..40c6b3e 100644 + _CONFIG_VARS['installed_platbase'] = _CONFIG_VARS['prefix'] + _CONFIG_VARS['platbase'] = _CONFIG_VARS['prefix'] + _CONFIG_VARS['platlibdir'] = _CONFIG_VARS['PLATLIBDIR'] - # For backward compatibility, see issue19555 - SO = _CONFIG_VARS.get('EXT_SUFFIX') - if SO is not None: + if _HAS_USER_BASE: + # Setting 'userbase' is done below the call to the + # init function to enable using 'get_config_var' indiff --git
a/meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patchb/meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patchdeleted file mode 100644
index e19df08f87..0000000000
---a/meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patch+++/dev/nullmeta/classes-recipe/python3-dir.bbclass +0
-30@@ -1,47 +0,0 @@ -Upstream-Status: Pending -Signed-off-by: Ross Burton <[email protected]> - -From 8103b90148e8768456c3ab707de105d63d9d5b20 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Fri, 17 Jun 2022 11:53:59 +0100 -Subject: [PATCH] Mitigate the race condition in testSockName - -find_unused_port() has an inherent race condition, but we can't use -bind_port() as that uses .getsockname() which this test is exercising. - -Try binding to unused ports a few times before failing. ---- - Lib/test/test_socket.py | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py -index c981903824..b1630d18b6 100644 ---- a/Lib/test/test_socket.py -+++ b/Lib/test/test_socket.py -@@ -1390,10 +1390,21 @@ def testStringToIPv6(self): - - def testSockName(self): - # Testing getsockname() -- port = socket_helper.find_unused_port() - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self.addCleanup(sock.close) -- sock.bind(("0.0.0.0", port)) -+ -+ # Since find_unused_port() is inherently subject to raceconditions, we
-+ # call it a couple times if necessary.
-+ for i initertools.count():
-+ port =socket_helper.find_unused_port()
-+ try:
-+sock.bind(("0.0.0.0", port))
-+ except OSError as e:
-+ if e.errno != errno.EADDRINUSE or i == 5:
-+ raise
-+ else:
-+ break
-+meta/classes-recipe/python3-dir.bbclass +0
-6- name = sock.getsockname() - # XXX(nnorwitz): http://tinyurl.com/os5jz seems to indicate - # it reasonable to get the host's addr in addition to 0.0.0.0. --- -2.25.1 -diff --git
a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patchb/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patchindex96c5a3c840..61dd4a5bc0100644
---a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch
+++b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From 7171aeee22a0b7ab57cdf3d1ae15530549f8f92a Mon Sep 17 00:00:00 2001 +From 01e02fb4720ecbbc44c694ee1b7fb6d5d95b5fe2 Mon Sep 17 00:00:00 2001 From: Yi Fan Yu <[email protected]> Date: Thu, 1 Apr 2021 13:08:37 -0700 Subject: [PATCH] Skip failing tests due to load variability on YP AB@@ -17,10 +17,10 @@ Signed-off-by: Yi Fan Yu <[email protected]> 2 files changed, 3 insertions(+) diff --git a/Lib/test/_test_multiprocessing.py
b/Lib/test/_test_multiprocessing.pymeta/classes-recipe/python3-dir.bbclass +8
-8-index 3bc5b8f..a6e106d 100644 +index 599c3f2..23328be 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py -@@ -568,6 +568,7 @@ class _TestProcess(BaseTestCase): +@@ -618,6 +618,7 @@ class _TestProcess(BaseTestCase): close_queue(q)@@ -28,7 +28,7 @@ index 3bc5b8f..a6e106d 100644 def test_many_processes(self): if self.TYPE == 'threads': self.skipTest('test not appropriate for {}'.format(self.TYPE)) -@@ -4817,6 +4818,7 @@ class TestWait(unittest.TestCase): +@@ -4890,6 +4891,7 @@ class TestWait(unittest.TestCase): sem.release() time.sleep(period)@@ -37,13 +37,13 @@ index 3bc5b8f..a6e106d 100644 from multiprocessing.connection import wait diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py -index 875615a..aebaa8c 100644 +index 884b142..542e980 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py -@@ -474,6 +474,7 @@ class TimeTestCase(unittest.TestCase): - def test_perf_counter(self): - time.perf_counter() - +@@ -492,6 +492,7 @@ class TimeTestCase(unittest.TestCase): + @unittest.skipIf( + support.is_wasi, "process_time not available on WASI" + ) + @unittest.skip('timing related test, dependent on load') def test_process_time(self): # process_time() should not include time spend during a sleepdiff --git
a/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patchb/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patchdeleted file mode 100644
index 993ac243fc..0000000000
---a/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch+++/dev/nullmeta/classes-recipe/python3-dir.bbclass +0
-33@@ -1,33 +0,0 @@ -From d7217b79a4e125d4fcc1087743171b94d91d1121 Mon Sep 17 00:00:00 2001 -From: Inada Naoki <[email protected]> -Date: Sat, 14 Jul 2018 00:46:11 +0900 -Subject: [PATCH] Use FLAG_REF always for interned strings - -Upstream-Status: Submitted [https://github.com/python/cpython/pull/8226] -Signed-off-by: Joshua Watt <[email protected]> - ---- - Python/marshal.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/Python/marshal.c b/Python/marshal.c -index 4125240..341c9aa 100644 ---- a/Python/marshal.c -+++ b/Python/marshal.c -@@ -298,9 +298,14 @@ w_ref(PyObject *v, char *flag, WFILE *p) - if (p->version < 3 || p->hashtable == NULL) - return 0; /* not writing object references */ - -- /* if it has only one reference, it definitely isn't shared */ -- if (Py_REFCNT(v) == 1) -+ /* If it has only one reference, it definitely isn't shared. -+ * But we use TYPE_REF always for interned string, to PYC file stable -+ * as possible. -+ */ -+ if (Py_REFCNT(v) == 1 && -+ !(PyUnicode_CheckExact(v) && PyUnicode_CHECK_INTERNED(v))) { - return 0; -+ } - - entry = _Py_hashtable_get_entry(p->hashtable, v); - if (entry != NULL) {diff --git
a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patchb/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patchindex6ab335a405..f303eb35dc100644
---a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
+++b/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From bb409432f03dd8256865292e382ad16613737829 Mon Sep 17 00:00:00 2001 +From d2abe7328cea770425405aa0da2f4c2dac89fcad Mon Sep 17 00:00:00 2001 From: Matthias Schoepfer <[email protected]> Date: Fri, 31 May 2019 15:34:34 +0200 Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft@@ -15,19 +15,19 @@ Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196]
Signed-off-by Matthias Schoepfer <[email protected]>---
- configure.ac | 175 +++++++--------------------------------------------
- 1 file changed, 21 insertions(+), 154 deletions(-)
+ configure.ac | 196 ++++++---------------------------------------------
+ 1 file changed, 21 insertions(+), 175 deletions(-)diff --git a/configure.ac b/configure.ac
meta/classes-recipe/python3-dir.bbclass +2
-2-index 4230ef2..ee08b1b 100644 +index 358b6ea..085fc0b 100644 --- a/configure.ac +++ b/configure.ac -@@ -718,160 +718,27 @@ then +@@ -907,181 +907,27 @@ then fi -AC_MSG_CHECKING([for the platform triplet based on compilercharacteristics])
--cat >>conftest.c<<EOF
+-cat >conftest.c<<EOF
-#undef bfin
-#undef cris
-#undef fr30meta/classes-recipe/python3-dir.bbclass +16
-0@@ -167,6 +167,22 @@ index 4230ef2..ee08b1b 100644 - darwin -#elif defined(__VXWORKS__) - vxworks +-#elif defined(__wasm32__) +-# if defined(__EMSCRIPTEN__) +- wasm32-emscripten +-# elif defined(__wasi__) +- wasm32-wasi +-# else +-# error unknown wasm32 platform +-# endif +-#elif defined(__wasm64__) +-# if defined(__EMSCRIPTEN) +- wasm64-emscripten +-# elif defined(__wasi__) +- wasm64-wasi +-# else +-# error unknown wasm64 platform +-# endif -#else -# error unknown platform triplet -#endif@@ -175,6 +191,11 @@ index 4230ef2..ee08b1b 100644 - -if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then - PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d' '`
+- case "$build_os" in +- linux-musl*) +- PLATFORM_TRIPLET=`echo "$PLATFORM_TRIPLET" | sed 's/linux-gnu/linux-musl/'` +- ;; +- esac - AC_MSG_RESULT([$PLATFORM_TRIPLET])-else
-AC_MSG_RESULT([none])
diff --gita/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patchb/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patchindex368a725ff7..45a37ed1a9100644
---a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
+++b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From c24674e0a52367359a1a3d950bab8bc3d282279b Mon Sep 17 00:00:00 2001 +From 9c6b9f46179c8f9c9391767e2b02f268a1ee7a9c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 31 Jan 2019 16:46:30 +0100 Subject: [PATCH] distutils/sysconfig: append@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <1 file changed, 2 insertions(+)diff --git
a/Lib/sysconfig.pyb/Lib/sysconfig.pymeta/classes-recipe/python3-dir.bbclass +2
-2-index 40c6b3e..ac94cc7 100644 +index ff399e2..95844cf 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -474,6 +474,8 @@ def _init_posix(vars): +@@ -528,6 +528,8 @@ def _init_posix(vars): """Initialize the module as appropriate for POSIX systems.""" # _sysconfigdata is generated at build time, see
_generate_posix_vars()
name =_get_sysconfigdata_name()
diff --gita/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patchb/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patchindex2c7d264da0..4d589dd759100644
---a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
+++b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From 9f68a27eb34394a00f1011c06900c609f15fb15c Mon Sep 17 00:00:00 2001 +From 175ed10e0a59a5395546ef88702f23d100b909f9 Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> Date: Mon, 22 Oct 2018 15:19:51 +0800 Subject: [PATCH] python3: use cc_basename to replace CC for checkingcompiler
meta/classes-recipe/python3-dir.bbclass +0
-0@@ -27,18 +27,18 @@ Signed-off-by: Changqing Li <1 file changed, 10 insertions(+), 9 deletions(-)diff --git a/configure.ac b/configure.ac
meta/classes-recipe/python3-dir.bbclass +6
-7-index 0c06914..299786b 100644 +index 77fb609..358b6ea 100644 --- a/configure.ac +++ b/configure.ac -@@ -61,6 +61,7 @@ AC_CONFIG_HEADER(pyconfig.h) +@@ -134,6 +134,7 @@ AC_CONFIG_HEADERS([pyconfig.h]) AC_CANONICAL_HOST AC_SUBST(build) AC_SUBST(host) +LT_INIT - # pybuilddir.txt will be created by --generate-posix-vars in the Makefile - rm -f pybuilddir.txt -@@ -688,7 +689,7 @@ AC_MSG_RESULT($with_cxx_main) + AS_VAR_IF([cross_compiling], [maybe], + [AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])] +@@ -877,7 +878,7 @@ AC_MSG_RESULT($with_cxx_main) preset_cxx="$CXX" if test -z "$CXX" then@@ -47,7 +47,7 @@ index 0c06914..299786b 100644 gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;; -@@ -976,7 +977,7 @@ rmdir CaseSensitiveTestDir +@@ -1290,7 +1291,7 @@ rmdir CaseSensitiveTestDir case $ac_sys_system inhp*|HP*)
meta/classes-recipe/python3-dir.bbclass +5
-5@@ -56,16 +56,16 @@ index 0c06914..299786b 100644 cc|*/cc) CC="$CC -Ae";; esac;; esac -@@ -1374,7 +1375,7 @@ else - fi], +@@ -1798,7 +1799,7 @@ esac + ], [AC_MSG_RESULT(no)]) if test "$Py_LTO" = 'true' ; then - case $CC in + case $cc_basename in *clang*) - AC_SUBST(LLVM_AR) - AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path}) -@@ -1467,7 +1468,7 @@ then + dnl flag to disable lto during linking + LDFLAGS_NOLTO="-fno-lto" +@@ -1917,7 +1918,7 @@ then fi fi LLVM_PROF_ERR=no@@ -74,7 +74,7 @@ index 0c06914..299786b 100644 *clang*) # Any changes made here should be reflected in the GCC+Darwin casebelow
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
-@@ -1528,7 +1529,7 @@ esac
+@@ -1978,7 +1979,7 @@ esac# compiler and platform. BASECFLAGS tweaks need to be made even if the # user set OPT.meta/classes-recipe/python3-dir.bbclass +8
-8@@ -83,16 +83,16 @@ index 0c06914..299786b 100644 *clang*) cc_is_clang=1 ;; -@@ -1664,7 +1665,7 @@ yes) +@@ -2197,7 +2198,7 @@ yes) # ICC doesn't recognize the option, but only emits a warning ## XXX does it emit an unused result warning and can it be disabled? -- case "$CC" in -+ case "$cc_basename" in - *icc*) - ac_cv_disable_unused_result_warning=no - ;; -@@ -2018,7 +2019,7 @@ yes) +- AS_CASE([$CC], ++ AS_CASE([$cc_basename], + [*icc*], [ac_cv_disable_unused_result_warning=no] + [PY_CHECK_CC_WARNING([disable], [unused-result])]) + AS_VAR_IF([ac_cv_disable_unused_result_warning], [yes], +@@ -2439,7 +2440,7 @@ yes) ;; esac@@ -101,7 +101,7 @@ index 0c06914..299786b 100644 *icc*) # ICC needs -fp-model strict or floats behave badly CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict" -@@ -2836,7 +2837,7 @@ then +@@ -3281,7 +3282,7 @@ then then LINKFORSHARED="-Wl,--export-dynamic" fi;;@@ -110,7 +110,7 @@ index 0c06914..299786b 100644 *gcc*) if $CC -Xlinker --help 2>&1 | grep export-dynamicQuoted 1 line
/dev/nullthen
-@@ -5622,7 +5623,7 @@ if test "$have_gcc_asm_for_x87" = yes; then +@@ -6370,7 +6371,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then# Some versions of gcc miscompile inline asm: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.htmldiff --git
a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patchb/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patchindexa06e9b56c1..7b497b83ca100644
---a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
+++b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From 1cc4cab8d579bbccb8a4fc13a28158a58c603cb4 Mon Sep 17 00:00:00 2001 +From 2918d431cb5607933755fc80a6220135dd7fcb1d Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes@@ -18,10 +18,10 @@ Signed-off-by: Alejandro Hernandez <1 file changed, 11 insertions(+), 3 deletions(-)diff --git
a/Lib/distutils/sysconfig.pyb/Lib/distutils/sysconfig.pymeta/classes-recipe/python3-dir.bbclass +2
-3-index 3414a76..361d3a1 100644 +index 03b8558..57d193d 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py -@@ -277,7 +277,9 @@ def get_python_inc(plat_specific=0, prefix=None): +@@ -272,7 +272,9 @@ def get_python_inc(plat_specific=0, prefix=None): If 'prefix' is supplied, use it instead of sys.base_prefix or sys.base_exec_prefix -- i.e., ignore 'plat_specific'. """@@ -32,7 +32,7 @@ index 3414a76..361d3a1 100644 prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX if os.name == "posix": if python_build: -@@ -320,7 +322,13 @@ def get_python_lib(plat_specific=0, standard_lib=0,prefix=None):
+@@ -315,7 +317,13 @@ defget_python_lib(plat_specific=0, standard_lib=0, prefix=None):
If 'prefix' is supplied, use it instead of sys.base_prefix or sys.base_exec_prefix -- i.e., ignore 'plat_specific'. """meta/classes-recipe/python3-dir.bbclass +0
-1@@ -47,7 +47,7 @@ index 3414a76..361d3a1 100644 if standard_lib: prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX else: -@@ -334,7 +342,7 @@ def get_python_lib(plat_specific=0, standard_lib=0,prefix=None):
+@@ -329,7 +337,7 @@ defget_python_lib(plat_specific=0, standard_lib=0, prefix=None):
else:
# Pure Python
libdir = "lib"
diff --gita/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patchb/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patchindex2de72b7199..5a6cfc9572100644
---a/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch
+++b/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From 6a23d52c905cd1f6a5944255903ec86ea8b904bb Mon Sep 17 00:00:00 2001 +From 627b8fe6b3c11e8bb1bb1ad1d6b816b79b8dd2ce Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <[email protected]> Date: Mon, 28 Jan 2019 15:57:54 +0000 Subject: [PATCH] _tkinter module needs tk module along with tcl. tk isnot yet
meta/classes-recipe/python3-dir.bbclass +9
-10@@ -9,23 +9,22 @@ Upstream-Status: Inappropriate [distribution] Also simply disable the tk module since its not in DEPENDS. Signed-off-by: Andrei Gherzan <[email protected]> - --- - setup.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + setup.py | 1 - + 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py -index 11b5cf5..2be4738 100644 +index 7555dcd..f29ac86 100644 --- a/setup.py +++ b/setup.py -@@ -1895,8 +1895,8 @@ class PyBuildExt(build_ext): +@@ -1364,7 +1364,6 @@ class PyBuildExt(build_ext): self.detect_decimal() self.detect_ctypes() self.detect_multiprocessing() -- if not self.detect_tkinter(): -- self.missing.append('_tkinter') -+# if not self.detect_tkinter(): -+# self.missing.append('_tkinter') +- self.detect_tkinter() self.detect_uuid() - ## # Uncomment these lines if you want to play with xxmodule.c + # Uncomment the next line if you want to play with xxmodule.c +-- +2.30.2 +meta/recipes-devtools/python/python3/crosspythonpath.patch +2
-7@@ -1,4 +1,4 @@ -From baa3a232e64e9bf5ae945366efdb8088ccf9b828 Mon Sep 17 00:00:00 2001 +From 7d5fc6a86103d9bd4a274e9fd31b6987e39998a1 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda <[email protected]> Date: Tue, 18 Nov 2014 03:35:33 -0500 Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for@@ -20,15 +20,15 @@ Signed-off-by: Ricardo Ribalda <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d0db062..e5e3df8 100644 +index 085fc0b..22790d7 100644 --- a/configure.ac +++ b/configure.ac -@@ -83,7 +83,7 @@ if test "$cross_compiling" = yes; then - AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) - fi - AC_MSG_RESULT($interp) -- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir)_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/
cat pybuilddir.txt:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
-+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir)
_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/cat pybuilddir.txt:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interpmeta/recipes-devtools/python/python3/crosspythonpath.patch +5
-4- fi - elif test "$cross_compiling" = maybe; then - AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) +@@ -163,7 +163,7 @@ AC_ARG_WITH( + dnl Build Python interpreter is used for regeneration and freezing. + ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python + PYTHON_FOR_FREEZE="$with_build_python" +- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir)_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/
cat pybuilddir.txt:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python
++ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir)
_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/cat pybuilddir.txt:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_pythonmeta/recipes-devtools/python/python3/crosspythonpath.patch +3
-0+ AC_MSG_RESULT([$with_build_python]) + ], [ + AS_VAR_IF([cross_compiling], [yes],meta/recipes-devtools/python/python3/makerace.patch +1
-1@@ -1,4 +1,4 @@ -From 7cc02dfa593d1350a689d64a7a6f2dc6478afe24 Mon Sep 17 00:00:00 2001 +From 4f52aaf2a548b3356c6f1369c62b11335dc27464 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Tue, 13 Jul 2021 23:19:29 +0100 Subject: [PATCH] python3: Fix make race@@ -18,15 +18,15 @@ Signed-off-by: Richard Purdie <1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/Makefile.pre.in b/Makefile.pre.in
meta/recipes-devtools/python/python3/makerace.patch +4
-4-index 5e13ba2..026bffd 100644 +index 7558f0c..8cec819 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1527,7 +1527,7 @@ TESTSUBDIRS= ctypes/test \ +@@ -2005,7 +2005,7 @@ TESTSUBDIRS= ctypes/test \ unittest/test unittest/test/testmock TEST_MODULES=@TEST_MODULES@ --libinstall: build_all $(srcdir)/Modules/xxmodule.c -+libinstall: build_all $(srcdir)/Modules/xxmodule.c libainstall +-libinstall: all $(srcdir)/Modules/xxmodule.c ++libinstall: all $(srcdir)/Modules/xxmodule.c libainstall @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ if test ! -d $(DESTDIR)$$i; then \meta/recipes-devtools/python/python3_3.11.0.bb renamed from meta/recipes-devtools/python/python3_3.10.6.bb +0
-1@@ -22,7 +22,6 @@ SRC_URI = " http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \ file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \ file://crosspythonpath.patch \ - file://0001-Use-FLAG_REF-always-for-interned-strings.patch \file://0001-test_locale.py-correct-the-test-output-format.patch \
file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \meta/recipes-devtools/python/python3_3.11.0.bb renamed from meta/recipes-devtools/python/python3_3.10.6.bb +0
-1@@ -35,7 +34,6 @@ SRC_URI = " http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch \ file://deterministic_imports.patch \ file://0001-Avoid-shebang-overflow-on-python-config.py.patch \ - file://0001-Mitigate-the-race-condition-in-testSockName.patch \ "SRC_URI:append:class-native = " \
meta/recipes-devtools/python/python3_3.11.0.bb renamed from meta/recipes-devtools/python/python3_3.10.6.bb +0
-1@@ -44,7 +42,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] ="
f795ff87d11d4b0c7c33bc8851b0c28648d8a4583aa2100a98c22b4326b6d3f3" +SRC_URI[sha256sum] = "a57dc82d77358617ba65b9841cee1e3b441f386c3789ddc0676eca077f2951c3"# exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"meta/recipes-devtools/python/python3_3.11.0.bb renamed from meta/recipes-devtools/python/python3_3.10.6.bb +1
-1@@ -62,7 +60,7 @@ CVE_CHECK_IGNORE += "CVE-2020-15523 CVE-2022-26488" # The module will be removed in the future and flaws documented. CVE_CHECK_IGNORE += "CVE-2015-20107" -PYTHON_MAJMIN = "3.10" +PYTHON_MAJMIN = "3.11" S = "${WORKDIR}/Python-${PV}"@@ -81,11 +79,10 @@ DEPENDS = "bzip2-replacement-native libffi bzip2openssl sqlite3 zlib virtual/li
DEPENDS:append:class-target = " python3-native" DEPENDS:append:class-nativesdk = " python3-native"-# force to use the mutex+cond implementation (
https://bugs.python.org/issue41710)meta/recipes-devtools/python/python3_3.11.0.bb renamed from meta/recipes-devtools/python/python3_3.10.6.bb +2
-3-CFLAGS += "-DHAVE_BROKEN_POSIX_SEMAPHORES" - EXTRA_OECONF = " --without-ensurepip --enable-shared --with-platlibdir=${baselib}" EXTRA_OECONF:append:class-native = " --bindir=${bindir}/${PN}" +EXTRA_OECONF:append:class-target = " --with-build-python=nativepython3" +EXTRA_OECONF:append:class-nativesdk = " --with-build-python=nativepython3" exportCROSSPYTHONPATH="${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/"
--
2.30.2-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#172226):
https://lists.openembedded.org/g/openembedded-core/message/172226
Mute This Topic: https://lists.openembedded.org/mt/94612950/924729
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 23/23] python3: update 3.10.6 -> 3.11.0
There will not be breakage :-) but thanks!
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/4383
Alex
Quoted 817 lines · Tim Orling
Yes please. I will help with any breakage on the AB. Thank you Alex!
Quoted 811 lines · Alexander Kanavin
The semaphore fix has landed and is available from 3.11 onwards:
https://github.com/python/cpython/commit/1ee0f94d16f150356a4b9b0a39d44ba1d2d5b9fc
Drop 0001-Mitigate-the-race-condition-in-testSockName.patch as it is merged upstream.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/classes-recipe/python3-dir.bbclass | 2 +- ...ib-termcap-to-linker-flags-to-avoid-.patch | 8 ++-- ...-search-system-for-headers-libraries.patch | 6 +-- ...-use-prefix-value-from-build-configu.patch | 14 +++--- ...e-the-race-condition-in-testSockName.patch | 47 ------------------- ...sts-due-to-load-variability-on-YP-AB.patch | 18 +++---- ...FLAG_REF-always-for-interned-strings.patch | 33 ------------- ...-detection-of-mips-architecture-for-.patch | 33 ++++++++++--- ...fig-append-STAGING_LIBDIR-python-sys.patch | 6 +-- ...asename-to-replace-CC-for-checking-c.patch | 44 ++++++++--------- ...tutils-prefix-is-inside-staging-area.patch | 10 ++-- .../python3/avoid_warning_about_tkinter.patch | 21 ++++----- .../python/python3/crosspythonpath.patch | 22 ++++----- .../python/python3/makerace.patch | 10 ++-- .../{python3_3.10.6.bb => python3_3.11.0.bb} | 11 ++--- 15 files changed, 111 insertions(+), 174 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patch delete mode 100644 meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch rename meta/recipes-devtools/python/{python3_3.10.6.bb =>python3_3.11.0.bb} (98%)
meta/classes-recipe/python3-dir.bbclass +1
-1@@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -PYTHON_BASEVERSION = "3.10" +PYTHON_BASEVERSION = "3.11" PYTHON_ABI = "" PYTHON_DIR = "python${PYTHON_BASEVERSION}" PYTHON_PN = "python3"diff --git
a/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patchb/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patchindex62ef6efc28..16a4185704100644
---a/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch
+++b/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From 80f872e4573f542d33f91514538755557d566f79 Mon Sep 17 00:00:00 2001 +From 93ae2ed3fc8be0245e35063c4f63626792f4cd0c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 25 Jan 2019 19:04:13 +0100 Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoidhost
meta/classes-recipe/python3-dir.bbclass +0
-0@@ -12,14 +12,14 @@ Signed-off-by: Alexander Kanavin <1 file changed, 1 deletion(-)diff --git
a/setup.pyb/setup.pymeta/classes-recipe/python3-dir.bbclass +3
-3-index 43e807f..11b5cf5 100644 +index 15d0d45..37ed244 100644 --- a/setup.py +++ b/setup.py -@@ -1149,7 +1149,6 @@ class PyBuildExt(build_ext): +@@ -1109,7 +1109,6 @@ class PyBuildExt(build_ext): 'termcap'): readline_libs.append('termcap') self.add(Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, libraries=readline_libs)) else: + self.missing.append('readline')diff --git
a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patchb/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patchindexc790c7b886..d6d9e451ff100644
---a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
+++b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patchmeta/classes-recipe/python3-dir.bbclass +3
-3@@ -1,4 +1,4 @@ -From 7589ab03ad3f7cb4bb092c31273ff22371ac77e4 Mon Sep 17 00:00:00 2001 +From 910a905aaeb6edb6b042ef65b3e2b73faada80aa Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <[email protected]> Date: Wed, 4 Mar 2020 00:06:42 +0000 Subject: [PATCH] Don't search system for headers/libraries@@ -11,10 +11,10 @@ Signed-off-by: Jeremy Puhlman <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index c3a6b5e..c892537 100644 +index f29ac86..930cb20 100644 --- a/setup.py +++ b/setup.py -@@ -856,8 +856,8 @@ class PyBuildExt(build_ext): +@@ -877,8 +877,8 @@ class PyBuildExt(build_ext): add_dir_to_list(self.compiler.include_dirs, sysconfig.get_config_var("INCLUDEDIR"))diff --git
a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patchb/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patchindex641017edd5..2f519e4917100644
---a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
+++b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From d82cb96eed1098920ad3cdcb36feb32137618066 Mon Sep 17 00:00:00 2001 +From 05d676ddf675d9c8229b723e64717aa485d6809e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 10 Sep 2021 12:28:31 +0200 Subject: [PATCH] Lib/sysconfig.py: use prefix value from buildconfiguration
meta/classes-recipe/python3-dir.bbclass +6
-6@@ -15,11 +15,11 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 5 insertions(+) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index e64bcdc..40c6b3e 100644 +index 93c6f73..ff399e2 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -613,6 +613,11 @@ def get_config_vars(*args): - _init_non_posix(_CONFIG_VARS) +@@ -668,6 +668,11 @@ def get_config_vars(*args): + _CONFIG_VARS['VPATH'] = sys._vpath if os.name == 'posix': _init_posix(_CONFIG_VARS) + _CONFIG_VARS['installed_base'] = _CONFIG_VARS['prefix']@@ -27,6 +27,6 @@ index e64bcdc..40c6b3e 100644 + _CONFIG_VARS['installed_platbase'] = _CONFIG_VARS['prefix'] + _CONFIG_VARS['platbase'] = _CONFIG_VARS['prefix'] + _CONFIG_VARS['platlibdir'] = _CONFIG_VARS['PLATLIBDIR'] - # For backward compatibility, see issue19555 - SO = _CONFIG_VARS.get('EXT_SUFFIX') - if SO is not None: + if _HAS_USER_BASE: + # Setting 'userbase' is done below the call to the + # init function to enable using 'get_config_var' indiff --git
a/meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patchb/meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patchdeleted file mode 100644
index e19df08f87..0000000000
---a/meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patch+++/dev/nullmeta/classes-recipe/python3-dir.bbclass +0
-30@@ -1,47 +0,0 @@ -Upstream-Status: Pending -Signed-off-by: Ross Burton <[email protected]> - -From 8103b90148e8768456c3ab707de105d63d9d5b20 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Fri, 17 Jun 2022 11:53:59 +0100 -Subject: [PATCH] Mitigate the race condition in testSockName - -find_unused_port() has an inherent race condition, but we can't use -bind_port() as that uses .getsockname() which this test is exercising. - -Try binding to unused ports a few times before failing. ---- - Lib/test/test_socket.py | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py -index c981903824..b1630d18b6 100644 ---- a/Lib/test/test_socket.py -+++ b/Lib/test/test_socket.py -@@ -1390,10 +1390,21 @@ def testStringToIPv6(self): - - def testSockName(self): - # Testing getsockname() -- port = socket_helper.find_unused_port() - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self.addCleanup(sock.close) -- sock.bind(("0.0.0.0", port)) -+ -+ # Since find_unused_port() is inherently subject to raceconditions, we
-+ # call it a couple times if necessary.
-+ for i initertools.count():
-+ port =socket_helper.find_unused_port()
-+ try:
-+sock.bind(("0.0.0.0", port))
-+ except OSError as e:
-+ if e.errno != errno.EADDRINUSE or i == 5:
-+ raise
-+ else:
-+ break
-+meta/classes-recipe/python3-dir.bbclass +0
-6- name = sock.getsockname() - # XXX(nnorwitz): http://tinyurl.com/os5jz seems to indicate - # it reasonable to get the host's addr in addition to 0.0.0.0. --- -2.25.1 -diff --git
a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patchb/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patchindex96c5a3c840..61dd4a5bc0100644
---a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch
+++b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From 7171aeee22a0b7ab57cdf3d1ae15530549f8f92a Mon Sep 17 00:00:00 2001 +From 01e02fb4720ecbbc44c694ee1b7fb6d5d95b5fe2 Mon Sep 17 00:00:00 2001 From: Yi Fan Yu <[email protected]> Date: Thu, 1 Apr 2021 13:08:37 -0700 Subject: [PATCH] Skip failing tests due to load variability on YP AB@@ -17,10 +17,10 @@ Signed-off-by: Yi Fan Yu <[email protected]> 2 files changed, 3 insertions(+) diff --git a/Lib/test/_test_multiprocessing.py
b/Lib/test/_test_multiprocessing.pymeta/classes-recipe/python3-dir.bbclass +8
-8-index 3bc5b8f..a6e106d 100644 +index 599c3f2..23328be 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py -@@ -568,6 +568,7 @@ class _TestProcess(BaseTestCase): +@@ -618,6 +618,7 @@ class _TestProcess(BaseTestCase): close_queue(q)@@ -28,7 +28,7 @@ index 3bc5b8f..a6e106d 100644 def test_many_processes(self): if self.TYPE == 'threads': self.skipTest('test not appropriate for {}'.format(self.TYPE)) -@@ -4817,6 +4818,7 @@ class TestWait(unittest.TestCase): +@@ -4890,6 +4891,7 @@ class TestWait(unittest.TestCase): sem.release() time.sleep(period)@@ -37,13 +37,13 @@ index 3bc5b8f..a6e106d 100644 from multiprocessing.connection import wait diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py -index 875615a..aebaa8c 100644 +index 884b142..542e980 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py -@@ -474,6 +474,7 @@ class TimeTestCase(unittest.TestCase): - def test_perf_counter(self): - time.perf_counter() - +@@ -492,6 +492,7 @@ class TimeTestCase(unittest.TestCase): + @unittest.skipIf( + support.is_wasi, "process_time not available on WASI" + ) + @unittest.skip('timing related test, dependent on load') def test_process_time(self): # process_time() should not include time spend during a sleepdiff --git
a/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patchb/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patchdeleted file mode 100644
index 993ac243fc..0000000000
---a/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch+++/dev/nullmeta/classes-recipe/python3-dir.bbclass +0
-24@@ -1,33 +0,0 @@ -From d7217b79a4e125d4fcc1087743171b94d91d1121 Mon Sep 17 00:00:00 2001 -From: Inada Naoki <[email protected]> -Date: Sat, 14 Jul 2018 00:46:11 +0900 -Subject: [PATCH] Use FLAG_REF always for interned strings - -Upstream-Status: Submitted [https://github.com/python/cpython/pull/8226] -Signed-off-by: Joshua Watt <[email protected]> - ---- - Python/marshal.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/Python/marshal.c b/Python/marshal.c -index 4125240..341c9aa 100644 ---- a/Python/marshal.c -+++ b/Python/marshal.c -@@ -298,9 +298,14 @@ w_ref(PyObject *v, char *flag, WFILE *p) - if (p->version < 3 || p->hashtable == NULL) - return 0; /* not writing object references */ - -- /* if it has only one reference, it definitely isn't shared */ -- if (Py_REFCNT(v) == 1) -+ /* If it has only one reference, it definitely isn't shared. -+ * But we use TYPE_REF always for interned string, to PYC filestable
-+ * as possible.
-+ */
-+ if (Py_REFCNT(v)== 1 &&
-+ !(PyUnicode_CheckExact(v) &&PyUnicode_CHECK_INTERNED(v))) {meta/classes-recipe/python3-dir.bbclass +0
-5- return 0; -+ } - - entry = _Py_hashtable_get_entry(p->hashtable, v); - if (entry != NULL) {diff --git
a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patchb/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patchindex6ab335a405..f303eb35dc100644
---a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
+++b/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From bb409432f03dd8256865292e382ad16613737829 Mon Sep 17 00:00:00 2001 +From d2abe7328cea770425405aa0da2f4c2dac89fcad Mon Sep 17 00:00:00 2001 From: Matthias Schoepfer <[email protected]> Date: Fri, 31 May 2019 15:34:34 +0200 Subject: [PATCH] bpo-36852: proper detection of mips architecture forsoft
meta/classes-recipe/python3-dir.bbclass +0
-0@@ -15,19 +15,19 @@ Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196]
Signed-off-by Matthias Schoepfer <[email protected]>---
- configure.ac | 175 +++++++--------------------------------------------
- 1 file changed, 21 insertions(+), 154 deletions(-)
+ configure.ac | 196 ++++++---------------------------------------------
+ 1 file changed, 21 insertions(+), 175 deletions(-)diff --git a/configure.ac b/configure.ac
meta/classes-recipe/python3-dir.bbclass +2
-2-index 4230ef2..ee08b1b 100644 +index 358b6ea..085fc0b 100644 --- a/configure.ac +++ b/configure.ac -@@ -718,160 +718,27 @@ then +@@ -907,181 +907,27 @@ then fi -AC_MSG_CHECKING([for the platform triplet based on compilercharacteristics])
--cat >>conftest.c<<EOF
+-cat >conftest.c<<EOF
-#undef bfin
-#undef cris
-#undef fr30meta/classes-recipe/python3-dir.bbclass +16
-0@@ -167,6 +167,22 @@ index 4230ef2..ee08b1b 100644 - darwin -#elif defined(__VXWORKS__) - vxworks +-#elif defined(__wasm32__) +-# if defined(__EMSCRIPTEN__) +- wasm32-emscripten +-# elif defined(__wasi__) +- wasm32-wasi +-# else +-# error unknown wasm32 platform +-# endif +-#elif defined(__wasm64__) +-# if defined(__EMSCRIPTEN) +- wasm64-emscripten +-# elif defined(__wasi__) +- wasm64-wasi +-# else +-# error unknown wasm64 platform +-# endif -#else -# error unknown platform triplet -#endif@@ -175,6 +191,11 @@ index 4230ef2..ee08b1b 100644 - -if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then - PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d' '`
+- case "$build_os" in +- linux-musl*) +- PLATFORM_TRIPLET=`echo "$PLATFORM_TRIPLET" | sed 's/linux-gnu/linux-musl/'` +- ;; +- esac - AC_MSG_RESULT([$PLATFORM_TRIPLET])-else
-AC_MSG_RESULT([none])
diff --gita/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patchb/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patchindex368a725ff7..45a37ed1a9100644
---a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
+++b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From c24674e0a52367359a1a3d950bab8bc3d282279b Mon Sep 17 00:00:00 2001 +From 9c6b9f46179c8f9c9391767e2b02f268a1ee7a9c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 31 Jan 2019 16:46:30 +0100 Subject: [PATCH] distutils/sysconfig: append@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <1 file changed, 2 insertions(+)diff --git
a/Lib/sysconfig.pyb/Lib/sysconfig.pymeta/classes-recipe/python3-dir.bbclass +2
-2-index 40c6b3e..ac94cc7 100644 +index ff399e2..95844cf 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -474,6 +474,8 @@ def _init_posix(vars): +@@ -528,6 +528,8 @@ def _init_posix(vars): """Initialize the module as appropriate for POSIX systems.""" # _sysconfigdata is generated at build time, see
_generate_posix_vars()
name =_get_sysconfigdata_name()
diff --gita/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patchb/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patchindex2c7d264da0..4d589dd759100644
---a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
+++b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From 9f68a27eb34394a00f1011c06900c609f15fb15c Mon Sep 17 00:00:00 2001 +From 175ed10e0a59a5395546ef88702f23d100b909f9 Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> Date: Mon, 22 Oct 2018 15:19:51 +0800 Subject: [PATCH] python3: use cc_basename to replace CC for checkingcompiler
meta/classes-recipe/python3-dir.bbclass +0
-0@@ -27,18 +27,18 @@ Signed-off-by: Changqing Li <1 file changed, 10 insertions(+), 9 deletions(-)diff --git a/configure.ac b/configure.ac
meta/classes-recipe/python3-dir.bbclass +2
-3-index 0c06914..299786b 100644 +index 77fb609..358b6ea 100644 --- a/configure.ac +++ b/configure.ac -@@ -61,6 +61,7 @@ AC_CONFIG_HEADER(pyconfig.h) +@@ -134,6 +134,7 @@ AC_CONFIG_HEADERS([pyconfig.h]) AC_CANONICAL_HOST AC_SUBST(build) AC_SUBST(host) +LT_INIT - # pybuilddir.txt will be created by --generate-posix-vars in the
Makefile
- rm -f pybuilddir.txt
-@@ -688,7 +689,7 @@AC_MSG_RESULT($with_cxx_main)
+ AS_VAR_IF([cross_compiling], [maybe],meta/classes-recipe/python3-dir.bbclass +3
-2+ [AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])] +@@ -877,7 +878,7 @@ AC_MSG_RESULT($with_cxx_main) preset_cxx="$CXX" if test -z "$CXX" then@@ -47,7 +47,7 @@ index 0c06914..299786b 100644 gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;; -@@ -976,7 +977,7 @@ rmdir CaseSensitiveTestDir +@@ -1290,7 +1291,7 @@ rmdir CaseSensitiveTestDir case $ac_sys_system inhp*|HP*)
meta/classes-recipe/python3-dir.bbclass +5
-5@@ -56,16 +56,16 @@ index 0c06914..299786b 100644 cc|*/cc) CC="$CC -Ae";; esac;; esac -@@ -1374,7 +1375,7 @@ else - fi], +@@ -1798,7 +1799,7 @@ esac + ], [AC_MSG_RESULT(no)]) if test "$Py_LTO" = 'true' ; then - case $CC in + case $cc_basename in *clang*) - AC_SUBST(LLVM_AR) - AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path}) -@@ -1467,7 +1468,7 @@ then + dnl flag to disable lto during linking + LDFLAGS_NOLTO="-fno-lto" +@@ -1917,7 +1918,7 @@ then fi fi LLVM_PROF_ERR=no@@ -74,7 +74,7 @@ index 0c06914..299786b 100644 *clang*) # Any changes made here should be reflected in the GCC+Darwin casebelow
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
-@@ -1528,7 +1529,7 @@ esac
+@@ -1978,7 +1979,7 @@ esac# compiler and platform. BASECFLAGS tweaks need to be made even if the # user set OPT.meta/classes-recipe/python3-dir.bbclass +8
-8@@ -83,16 +83,16 @@ index 0c06914..299786b 100644 *clang*) cc_is_clang=1 ;; -@@ -1664,7 +1665,7 @@ yes) +@@ -2197,7 +2198,7 @@ yes) # ICC doesn't recognize the option, but only emits a warning ## XXX does it emit an unused result warning and can it be disabled? -- case "$CC" in -+ case "$cc_basename" in - *icc*) - ac_cv_disable_unused_result_warning=no - ;; -@@ -2018,7 +2019,7 @@ yes) +- AS_CASE([$CC], ++ AS_CASE([$cc_basename], + [*icc*], [ac_cv_disable_unused_result_warning=no] + [PY_CHECK_CC_WARNING([disable], [unused-result])]) + AS_VAR_IF([ac_cv_disable_unused_result_warning], [yes], +@@ -2439,7 +2440,7 @@ yes) ;; esac@@ -101,7 +101,7 @@ index 0c06914..299786b 100644 *icc*) # ICC needs -fp-model strict or floats behave badly CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict" -@@ -2836,7 +2837,7 @@ then +@@ -3281,7 +3282,7 @@ then then LINKFORSHARED="-Wl,--export-dynamic" fi;;@@ -110,7 +110,7 @@ index 0c06914..299786b 100644 *gcc*) if $CC -Xlinker --help 2>&1 | grep export-dynamicQuoted 1 line
/dev/nullthen
-@@ -5622,7 +5623,7 @@ if test "$have_gcc_asm_for_x87" = yes; then +@@ -6370,7 +6371,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then# Some versions of gcc miscompile inline asm: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.htmldiff --git
a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patchb/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patchindexa06e9b56c1..7b497b83ca100644
---a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
+++b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From 1cc4cab8d579bbccb8a4fc13a28158a58c603cb4 Mon Sep 17 00:00:00 2001 +From 2918d431cb5607933755fc80a6220135dd7fcb1d Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes@@ -18,10 +18,10 @@ Signed-off-by: Alejandro Hernandez <1 file changed, 11 insertions(+), 3 deletions(-)diff --git
a/Lib/distutils/sysconfig.pyb/Lib/distutils/sysconfig.pymeta/classes-recipe/python3-dir.bbclass +2
-3-index 3414a76..361d3a1 100644 +index 03b8558..57d193d 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py -@@ -277,7 +277,9 @@ def get_python_inc(plat_specific=0, prefix=None): +@@ -272,7 +272,9 @@ def get_python_inc(plat_specific=0, prefix=None): If 'prefix' is supplied, use it instead of sys.base_prefix or sys.base_exec_prefix -- i.e., ignore 'plat_specific'. """@@ -32,7 +32,7 @@ index 3414a76..361d3a1 100644 prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX if os.name == "posix": if python_build: -@@ -320,7 +322,13 @@ def get_python_lib(plat_specific=0, standard_lib=0,prefix=None):
+@@ -315,7 +317,13 @@ defget_python_lib(plat_specific=0, standard_lib=0, prefix=None):
If 'prefix' is supplied, use it instead of sys.base_prefix or sys.base_exec_prefix -- i.e., ignore 'plat_specific'. """meta/classes-recipe/python3-dir.bbclass +0
-1@@ -47,7 +47,7 @@ index 3414a76..361d3a1 100644 if standard_lib: prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX else: -@@ -334,7 +342,7 @@ def get_python_lib(plat_specific=0, standard_lib=0,prefix=None):
+@@ -329,7 +337,7 @@ defget_python_lib(plat_specific=0, standard_lib=0, prefix=None):
else:
# Pure Python
libdir = "lib"
diff --gita/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patchb/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patchindex2de72b7199..5a6cfc9572100644
---a/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch
+++b/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patchmeta/classes-recipe/python3-dir.bbclass +1
-1@@ -1,4 +1,4 @@ -From 6a23d52c905cd1f6a5944255903ec86ea8b904bb Mon Sep 17 00:00:00 2001 +From 627b8fe6b3c11e8bb1bb1ad1d6b816b79b8dd2ce Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <[email protected]> Date: Mon, 28 Jan 2019 15:57:54 +0000 Subject: [PATCH] _tkinter module needs tk module along with tcl. tk isnot yet
meta/classes-recipe/python3-dir.bbclass +9
-10@@ -9,23 +9,22 @@ Upstream-Status: Inappropriate [distribution] Also simply disable the tk module since its not in DEPENDS. Signed-off-by: Andrei Gherzan <[email protected]> - --- - setup.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + setup.py | 1 - + 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py -index 11b5cf5..2be4738 100644 +index 7555dcd..f29ac86 100644 --- a/setup.py +++ b/setup.py -@@ -1895,8 +1895,8 @@ class PyBuildExt(build_ext): +@@ -1364,7 +1364,6 @@ class PyBuildExt(build_ext): self.detect_decimal() self.detect_ctypes() self.detect_multiprocessing() -- if not self.detect_tkinter(): -- self.missing.append('_tkinter') -+# if not self.detect_tkinter(): -+# self.missing.append('_tkinter') +- self.detect_tkinter() self.detect_uuid() - ## # Uncomment these lines if you want to play with xxmodule.c + # Uncomment the next line if you want to play with xxmodule.c +-- +2.30.2 +meta/recipes-devtools/python/python3/crosspythonpath.patch +2
-7@@ -1,4 +1,4 @@ -From baa3a232e64e9bf5ae945366efdb8088ccf9b828 Mon Sep 17 00:00:00 2001 +From 7d5fc6a86103d9bd4a274e9fd31b6987e39998a1 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda <[email protected]> Date: Tue, 18 Nov 2014 03:35:33 -0500 Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for@@ -20,15 +20,15 @@ Signed-off-by: Ricardo Ribalda <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d0db062..e5e3df8 100644 +index 085fc0b..22790d7 100644 --- a/configure.ac +++ b/configure.ac -@@ -83,7 +83,7 @@ if test "$cross_compiling" = yes; then - AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) - fi - AC_MSG_RESULT($interp) -- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir)_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/
cat pybuilddir.txt:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
-+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir)
_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/cat pybuilddir.txt:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interpmeta/recipes-devtools/python/python3/crosspythonpath.patch +5
-4- fi - elif test "$cross_compiling" = maybe; then - AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) +@@ -163,7 +163,7 @@ AC_ARG_WITH( + dnl Build Python interpreter is used for regeneration and freezing. + ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python + PYTHON_FOR_FREEZE="$with_build_python" +- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir)_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/
cat pybuilddir.txt:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python
++ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir)
_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/cat pybuilddir.txt:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_pythonmeta/recipes-devtools/python/python3/crosspythonpath.patch +3
-0+ AC_MSG_RESULT([$with_build_python]) + ], [ + AS_VAR_IF([cross_compiling], [yes],meta/recipes-devtools/python/python3/makerace.patch +1
-1@@ -1,4 +1,4 @@ -From 7cc02dfa593d1350a689d64a7a6f2dc6478afe24 Mon Sep 17 00:00:00 2001 +From 4f52aaf2a548b3356c6f1369c62b11335dc27464 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Tue, 13 Jul 2021 23:19:29 +0100 Subject: [PATCH] python3: Fix make race@@ -18,15 +18,15 @@ Signed-off-by: Richard Purdie <1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/Makefile.pre.in b/Makefile.pre.in
meta/recipes-devtools/python/python3/makerace.patch +4
-4-index 5e13ba2..026bffd 100644 +index 7558f0c..8cec819 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1527,7 +1527,7 @@ TESTSUBDIRS= ctypes/test \ +@@ -2005,7 +2005,7 @@ TESTSUBDIRS= ctypes/test \ unittest/test unittest/test/testmock TEST_MODULES=@TEST_MODULES@ --libinstall: build_all $(srcdir)/Modules/xxmodule.c -+libinstall: build_all $(srcdir)/Modules/xxmodule.c libainstall +-libinstall: all $(srcdir)/Modules/xxmodule.c ++libinstall: all $(srcdir)/Modules/xxmodule.c libainstall @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ if test ! -d $(DESTDIR)$$i; then \meta/recipes-devtools/python/python3_3.11.0.bb renamed from meta/recipes-devtools/python/python3_3.10.6.bb +0
-1@@ -22,7 +22,6 @@ SRC_URI = " http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \ file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \ file://crosspythonpath.patch \ - file://0001-Use-FLAG_REF-always-for-interned-strings.patch \file://0001-test_locale.py-correct-the-test-output-format.patch \
file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \meta/recipes-devtools/python/python3_3.11.0.bb renamed from meta/recipes-devtools/python/python3_3.10.6.bb +0
-1@@ -35,7 +34,6 @@ SRC_URI = " http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch \ file://deterministic_imports.patch \ file://0001-Avoid-shebang-overflow-on-python-config.py.patch \ - file://0001-Mitigate-the-race-condition-in-testSockName.patch \"SRC_URI:append:class-native = " \
meta/recipes-devtools/python/python3_3.11.0.bb renamed from meta/recipes-devtools/python/python3_3.10.6.bb +0
-1@@ -44,7 +42,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] ="
f795ff87d11d4b0c7c33bc8851b0c28648d8a4583aa2100a98c22b4326b6d3f3" +SRC_URI[sha256sum] = "a57dc82d77358617ba65b9841cee1e3b441f386c3789ddc0676eca077f2951c3"# exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"meta/recipes-devtools/python/python3_3.11.0.bb renamed from meta/recipes-devtools/python/python3_3.10.6.bb +1
-1@@ -62,7 +60,7 @@ CVE_CHECK_IGNORE += "CVE-2020-15523 CVE-2022-26488" # The module will be removed in the future and flaws documented. CVE_CHECK_IGNORE += "CVE-2015-20107" -PYTHON_MAJMIN = "3.10" +PYTHON_MAJMIN = "3.11" S = "${WORKDIR}/Python-${PV}"@@ -81,11 +79,10 @@ DEPENDS = "bzip2-replacement-native libffi bzip2openssl sqlite3 zlib virtual/li
DEPENDS:append:class-target = " python3-native" DEPENDS:append:class-nativesdk = " python3-native"-# force to use the mutex+cond implementation (
https://bugs.python.org/issue41710)meta/recipes-devtools/python/python3_3.11.0.bb renamed from meta/recipes-devtools/python/python3_3.10.6.bb +2
-4-CFLAGS += "-DHAVE_BROKEN_POSIX_SEMAPHORES" - EXTRA_OECONF = " --without-ensurepip --enable-shared --with-platlibdir=${baselib}" EXTRA_OECONF:append:class-native = " --bindir=${bindir}/${PN}" +EXTRA_OECONF:append:class-target = " --with-build-python=nativepython3" +EXTRA_OECONF:append:class-nativesdk = " --with-build-python=nativepython3" exportCROSSPYTHONPATH="${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/"
--
2.30.2-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#172226):
https://lists.openembedded.org/g/openembedded-core/message/172226
Mute This Topic: https://lists.openembedded.org/mt/94612950/924729
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-