diff options
19 files changed, 143 insertions, 180 deletions
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-fix-broken-symlink-in-dracut-config-examples.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-fix-broken-symlink-in-dracut-config-examples.patch new file mode 100644 index 0000000000..7d0b65a161 --- /dev/null +++ b/meta-initramfs/recipes-devtools/dracut/dracut/0001-fix-broken-symlink-in-dracut-config-examples.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 8871c593973d9abfef45408575e5da887830f42e Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Thu, 22 May 2025 18:07:27 +0800 | ||
4 | Subject: [PATCH] fix broken symlink in dracut config examples | ||
5 | |||
6 | Due to commit [1], it installs dracut config examples under /usr. | ||
7 | But while enable_test=no, the symlink of test in dracut config is broken | ||
8 | ... | ||
9 | root@qemux86-64:~# ls /usr/lib/dracut/dracut.conf.d/test* -ahl | ||
10 | lrwxrwxrwx 1 root root 27 Apr 5 2011 /usr/lib/dracut/dracut.conf.d/test -> ../test/dracut.conf.d/test/ | ||
11 | lrwxrwxrwx 1 root root 36 Apr 5 2011 /usr/lib/dracut/dracut.conf.d/test-makeroot -> ../test/dracut.conf.d/test-makeroot/ | ||
12 | lrwxrwxrwx 1 root root 31 Apr 5 2011 /usr/lib/dracut/dracut.conf.d/test-root -> ../test/dracut.conf.d/test-root | ||
13 | root@qemux86-64:~# realpath /usr/lib/dracut/dracut.conf.d/test* | ||
14 | realpath: /usr/lib/dracut/dracut.conf.d/test: No such file or directory | ||
15 | realpath: /usr/lib/dracut/dracut.conf.d/test-makeroot: No such file or directory | ||
16 | realpath: /usr/lib/dracut/dracut.conf.d/test-root: No such file or directory | ||
17 | ... | ||
18 | |||
19 | This commit cleans up test symlink if enable_test=no | ||
20 | |||
21 | [1] https://github.com/dracut-ng/dracut-ng/commit/0d369e3e30935dffe48dfff1e90463868e7f804a | ||
22 | |||
23 | Upstream-Status: Submitted [https://github.com/dracut-ng/dracut-ng/pull/1344] | ||
24 | |||
25 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
26 | --- | ||
27 | Makefile | 1 + | ||
28 | 1 file changed, 1 insertion(+) | ||
29 | |||
30 | diff --git a/Makefile b/Makefile | ||
31 | index d33aebbc..151d9f79 100644 | ||
32 | --- a/Makefile | ||
33 | +++ b/Makefile | ||
34 | @@ -180,6 +180,7 @@ ifneq ($(enable_test),no) | ||
35 | cp -arx test $(DESTDIR)$(pkglibdir) | ||
36 | else | ||
37 | rm -rf $(DESTDIR)$(pkglibdir)/modules.d/80test* | ||
38 | + rm -rf $(DESTDIR)$(pkglibdir)/dracut.conf.d/test* | ||
39 | endif | ||
40 | ifneq ($(enable_documentation),no) | ||
41 | for i in $(man1pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man1/$${i##*/}; done | ||
42 | -- | ||
43 | 2.34.1 | ||
44 | |||
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_106.bb b/meta-initramfs/recipes-devtools/dracut/dracut_106.bb index b474514713..b70ee4baeb 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_106.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_106.bb | |||
@@ -10,6 +10,7 @@ PE = "1" | |||
10 | SRCREV = "956c08774074ddc45b2f975e13d5c13d1fc36eff" | 10 | SRCREV = "956c08774074ddc45b2f975e13d5c13d1fc36eff" |
11 | SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \ | 11 | SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \ |
12 | file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \ | 12 | file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \ |
13 | file://0001-fix-broken-symlink-in-dracut-config-examples.patch \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | DEPENDS += "kmod" | 16 | DEPENDS += "kmod" |
diff --git a/meta-python/recipes-devtools/python/python3-pillow-heif/0001-setup.py-support-cross-compiling.patch b/meta-multimedia/recipes-devtools/python/python3-pillow-heif/0001-setup.py-support-cross-compiling.patch index 66cf7a9244..66cf7a9244 100644 --- a/meta-python/recipes-devtools/python/python3-pillow-heif/0001-setup.py-support-cross-compiling.patch +++ b/meta-multimedia/recipes-devtools/python/python3-pillow-heif/0001-setup.py-support-cross-compiling.patch | |||
diff --git a/meta-python/recipes-devtools/python/python3-pillow-heif_0.22.0.bb b/meta-multimedia/recipes-devtools/python/python3-pillow-heif_0.22.0.bb index 7f5dfac702..7f5dfac702 100644 --- a/meta-python/recipes-devtools/python/python3-pillow-heif_0.22.0.bb +++ b/meta-multimedia/recipes-devtools/python/python3-pillow-heif_0.22.0.bb | |||
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_3.6.bb b/meta-oe/recipes-connectivity/iwd/iwd_3.8.bb index eb464d486d..80e36054bd 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_3.6.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_3.8.bb | |||
@@ -9,7 +9,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ | |||
9 | file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ | 9 | file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ |
10 | file://iwd \ | 10 | file://iwd \ |
11 | " | 11 | " |
12 | SRC_URI[sha256sum] = "cc5e02068d7407b9dac000429d667af32e9d91c7bff3183a241d8fdb0f75734b" | 12 | SRC_URI[sha256sum] = "c556a5a5376270af68940e04e26765026fbbbe4941668317c274c91042611cdf" |
13 | 13 | ||
14 | inherit autotools manpages pkgconfig python3native systemd update-rc.d | 14 | inherit autotools manpages pkgconfig python3native systemd update-rc.d |
15 | 15 | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.15/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.16/oe-npm-cache index eb0f143eae..eb0f143eae 100755 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.15/oe-npm-cache +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.16/oe-npm-cache | |||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.15.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.16.bb index d4b818f967..d4b818f967 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.15.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.16.bb | |||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/zlib-fix-pointer-alignment.patch b/meta-oe/recipes-devtools/nodejs/nodejs/zlib-fix-pointer-alignment.patch deleted file mode 100644 index e372911193..0000000000 --- a/meta-oe/recipes-devtools/nodejs/nodejs/zlib-fix-pointer-alignment.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From dc035bbc9b310ff8067bc0dad22230978489c061 Mon Sep 17 00:00:00 2001 | ||
2 | From: jhofstee <jeroen@myspectrum.nl> | ||
3 | Date: Wed, 9 Apr 2025 12:24:13 +0200 | ||
4 | Subject: [PATCH] zlib: fix pointer alignment | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | The function AllocForBrotli prefixes the allocated memory with its | ||
10 | size, and returns a pointer to the region after it. This pointer can | ||
11 | however no longer be suitably aligned. Correct this by allocating | ||
12 | the maximum of the the size of the size_t and the max alignment. | ||
13 | |||
14 | On Arm 32bits the size_t is 4 bytes long, but the alignment is 8 for | ||
15 | some NEON instructions. When Brotli is compiled with optimizations | ||
16 | enabled newer GCC versions will use the NEON instructions and trigger | ||
17 | a bus error killing node. | ||
18 | |||
19 | see https://github.com/google/brotli/issues/1159 | ||
20 | |||
21 | PR-URL: https://github.com/nodejs/node/pull/57727 | ||
22 | Reviewed-By: Shelley Vohr <shelley.vohr@gmail.com> | ||
23 | Reviewed-By: Tobias Nießen <tniessen@tnie.de> | ||
24 | Reviewed-By: Daniel Lemire <daniel@lemire.me> | ||
25 | Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de> | ||
26 | |||
27 | Upstream-Status: Backport [https://github.com/nodejs/node/commit/dc035bbc9b310ff8067bc0dad22230978489c061] | ||
28 | --- | ||
29 | src/node_zlib.cc | 8 +++++--- | ||
30 | 1 file changed, 5 insertions(+), 3 deletions(-) | ||
31 | |||
32 | diff --git a/src/node_zlib.cc b/src/node_zlib.cc | ||
33 | index 0b7c47b326c7c5..7e6b38ecd1aa36 100644 | ||
34 | --- a/src/node_zlib.cc | ||
35 | +++ b/src/node_zlib.cc | ||
36 | @@ -608,7 +608,8 @@ class CompressionStream : public AsyncWrap, public ThreadPoolWork { | ||
37 | } | ||
38 | |||
39 | static void* AllocForBrotli(void* data, size_t size) { | ||
40 | - size += sizeof(size_t); | ||
41 | + constexpr size_t offset = std::max(sizeof(size_t), alignof(max_align_t)); | ||
42 | + size += offset; | ||
43 | CompressionStream* ctx = static_cast<CompressionStream*>(data); | ||
44 | char* memory = UncheckedMalloc(size); | ||
45 | if (memory == nullptr) [[unlikely]] { | ||
46 | @@ -617,7 +618,7 @@ class CompressionStream : public AsyncWrap, public ThreadPoolWork { | ||
47 | *reinterpret_cast<size_t*>(memory) = size; | ||
48 | ctx->unreported_allocations_.fetch_add(size, | ||
49 | std::memory_order_relaxed); | ||
50 | - return memory + sizeof(size_t); | ||
51 | + return memory + offset; | ||
52 | } | ||
53 | |||
54 | static void FreeForZlib(void* data, void* pointer) { | ||
55 | @@ -625,7 +626,8 @@ class CompressionStream : public AsyncWrap, public ThreadPoolWork { | ||
56 | return; | ||
57 | } | ||
58 | CompressionStream* ctx = static_cast<CompressionStream*>(data); | ||
59 | - char* real_pointer = static_cast<char*>(pointer) - sizeof(size_t); | ||
60 | + constexpr size_t offset = std::max(sizeof(size_t), alignof(max_align_t)); | ||
61 | + char* real_pointer = static_cast<char*>(pointer) - offset; | ||
62 | size_t real_size = *reinterpret_cast<size_t*>(real_pointer); | ||
63 | ctx->unreported_allocations_.fetch_sub(real_size, | ||
64 | std::memory_order_relaxed); | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_22.15.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb index 9798635ba2..c2bf3b6bd3 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_22.15.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb | |||
@@ -29,7 +29,6 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ | |||
29 | file://0001-deps-disable-io_uring-support-in-libuv.patch \ | 29 | file://0001-deps-disable-io_uring-support-in-libuv.patch \ |
30 | file://0001-positional-args.patch \ | 30 | file://0001-positional-args.patch \ |
31 | file://0001-custom-env.patch \ | 31 | file://0001-custom-env.patch \ |
32 | file://zlib-fix-pointer-alignment.patch \ | ||
33 | file://run-ptest \ | 32 | file://run-ptest \ |
34 | " | 33 | " |
35 | SRC_URI:append:class-target = " \ | 34 | SRC_URI:append:class-target = " \ |
@@ -38,7 +37,7 @@ SRC_URI:append:class-target = " \ | |||
38 | SRC_URI:append:toolchain-clang:powerpc64le = " \ | 37 | SRC_URI:append:toolchain-clang:powerpc64le = " \ |
39 | file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ | 38 | file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ |
40 | " | 39 | " |
41 | SRC_URI[sha256sum] = "c19f0177d21c621746625e5f37590bd0d79a72043b77b53784cba5f145e7263e" | 40 | SRC_URI[sha256sum] = "720894f323e5c1ac24968eb2676660c90730d715cb7f090be71a668662a17c37" |
42 | 41 | ||
43 | S = "${WORKDIR}/node-v${PV}" | 42 | S = "${WORKDIR}/node-v${PV}" |
44 | 43 | ||
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.52.bb b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.56.bb index 4553ac14e1..1d46ebf511 100644 --- a/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.52.bb +++ b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.56.bb | |||
@@ -11,7 +11,7 @@ LICENSE = "Zlib" | |||
11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=98241180d857fe975e4b60d44d6c01a5" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=98241180d857fe975e4b60d44d6c01a5" |
12 | 12 | ||
13 | SRC_URI = "http://www.libsdl.org/release/sdl2-compat-${PV}.tar.gz" | 13 | SRC_URI = "http://www.libsdl.org/release/sdl2-compat-${PV}.tar.gz" |
14 | SRC_URI[sha256sum] = "eb02c4c47d90e7a2585a65c712cf4a08ff4c37c0a1efc17af49d8ebde3292c23" | 14 | SRC_URI[sha256sum] = "27e845b1b7dc0a91a85f1a1f18892ed205adb38caf767741eb258008d8264de0" |
15 | S = "${WORKDIR}/sdl2-compat-${PV}" | 15 | S = "${WORKDIR}/sdl2-compat-${PV}" |
16 | 16 | ||
17 | DEPENDS += "libsdl3" | 17 | DEPENDS += "libsdl3" |
@@ -23,7 +23,7 @@ inherit cmake pkgconfig upstream-version-is-even features_check | |||
23 | REQUIRED_DISTRO_FEATURES = "opengl x11" | 23 | REQUIRED_DISTRO_FEATURES = "opengl x11" |
24 | 24 | ||
25 | do_install:append() { | 25 | do_install:append() { |
26 | mv ${D}${libdir}/pkgconfig/sdl2_compat.pc ${D}${libdir}/pkgconfig/sdl2.pc | 26 | mv ${D}${nonarch_libdir}/pkgconfig/sdl2-compat.pc ${D}${nonarch_libdir}/pkgconfig/sdl2.pc |
27 | } | 27 | } |
28 | 28 | ||
29 | FILES:${PN} += "${datadir}/licenses" | 29 | FILES:${PN} += "${datadir}/licenses" |
diff --git a/meta-oe/recipes-security/kernel-hardening-checker/kernel-hardening-checker_0.6.10.bb b/meta-oe/recipes-security/kernel-hardening-checker/kernel-hardening-checker_0.6.10.bb index 1daf5d8c70..f4816e733b 100644 --- a/meta-oe/recipes-security/kernel-hardening-checker/kernel-hardening-checker_0.6.10.bb +++ b/meta-oe/recipes-security/kernel-hardening-checker/kernel-hardening-checker_0.6.10.bb | |||
@@ -17,6 +17,8 @@ SRCREV = "f4dbe258ff3d37489962ea9cf210192ae7ff9280" | |||
17 | 17 | ||
18 | S = "${UNPACKDIR}/git" | 18 | S = "${UNPACKDIR}/git" |
19 | 19 | ||
20 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
21 | |||
20 | RDEPENDS:${PN} = "\ | 22 | RDEPENDS:${PN} = "\ |
21 | python3-json \ | 23 | python3-json \ |
22 | " | 24 | " |
diff --git a/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_0.46.bb b/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_0.46.bb index c6593ea742..40858258c3 100644 --- a/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_0.46.bb +++ b/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_0.46.bb | |||
@@ -26,7 +26,7 @@ RRECOMMENDS:${PN} = "\ | |||
26 | 26 | ||
27 | INHIBIT_DEFAULT_DEPS = "1" | 27 | INHIBIT_DEFAULT_DEPS = "1" |
28 | 28 | ||
29 | inherit allarch | 29 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
30 | 30 | ||
31 | do_compile[noexec] = "1" | 31 | do_compile[noexec] = "1" |
32 | 32 | ||
diff --git a/meta-oe/recipes-support/libsimplelog/libsimplelog_1.0.6.bb b/meta-oe/recipes-support/libsimplelog/libsimplelog_1.0.7.bb index 0aacbcd2cc..0302f7c89f 100644 --- a/meta-oe/recipes-support/libsimplelog/libsimplelog_1.0.6.bb +++ b/meta-oe/recipes-support/libsimplelog/libsimplelog_1.0.7.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=22cdd382a6275cb4c2e75c517952ac7c" | |||
7 | 7 | ||
8 | SRC_URI = "git://github.com/thuanalg/simplelog-topic.git;branch=main;protocol=https;tag=v${PV}" | 8 | SRC_URI = "git://github.com/thuanalg/simplelog-topic.git;branch=main;protocol=https;tag=v${PV}" |
9 | 9 | ||
10 | SRCREV = "7676b9cf871bedd8648d2cf68ebf43dc2c79b94d" | 10 | SRCREV = "edbe423bdd1b36faf30d2eeeb869e4c1755864de" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
diff --git a/meta-python/classes/distutils-common-base.bbclass b/meta-python/classes/distutils-common-base.bbclass deleted file mode 100644 index 59c750a3cf..0000000000 --- a/meta-python/classes/distutils-common-base.bbclass +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | export STAGING_INCDIR | ||
2 | export STAGING_LIBDIR | ||
3 | |||
4 | # LDSHARED is the ld *command* used to create shared library | ||
5 | export LDSHARED = "${CCLD} -shared" | ||
6 | # LDXXSHARED is the ld *command* used to create shared library of C++ | ||
7 | # objects | ||
8 | export LDCXXSHARED = "${CXX} -shared" | ||
9 | # CCSHARED are the C *flags* used to create objects to go into a shared | ||
10 | # library (module) | ||
11 | export CCSHARED = "-fPIC -DPIC" | ||
12 | # LINKFORSHARED are the flags passed to the $(CC) command that links | ||
13 | # the python executable | ||
14 | export LINKFORSHARED = "${SECURITY_CFLAGS} -Xlinker -export-dynamic" | ||
15 | |||
16 | FILES:${PN} += "${libdir}/* ${libdir}/${PYTHON_DIR}/*" | ||
17 | |||
18 | FILES:${PN}-staticdev += "\ | ||
19 | ${PYTHON_SITEPACKAGES_DIR}/*.a \ | ||
20 | " | ||
21 | FILES:${PN}-dev += "\ | ||
22 | ${datadir}/pkgconfig \ | ||
23 | ${libdir}/pkgconfig \ | ||
24 | ${PYTHON_SITEPACKAGES_DIR}/*.la \ | ||
25 | " | ||
26 | python __anonymous() { | ||
27 | bb.warn("distutils-common-base.bbclass is deprecated, please use setuptools3-base.bbclass instead") | ||
28 | } | ||
diff --git a/meta-python/classes/distutils3-base.bbclass b/meta-python/classes/distutils3-base.bbclass deleted file mode 100644 index d36b4c4a3e..0000000000 --- a/meta-python/classes/distutils3-base.bbclass +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | DEPENDS:append:class-target = " python3-native python3" | ||
2 | DEPENDS:append:class-nativesdk = " python3-native python3" | ||
3 | RDEPENDS:${PN} += "${@['', 'python3-core']['${CLASSOVERRIDE}' == 'class-target']}" | ||
4 | |||
5 | inherit distutils-common-base python3native python3targetconfig | ||
6 | |||
7 | python __anonymous() { | ||
8 | bb.warn("distutils3-base.bbclass is deprecated, please use setuptools3-base.bbclass instead") | ||
9 | } | ||
diff --git a/meta-python/classes/distutils3.bbclass b/meta-python/classes/distutils3.bbclass deleted file mode 100644 index 909415efa0..0000000000 --- a/meta-python/classes/distutils3.bbclass +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | inherit distutils3-base | ||
2 | |||
3 | B = "${WORKDIR}/build" | ||
4 | distutils_do_configure[cleandirs] = "${B}" | ||
5 | |||
6 | DISTUTILS_BUILD_ARGS ?= "" | ||
7 | DISTUTILS_INSTALL_ARGS ?= "--root=${D} \ | ||
8 | --prefix=${prefix} \ | ||
9 | --install-lib=${PYTHON_SITEPACKAGES_DIR} \ | ||
10 | --install-data=${datadir}" | ||
11 | |||
12 | DISTUTILS_PYTHON = "python3" | ||
13 | DISTUTILS_PYTHON:class-native = "nativepython3" | ||
14 | |||
15 | DISTUTILS_SETUP_PATH ?= "${S}" | ||
16 | |||
17 | python __anonymous() { | ||
18 | bb.warn("distutils3.bbclass is deprecated, please use setuptools3.bbclass instead") | ||
19 | } | ||
20 | |||
21 | distutils3_do_configure() { | ||
22 | : | ||
23 | } | ||
24 | |||
25 | distutils3_do_compile() { | ||
26 | cd ${DISTUTILS_SETUP_PATH} | ||
27 | NO_FETCH_BUILD=1 \ | ||
28 | STAGING_INCDIR=${STAGING_INCDIR} \ | ||
29 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | ||
30 | ${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py \ | ||
31 | build --build-base=${B} ${DISTUTILS_BUILD_ARGS} || \ | ||
32 | bbfatal_log "'python3 setup.py build ${DISTUTILS_BUILD_ARGS}' execution failed." | ||
33 | } | ||
34 | distutils3_do_compile[vardepsexclude] = "MACHINE" | ||
35 | |||
36 | distutils3_do_install() { | ||
37 | cd ${DISTUTILS_SETUP_PATH} | ||
38 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} | ||
39 | STAGING_INCDIR=${STAGING_INCDIR} \ | ||
40 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | ||
41 | PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ | ||
42 | ${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py \ | ||
43 | build --build-base=${B} install --skip-build ${DISTUTILS_INSTALL_ARGS} || \ | ||
44 | bbfatal_log "'python3 setup.py install ${DISTUTILS_INSTALL_ARGS}' execution failed." | ||
45 | |||
46 | # support filenames with *spaces* | ||
47 | find ${D} -name "*.py" -exec grep -q ${D} {} \; \ | ||
48 | -exec sed -i -e s:${D}::g {} \; | ||
49 | |||
50 | for i in ${D}${bindir}/* ${D}${sbindir}/*; do | ||
51 | if [ -f "$i" ]; then | ||
52 | sed -i -e s:${PYTHON}:${USRBINPATH}/env\ ${DISTUTILS_PYTHON}:g $i | ||
53 | sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i | ||
54 | fi | ||
55 | done | ||
56 | |||
57 | rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth | ||
58 | |||
59 | # | ||
60 | # FIXME: Bandaid against wrong datadir computation | ||
61 | # | ||
62 | if [ -e ${D}${datadir}/share ]; then | ||
63 | mv -f ${D}${datadir}/share/* ${D}${datadir}/ | ||
64 | rmdir ${D}${datadir}/share | ||
65 | fi | ||
66 | } | ||
67 | distutils3_do_install[vardepsexclude] = "MACHINE" | ||
68 | |||
69 | EXPORT_FUNCTIONS do_configure do_compile do_install | ||
70 | |||
71 | export LDSHARED="${CCLD} -shared" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pychromecast/0001-Update-setuptools-requirement-from-79.0-65.6-to-65.6.patch b/meta-python/recipes-devtools/python/python3-pychromecast/0001-Update-setuptools-requirement-from-79.0-65.6-to-65.6.patch new file mode 100644 index 0000000000..b0d4a88c8e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pychromecast/0001-Update-setuptools-requirement-from-79.0-65.6-to-65.6.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From ef27075e087e139921b99729a4ec7683e42c5c4a Mon Sep 17 00:00:00 2001 | ||
2 | From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> | ||
3 | Date: Mon, 21 Apr 2025 16:34:55 +0200 | ||
4 | Subject: [PATCH] Update setuptools requirement from <79.0,>=65.6 to | ||
5 | >=65.6,<80.0 (#1056) | ||
6 | |||
7 | Upstream-Status: Backport [https://github.com/home-assistant-libs/pychromecast/commit/ef27075e087e139921b99729a4ec7683e42c5c4a] | ||
8 | |||
9 | Updates the requirements on [setuptools](https://github.com/pypa/setuptools) to permit the latest version. | ||
10 | - [Release notes](https://github.com/pypa/setuptools/releases) | ||
11 | - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) | ||
12 | - [Commits](https://github.com/pypa/setuptools/compare/v65.6.0...v79.0.0) | ||
13 | |||
14 | --- | ||
15 | updated-dependencies: | ||
16 | - dependency-name: setuptools | ||
17 | dependency-version: 79.0.0 | ||
18 | dependency-type: direct:production | ||
19 | ... | ||
20 | |||
21 | Signed-off-by: dependabot[bot] <support@github.com> | ||
22 | Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | ||
23 | |||
24 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
25 | --- | ||
26 | pyproject.toml | 2 +- | ||
27 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
28 | |||
29 | diff --git a/pyproject.toml b/pyproject.toml | ||
30 | index 34f5dc0..88d67fe 100644 | ||
31 | --- a/pyproject.toml | ||
32 | +++ b/pyproject.toml | ||
33 | @@ -1,5 +1,5 @@ | ||
34 | [build-system] | ||
35 | -requires = ["setuptools>=65.6,<79.0", "wheel>=0.37.1,<0.46.0"] | ||
36 | +requires = ["setuptools>=65.6,<80.0", "wheel>=0.37.1,<0.46.0"] | ||
37 | build-backend = "setuptools.build_meta" | ||
38 | |||
39 | [project] | ||
40 | -- | ||
41 | 2.39.5 | ||
42 | |||
diff --git a/meta-python/recipes-devtools/python/python3-pychromecast/0001-Update-setuptools-requirement-from-80.0-65.6-to-65.6.patch b/meta-python/recipes-devtools/python/python3-pychromecast/0001-Update-setuptools-requirement-from-80.0-65.6-to-65.6.patch new file mode 100644 index 0000000000..8630c1632d --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pychromecast/0001-Update-setuptools-requirement-from-80.0-65.6-to-65.6.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 7017a1db10a21ed97b79800e31a2f7c70abbffc3 Mon Sep 17 00:00:00 2001 | ||
2 | From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> | ||
3 | Date: Mon, 28 Apr 2025 16:43:13 +0200 | ||
4 | Subject: [PATCH] Update setuptools requirement from <80.0,>=65.6 to | ||
5 | >=65.6,<81.0 (#1060) | ||
6 | |||
7 | Upstream-Status: Backport [https://github.com/home-assistant-libs/pychromecast/commit/7017a1db10a21ed97b79800e31a2f7c70abbffc3] | ||
8 | |||
9 | Updates the requirements on [setuptools](https://github.com/pypa/setuptools) to permit the latest version. | ||
10 | - [Release notes](https://github.com/pypa/setuptools/releases) | ||
11 | - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) | ||
12 | - [Commits](https://github.com/pypa/setuptools/compare/v65.6.0...v80.0.0) | ||
13 | |||
14 | --- | ||
15 | updated-dependencies: | ||
16 | - dependency-name: setuptools | ||
17 | dependency-version: 80.0.0 | ||
18 | dependency-type: direct:production | ||
19 | ... | ||
20 | |||
21 | Signed-off-by: dependabot[bot] <support@github.com> | ||
22 | Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | ||
23 | |||
24 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
25 | --- | ||
26 | pyproject.toml | 2 +- | ||
27 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
28 | |||
29 | diff --git a/pyproject.toml b/pyproject.toml | ||
30 | index 88d67fe..d5a518c 100644 | ||
31 | --- a/pyproject.toml | ||
32 | +++ b/pyproject.toml | ||
33 | @@ -1,5 +1,5 @@ | ||
34 | [build-system] | ||
35 | -requires = ["setuptools>=65.6,<80.0", "wheel>=0.37.1,<0.46.0"] | ||
36 | +requires = ["setuptools>=65.6,<81.0", "wheel>=0.37.1,<0.46.0"] | ||
37 | build-backend = "setuptools.build_meta" | ||
38 | |||
39 | [project] | ||
40 | -- | ||
41 | 2.39.5 | ||
42 | |||
diff --git a/meta-python/recipes-devtools/python/python3-pychromecast_14.0.7.bb b/meta-python/recipes-devtools/python/python3-pychromecast_14.0.7.bb index 7bae0721db..260f6395b7 100644 --- a/meta-python/recipes-devtools/python/python3-pychromecast_14.0.7.bb +++ b/meta-python/recipes-devtools/python/python3-pychromecast_14.0.7.bb | |||
@@ -3,7 +3,12 @@ HOMEPAGE = "https://github.com/balloob/pychromecast" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" |
5 | 5 | ||
6 | SRC_URI += "file://0001-Update-setuptools-requirement-from-78.0-65.6-to-65.6.patch" | 6 | SRC_URI += "\ |
7 | file://0001-Update-setuptools-requirement-from-78.0-65.6-to-65.6.patch \ | ||
8 | file://0001-Update-setuptools-requirement-from-79.0-65.6-to-65.6.patch \ | ||
9 | file://0001-Update-setuptools-requirement-from-80.0-65.6-to-65.6.patch \ | ||
10 | " | ||
11 | |||
7 | SRC_URI[sha256sum] = "7abbae80a2c9e05b93b1a7b8b4d771bbc764d88fd5e56a566f46ac1bd3f93848" | 12 | SRC_URI[sha256sum] = "7abbae80a2c9e05b93b1a7b8b4d771bbc764d88fd5e56a566f46ac1bd3f93848" |
8 | 13 | ||
9 | inherit pypi python_setuptools_build_meta | 14 | inherit pypi python_setuptools_build_meta |