[OE-core] [PATCH] libva-utils: upgrade 2.10.0 -> 2.11.1
Signed-off-by: Zheng Ruoqin --- .../libva/{libva-utils_2.10.0.bb => libva-utils_2.11.1.bb}| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/libva/{libva-utils_2.10.0.bb => libva-utils_2.11.1.bb} (90%) diff --git a/meta/recipes-graphics/libva/libva-utils_2.10.0.bb b/meta/recipes-graphics/libva/libva-utils_2.11.1.bb similarity index 90% rename from meta/recipes-graphics/libva/libva-utils_2.10.0.bb rename to meta/recipes-graphics/libva/libva-utils_2.11.1.bb index 828f4fb317..096d80b68d 100644 --- a/meta/recipes-graphics/libva/libva-utils_2.10.0.bb +++ b/meta/recipes-graphics/libva/libva-utils_2.11.1.bb @@ -14,8 +14,8 @@ SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" -SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.10-branch" -SRCREV = "f112ee75fcd1472131b20f901b93f6ac1d293fad" +SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.11-branch" +SRCREV = "c0145a895ebe9b24cde5c441733f90482f1e3d71" S = "${WORKDIR}/git" UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))$" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150287): https://lists.openembedded.org/g/openembedded-core/message/150287 Mute This Topic: https://lists.openembedded.org/mt/81935562/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] ruby: upgrade 3.0.0 -> 3.0.1
Signed-off-by: Zheng Ruoqin --- meta/recipes-devtools/ruby/{ruby_3.0.0.bb => ruby_3.0.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/ruby/{ruby_3.0.0.bb => ruby_3.0.1.bb} (97%) diff --git a/meta/recipes-devtools/ruby/ruby_3.0.0.bb b/meta/recipes-devtools/ruby/ruby_3.0.1.bb similarity index 97% rename from meta/recipes-devtools/ruby/ruby_3.0.0.bb rename to meta/recipes-devtools/ruby/ruby_3.0.1.bb index 28e12c3cd7..944cb81c1d 100644 --- a/meta/recipes-devtools/ruby/ruby_3.0.0.bb +++ b/meta/recipes-devtools/ruby/ruby_3.0.1.bb @@ -8,7 +8,7 @@ SRC_URI += " \ file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \ " -SRC_URI[sha256sum] = "a13ed141a1c18eb967aac1e33f4d6ad5f21be1ac543c344e0d6f54af8e28" +SRC_URI[sha256sum] = "369825db2199f6aeef16b408df6a04ebaddb664fb9af0ec8c686b0ce7ab77727" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150286): https://lists.openembedded.org/g/openembedded-core/message/150286 Mute This Topic: https://lists.openembedded.org/mt/81935559/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] libva: upgrade 2.10.0 -> 2.11.0
Signed-off-by: Zheng Ruoqin --- .../libva/{libva-initial_2.10.0.bb => libva-initial_2.11.0.bb} | 0 meta/recipes-graphics/libva/libva.inc | 2 +- .../recipes-graphics/libva/{libva_2.10.0.bb => libva_2.11.0.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/libva/{libva-initial_2.10.0.bb => libva-initial_2.11.0.bb} (100%) rename meta/recipes-graphics/libva/{libva_2.10.0.bb => libva_2.11.0.bb} (100%) diff --git a/meta/recipes-graphics/libva/libva-initial_2.10.0.bb b/meta/recipes-graphics/libva/libva-initial_2.11.0.bb similarity index 100% rename from meta/recipes-graphics/libva/libva-initial_2.10.0.bb rename to meta/recipes-graphics/libva/libva-initial_2.11.0.bb diff --git a/meta/recipes-graphics/libva/libva.inc b/meta/recipes-graphics/libva/libva.inc index d251afa125..43d916cd1c 100644 --- a/meta/recipes-graphics/libva/libva.inc +++ b/meta/recipes-graphics/libva/libva.inc @@ -18,7 +18,7 @@ LICENSE = "MIT" SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2; LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" -SRC_URI[sha256sum] = "fa81e35b50d9818fce5ec9ff08a24a8864ceeb9a5c8e7ae4446eacfc0236" +SRC_URI[sha256sum] = "6e361117038b571ad4741d38c9280db8c140b17e76e8c01fc7a4d608d3ed7d5d" S = "${WORKDIR}/libva-${PV}" diff --git a/meta/recipes-graphics/libva/libva_2.10.0.bb b/meta/recipes-graphics/libva/libva_2.11.0.bb similarity index 100% rename from meta/recipes-graphics/libva/libva_2.10.0.bb rename to meta/recipes-graphics/libva/libva_2.11.0.bb -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150285): https://lists.openembedded.org/g/openembedded-core/message/150285 Mute This Topic: https://lists.openembedded.org/mt/81935551/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] go: upgrade 1.16.2 -> 1.16.3
Signed-off-by: Wang Mingyu --- meta/recipes-devtools/go/{go-1.16.2.inc => go-1.16.3.inc} | 4 ++-- ...{go-binary-native_1.16.2.bb => go-binary-native_1.16.3.bb} | 2 +- ...o-cross-canadian_1.16.2.bb => go-cross-canadian_1.16.3.bb} | 0 .../go/{go-cross_1.16.2.bb => go-cross_1.16.3.bb} | 0 .../go/{go-crosssdk_1.16.2.bb => go-crosssdk_1.16.3.bb} | 0 .../go/{go-native_1.16.2.bb => go-native_1.16.3.bb} | 0 .../go/{go-runtime_1.16.2.bb => go-runtime_1.16.3.bb} | 0 meta/recipes-devtools/go/{go_1.16.2.bb => go_1.16.3.bb} | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/go/{go-1.16.2.inc => go-1.16.3.inc} (88%) rename meta/recipes-devtools/go/{go-binary-native_1.16.2.bb => go-binary-native_1.16.3.bb} (91%) rename meta/recipes-devtools/go/{go-cross-canadian_1.16.2.bb => go-cross-canadian_1.16.3.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.16.2.bb => go-cross_1.16.3.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.16.2.bb => go-crosssdk_1.16.3.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.16.2.bb => go-native_1.16.3.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.16.2.bb => go-runtime_1.16.3.bb} (100%) rename meta/recipes-devtools/go/{go_1.16.2.bb => go_1.16.3.bb} (100%) diff --git a/meta/recipes-devtools/go/go-1.16.2.inc b/meta/recipes-devtools/go/go-1.16.3.inc similarity index 88% rename from meta/recipes-devtools/go/go-1.16.2.inc rename to meta/recipes-devtools/go/go-1.16.3.inc index e65caf8197..48a8ff5818 100644 --- a/meta/recipes-devtools/go/go-1.16.2.inc +++ b/meta/recipes-devtools/go/go-1.16.3.inc @@ -1,7 +1,7 @@ require go-common.inc GO_BASEVERSION = "1.16" -PV = "1.16.2" +PV = "1.16.3" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" @@ -17,4 +17,4 @@ SRC_URI += "\ file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ file://0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch \ " -SRC_URI[main.sha256sum] = "37ca14287a23cb8ba2ac3f5c3dd8adbc1f7a54b9701a57824bf19a0b271f83ea" +SRC_URI[main.sha256sum] = "951a3c7c6ce4e56ad883f97d9db74d3d6d80d5fec77455c6ada6c1f7ac4776d2" diff --git a/meta/recipes-devtools/go/go-binary-native_1.16.2.bb b/meta/recipes-devtools/go/go-binary-native_1.16.3.bb similarity index 91% rename from meta/recipes-devtools/go/go-binary-native_1.16.2.bb rename to meta/recipes-devtools/go/go-binary-native_1.16.3.bb index 4fb060173c..97c0743e1c 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.16.2.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.16.3.bb @@ -8,7 +8,7 @@ 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] = "542e936b19542e62679766194364f45141fde55169db2d8d01046555ca9eb4b8" +SRC_URI[go_linux_amd64.sha256sum] = "951a3c7c6ce4e56ad883f97d9db74d3d6d80d5fec77455c6ada6c1f7ac4776d2" SRC_URI[go_linux_arm64.sha256sum] = "6924601d998a0917694fd14261347e3798bd2ad6b13c4d7f2edd70c9d57f62ab" UPSTREAM_CHECK_URI = "https://golang.org/dl/; diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.16.2.bb b/meta/recipes-devtools/go/go-cross-canadian_1.16.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.16.2.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.16.3.bb diff --git a/meta/recipes-devtools/go/go-cross_1.16.2.bb b/meta/recipes-devtools/go/go-cross_1.16.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.16.2.bb rename to meta/recipes-devtools/go/go-cross_1.16.3.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.16.2.bb b/meta/recipes-devtools/go/go-crosssdk_1.16.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.16.2.bb rename to meta/recipes-devtools/go/go-crosssdk_1.16.3.bb diff --git a/meta/recipes-devtools/go/go-native_1.16.2.bb b/meta/recipes-devtools/go/go-native_1.16.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-native_1.16.2.bb rename to meta/recipes-devtools/go/go-native_1.16.3.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.16.2.bb b/meta/recipes-devtools/go/go-runtime_1.16.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.16.2.bb rename to meta/recipes-devtools/go/go-runtime_1.16.3.bb diff --git a/meta/recipes-devtools/go/go_1.16.2.bb b/meta/recipes-devtools/go/go_1.16.3.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.16.2.bb rename to meta/recipes-devtools/go/go_1.16.3.bb -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150284): https://lists.openembedded.org/g/openembedded-core/message/150284 Mute This Topic: https://lists.openembedded.org/mt/81935523/21656 Group Owner:
[OE-core] [PATCH] curl: upgrade 7.75.0 -> 7.76.0
Signed-off-by: Wang Mingyu --- meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/curl/{curl_7.75.0.bb => curl_7.76.0.bb} (97%) diff --git a/meta/recipes-support/curl/curl_7.75.0.bb b/meta/recipes-support/curl/curl_7.76.0.bb similarity index 97% rename from meta/recipes-support/curl/curl_7.75.0.bb rename to meta/recipes-support/curl/curl_7.76.0.bb index 7666c7b608..68315d9f77 100644 --- a/meta/recipes-support/curl/curl_7.75.0.bb +++ b/meta/recipes-support/curl/curl_7.76.0.bb @@ -13,7 +13,7 @@ SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ " -SRC_URI[sha256sum] = "50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026" +SRC_URI[sha256sum] = "e29bfe3633701590d75b0071bbb649ee5ca4ca73f00649268bd389639531c49a" # Curl has used many names over the years... CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150282): https://lists.openembedded.org/g/openembedded-core/message/150282 Mute This Topic: https://lists.openembedded.org/mt/81935521/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] file: upgrade 5.39 -> 5.40
0001-src-compress.c-correct-header-define-for-xz-lzma.patch removed since it is included in 5.40 Signed-off-by: Wang Mingyu --- .../file/{file_5.39.bb => file_5.40.bb} | 5 ++-- c-correct-header-define-for-xz-lzma.patch | 27 --- 2 files changed, 2 insertions(+), 30 deletions(-) rename meta/recipes-devtools/file/{file_5.39.bb => file_5.40.bb} (90%) delete mode 100644 meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch diff --git a/meta/recipes-devtools/file/file_5.39.bb b/meta/recipes-devtools/file/file_5.40.bb similarity index 90% rename from meta/recipes-devtools/file/file_5.39.bb rename to meta/recipes-devtools/file/file_5.40.bb index abaa8149a3..ec79839bd2 100644 --- a/meta/recipes-devtools/file/file_5.39.bb +++ b/meta/recipes-devtools/file/file_5.40.bb @@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdd DEPENDS = "file-replacement-native" DEPENDS_class-native = "bzip2-replacement-native" -SRC_URI = "git://github.com/file/file.git \ - file://0001-src-compress.c-correct-header-define-for-xz-lzma.patch" +SRC_URI = "git://github.com/file/file.git" -SRCREV = "87731415de945660b00f02207d8e9d986ef9b82e" +SRCREV = "f49fda6f52a9477d817dbd9c06afab02daf025f8" S = "${WORKDIR}/git" inherit autotools update-alternatives diff --git a/meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch b/meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch deleted file mode 100644 index f8ba2f6153..00 --- a/meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ffb6ebdb42590cb9f7d3f5177b7b820a9edc4c81 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sun, 18 Oct 2020 23:40:42 +0200 -Subject: [PATCH] src/compress.c: correct header define for xz/lzma - -Upstream-Status: Submitted [https://github.com/file/file/pull/98] -Signed-off-by: Alexander Kanavin - src/compress.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/compress.c b/src/compress.c -index 67f21583..9670b72c 100644 a/src/compress.c -+++ b/src/compress.c -@@ -71,7 +71,7 @@ typedef void (*sig_t)(int); - #include - #endif - --#if defined(HAVE_XZLIB_H) && defined(XZLIBSUPPORT) -+#if defined(HAVE_LZMA_H) && defined(XZLIBSUPPORT) - #define BUILTIN_XZLIB - #include - #endif --- -2.28.0 - -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150283): https://lists.openembedded.org/g/openembedded-core/message/150283 Mute This Topic: https://lists.openembedded.org/mt/81935522/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] acpica: upgrade 20210105 -> 20210331
Signed-off-by: Wang Mingyu --- .../acpica/{acpica_20210105.bb => acpica_20210331.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/acpica/{acpica_20210105.bb => acpica_20210331.bb} (94%) diff --git a/meta/recipes-extended/acpica/acpica_20210105.bb b/meta/recipes-extended/acpica/acpica_20210331.bb similarity index 94% rename from meta/recipes-extended/acpica/acpica_20210105.bb rename to meta/recipes-extended/acpica/acpica_20210331.bb index 0188dc8a1b..e17bc94c39 100644 --- a/meta/recipes-extended/acpica/acpica_20210105.bb +++ b/meta/recipes-extended/acpica/acpica_20210331.bb @@ -17,7 +17,7 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" DEPENDS = "m4-native flex-native bison-native" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz; -SRC_URI[sha256sum] = "a9be7b749025e60f93fde2fe531bfe0d84a33641d3e0c9b0f6049f996dbb1ff8" +SRC_URI[sha256sum] = "b49237a2c3df58b57310612ec3a6ebee69e1a525b5efeec7152faf32a03b7068" UPSTREAM_CHECK_URI = "https://acpica.org/downloads; -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150281): https://lists.openembedded.org/g/openembedded-core/message/150281 Mute This Topic: https://lists.openembedded.org/mt/81935520/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][PATCH V2] busybox: fix CVE-2021-28831
Backport patch to fix CVE-2021-28831. Signed-off-by: Chen Qi --- ...ss_gunzip-Fix-DoS-if-gzip-is-corrupt.patch | 58 +++ meta/recipes-core/busybox/busybox_1.33.0.bb | 3 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch diff --git a/meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch b/meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch new file mode 100644 index 00..67c9f189cc --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch @@ -0,0 +1,58 @@ +From fe791386ebc270219ca00406c9fdadc5130b64ee Mon Sep 17 00:00:00 2001 +From: Samuel Sapalski +Date: Wed, 3 Mar 2021 16:31:22 +0100 +Subject: [PATCH] decompress_gunzip: Fix DoS if gzip is corrupt + +On certain corrupt gzip files, huft_build will set the error bit on +the result pointer. If afterwards abort_unzip is called huft_free +might run into a segmentation fault or an invalid pointer to +free(p). + +In order to mitigate this, we check in huft_free if the error bit +is set and clear it before the linked list is freed. + +Signed-off-by: Samuel Sapalski +Signed-off-by: Peter Kaestle +Signed-off-by: Denys Vlasenko + +Upstream-Status: Backport +CVE: CVE-2021-28831 +Signed-off-by: Chen Qi +--- + archival/libarchive/decompress_gunzip.c | 12 ++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c +index eb3b64930..e93cd5005 100644 +--- a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c +@@ -220,10 +220,20 @@ static const uint8_t border[] ALIGN1 = { + * each table. + * t: table to free + */ ++#define BAD_HUFT(p) ((uintptr_t)(p) & 1) ++#define ERR_RET ((huft_t*)(uintptr_t)1) + static void huft_free(huft_t *p) + { + huft_t *q; + ++ /* ++ * If 'p' has the error bit set we have to clear it, otherwise we might run ++ * into a segmentation fault or an invalid pointer to free(p) ++ */ ++ if (BAD_HUFT(p)) { ++ p = (huft_t*)((uintptr_t)(p) ^ (uintptr_t)(ERR_RET)); ++ } ++ + /* Go through linked list, freeing from the malloced (t[-1]) address. */ + while (p) { + q = (--p)->v.t; +@@ -289,8 +299,6 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current + * or a valid pointer to a Huffman table, ORed with 0x1 if incompete table + * is given: "fixed inflate" decoder feeds us such data. + */ +-#define BAD_HUFT(p) ((uintptr_t)(p) & 1) +-#define ERR_RET ((huft_t*)(uintptr_t)1) + static huft_t* huft_build(const unsigned *b, const unsigned n, + const unsigned s, const struct cp_ext *cp_ext, + unsigned *m) diff --git a/meta/recipes-core/busybox/busybox_1.33.0.bb b/meta/recipes-core/busybox/busybox_1.33.0.bb index 1a3f218bca..58e9cf7fce 100644 --- a/meta/recipes-core/busybox/busybox_1.33.0.bb +++ b/meta/recipes-core/busybox/busybox_1.33.0.bb @@ -46,7 +46,8 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ file://rev.cfg \ file://pgrep.cfg \ -" + file://0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch \ + " SRC_URI_append_libc-musl = " file://musl.cfg " SRC_URI[tarball.sha256sum] = "d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150280): https://lists.openembedded.org/g/openembedded-core/message/150280 Mute This Topic: https://lists.openembedded.org/mt/81935059/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][PATCH] busybox: fix CVE-2021-28831
Sorry, please ignore this patch. On 04/08/2021 12:46 PM, Chen Qi wrote: Signed-off-by: Chen Qi --- ...ss_gunzip-Fix-DoS-if-gzip-is-corrupt.patch | 57 +++ meta/recipes-core/busybox/busybox_1.33.0.bb | 9 ++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch diff --git a/meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch b/meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch new file mode 100644 index 00..e8e9a8380e --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch @@ -0,0 +1,57 @@ +From fe791386ebc270219ca00406c9fdadc5130b64ee Mon Sep 17 00:00:00 2001 +From: Samuel Sapalski +Date: Wed, 3 Mar 2021 16:31:22 +0100 +Subject: [PATCH] decompress_gunzip: Fix DoS if gzip is corrupt + +On certain corrupt gzip files, huft_build will set the error bit on +the result pointer. If afterwards abort_unzip is called huft_free +might run into a segmentation fault or an invalid pointer to +free(p). + +In order to mitigate this, we check in huft_free if the error bit +is set and clear it before the linked list is freed. + +Signed-off-by: Samuel Sapalski +Signed-off-by: Peter Kaestle +Signed-off-by: Denys Vlasenko +Upstream-Status: Backport +CVE: CVE-2021-28831 +Signed-off-by: Chen Qi +--- + archival/libarchive/decompress_gunzip.c | 12 ++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c +index eb3b64930..e93cd5005 100644 +--- a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c +@@ -220,10 +220,20 @@ static const uint8_t border[] ALIGN1 = { + * each table. + * t: table to free + */ ++#define BAD_HUFT(p) ((uintptr_t)(p) & 1) ++#define ERR_RET ((huft_t*)(uintptr_t)1) + static void huft_free(huft_t *p) + { + huft_t *q; + ++ /* ++ * If 'p' has the error bit set we have to clear it, otherwise we might run ++ * into a segmentation fault or an invalid pointer to free(p) ++ */ ++ if (BAD_HUFT(p)) { ++ p = (huft_t*)((uintptr_t)(p) ^ (uintptr_t)(ERR_RET)); ++ } ++ + /* Go through linked list, freeing from the malloced (t[-1]) address. */ + while (p) { + q = (--p)->v.t; +@@ -289,8 +299,6 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current + * or a valid pointer to a Huffman table, ORed with 0x1 if incompete table + * is given: "fixed inflate" decoder feeds us such data. + */ +-#define BAD_HUFT(p) ((uintptr_t)(p) & 1) +-#define ERR_RET ((huft_t*)(uintptr_t)1) + static huft_t* huft_build(const unsigned *b, const unsigned n, + const unsigned s, const struct cp_ext *cp_ext, + unsigned *m) diff --git a/meta/recipes-core/busybox/busybox_1.33.0.bb b/meta/recipes-core/busybox/busybox_1.33.0.bb index 1a3f218bca..4fcf533aa8 100644 --- a/meta/recipes-core/busybox/busybox_1.33.0.bb +++ b/meta/recipes-core/busybox/busybox_1.33.0.bb @@ -46,7 +46,14 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ file://rev.cfg \ file://pgrep.cfg \ -" + file://lspci.cfg \ + file://lsusb.cfg \ + file://mdev.cfg \ + file://mount-cifs.cfg \ + file://ps-extras.cfg \ + file://getopt.cfg \ + file://0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch \ + " SRC_URI_append_libc-musl = " file://musl.cfg " SRC_URI[tarball.sha256sum] = "d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd" -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150279): https://lists.openembedded.org/g/openembedded-core/message/150279 Mute This Topic: https://lists.openembedded.org/mt/81934993/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][PATCH] busybox: fix CVE-2021-28831
Signed-off-by: Chen Qi --- ...ss_gunzip-Fix-DoS-if-gzip-is-corrupt.patch | 57 +++ meta/recipes-core/busybox/busybox_1.33.0.bb | 9 ++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch diff --git a/meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch b/meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch new file mode 100644 index 00..e8e9a8380e --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch @@ -0,0 +1,57 @@ +From fe791386ebc270219ca00406c9fdadc5130b64ee Mon Sep 17 00:00:00 2001 +From: Samuel Sapalski +Date: Wed, 3 Mar 2021 16:31:22 +0100 +Subject: [PATCH] decompress_gunzip: Fix DoS if gzip is corrupt + +On certain corrupt gzip files, huft_build will set the error bit on +the result pointer. If afterwards abort_unzip is called huft_free +might run into a segmentation fault or an invalid pointer to +free(p). + +In order to mitigate this, we check in huft_free if the error bit +is set and clear it before the linked list is freed. + +Signed-off-by: Samuel Sapalski +Signed-off-by: Peter Kaestle +Signed-off-by: Denys Vlasenko +Upstream-Status: Backport +CVE: CVE-2021-28831 +Signed-off-by: Chen Qi +--- + archival/libarchive/decompress_gunzip.c | 12 ++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c +index eb3b64930..e93cd5005 100644 +--- a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c +@@ -220,10 +220,20 @@ static const uint8_t border[] ALIGN1 = { + * each table. + * t: table to free + */ ++#define BAD_HUFT(p) ((uintptr_t)(p) & 1) ++#define ERR_RET ((huft_t*)(uintptr_t)1) + static void huft_free(huft_t *p) + { + huft_t *q; + ++ /* ++ * If 'p' has the error bit set we have to clear it, otherwise we might run ++ * into a segmentation fault or an invalid pointer to free(p) ++ */ ++ if (BAD_HUFT(p)) { ++ p = (huft_t*)((uintptr_t)(p) ^ (uintptr_t)(ERR_RET)); ++ } ++ + /* Go through linked list, freeing from the malloced (t[-1]) address. */ + while (p) { + q = (--p)->v.t; +@@ -289,8 +299,6 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current + * or a valid pointer to a Huffman table, ORed with 0x1 if incompete table + * is given: "fixed inflate" decoder feeds us such data. + */ +-#define BAD_HUFT(p) ((uintptr_t)(p) & 1) +-#define ERR_RET ((huft_t*)(uintptr_t)1) + static huft_t* huft_build(const unsigned *b, const unsigned n, + const unsigned s, const struct cp_ext *cp_ext, + unsigned *m) diff --git a/meta/recipes-core/busybox/busybox_1.33.0.bb b/meta/recipes-core/busybox/busybox_1.33.0.bb index 1a3f218bca..4fcf533aa8 100644 --- a/meta/recipes-core/busybox/busybox_1.33.0.bb +++ b/meta/recipes-core/busybox/busybox_1.33.0.bb @@ -46,7 +46,14 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ file://rev.cfg \ file://pgrep.cfg \ -" + file://lspci.cfg \ + file://lsusb.cfg \ + file://mdev.cfg \ + file://mount-cifs.cfg \ + file://ps-extras.cfg \ + file://getopt.cfg \ + file://0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch \ + " SRC_URI_append_libc-musl = " file://musl.cfg " SRC_URI[tarball.sha256sum] = "d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150278): https://lists.openembedded.org/g/openembedded-core/message/150278 Mute This Topic: https://lists.openembedded.org/mt/81934993/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] libxshmfence: Build fixes for riscv32
On 4/8/21 1:15 AM, Khem Raj wrote: [Please note: This e-mail is from an EXTERNAL e-mail address] On Wed, Apr 7, 2021 at 1:08 AM Yu, Mingli wrote: From: Mingli Yu NR_futex is not defined by newer architectures e.g. riscv32 as they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on __NR_futex, since this is used in applications, such applications start to fail to build for these newer architectures. Define a fallback to alias __NR_futex to __NR_futex_time64 to make SYS_futex keep working. Reference: https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7 Signed-off-by: Mingli Yu --- ...h-Define-SYS_futex-if-it-does-not-ex.patch | 39 +++ .../xorg-lib/libxshmfence_1.3.bb | 4 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch new file mode 100644 index 00..3e87794d20 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch @@ -0,0 +1,39 @@ +From 5827f6389a227157958d14a687fb29223cb3a03a Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 7 Apr 2021 07:48:42 + +Subject: [PATCH] xshmfence_futex.h: Define SYS_futex if it does not exist + +_NR_futex is not defines by newer architectures e.g. riscv32 as +they only have 64bit variant of time_t. Glibc defines SYS_futex +interface based on __NR_futex, since this is used in applications, +such applications start to fail to build for these newer architectures. +This patch defines a fallback to alias __NR_futex to __NR_futex_time64 +to make SYS_futex keep working. + +Reference: https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7 + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + src/xshmfence_futex.h | 4 + 1 file changed, 4 insertions(+) + +diff --git a/src/xshmfence_futex.h b/src/xshmfence_futex.h +index 673ac0e..a71efa5 100644 +--- a/src/xshmfence_futex.h b/src/xshmfence_futex.h +@@ -53,6 +53,10 @@ static inline int futex_wait(int32_t *addr, int32_t value) { + #include + #include + ++#if !defined(SYS_futex) && defined(SYS_futex_time64) ++#define SYS_futex SYS_futex_time64 ++#endif ++ + static inline long sys_futex(void *addr1, int op, int val1, struct timespec *timeout, void *addr2, int val3) + { + return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); +-- +2.29.2 + diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index cc45696530..d153c7a603 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -13,7 +13,9 @@ DEPENDS += "virtual/libx11" EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" -BBCLASSEXTEND = "native nativesdk" +SRC_URI += "file://0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch" SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937" SRC_URI[sha256sum] = "b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7" + +BBCLASSEXTEND = "native nativesdk" can you also. send a pull to meta-riscv to remove it from there ? Sure, will send the patch to meta-riscv once this patch in oe-core is merged. Thanks, -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150277): https://lists.openembedded.org/g/openembedded-core/message/150277 Mute This Topic: https://lists.openembedded.org/mt/81910708/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/2] Revert "externalsrc: Detect code changes in submodules"
This reverts commit 4525310d49d115a37705f04ac5c03d639e5e8f8c. Signed-off-by: Douglas Royds --- meta/classes/externalsrc.bbclass | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass index 54cc7edbae0..c7b2bf2f49a 100644 --- a/meta/classes/externalsrc.bbclass +++ b/meta/classes/externalsrc.bbclass @@ -217,16 +217,14 @@ def srctree_hash_files(d, srcdir=None): env['GIT_INDEX_FILE'] = tmp_index.name subprocess.check_output(['git', 'add', '-A', '.'], cwd=s_dir, env=env) git_sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env).decode("utf-8") -submodule_helper = subprocess.check_output(['git', 'submodule', 'status'], cwd=s_dir, env=env).decode("utf-8") +submodule_helper = subprocess.check_output(['git', 'submodule--helper', 'list'], cwd=s_dir, env=env).decode("utf-8") for line in submodule_helper.splitlines(): -module_relpath = line.split()[1] -if not module_relpath.split('/')[0] == '..': -module_dir = os.path.join(s_dir, module_relpath) -proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) -proc.communicate() -proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) -stdout, _ = proc.communicate() -git_sha1 += stdout.decode("utf-8") +module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1]) +proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) +proc.communicate() +proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) +stdout, _ = proc.communicate() +git_sha1 += stdout.decode("utf-8") sha1 = hashlib.sha1(git_sha1.encode("utf-8")).hexdigest() with open(oe_hash_file, 'w') as fobj: fobj.write(sha1) -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150276): https://lists.openembedded.org/g/openembedded-core/message/150276 Mute This Topic: https://lists.openembedded.org/mt/81932011/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 0/2] externalsrc: Detect code changes in submodules
Further to 50ff9afb39, only detect code changes in submodules that are subdirectories of the EXTERNALSRC directory. The (undocumented) git submodule--helper returns a path for each submodule relative to the top of the repo. Don't add submodules that are not within our EXTERNALSRC subtree. If we unpack one git repo inside another, like this: SRC_URI = "git://${GIT_SERVER}/repo1;name=repo1;destsuffix=repo1 \ git://${GIT_SERVER}/repo2;name=repo2;destsuffix=repo1/repo2 \ " Git status reports, for repo1: Untracked files: (use "git add ..." to include in what will be committed) repo2/ If we run `devtool modify` on this recipe, do_patch runs with: PATCHTOOL = "git" PATCH_COMMIT_FUNCTIONS = "1" The `patch_task_postfunc` (patch.bbclass, line 82) runs a `git add .` on the top-level repo1, leaving the checkout in an invalid state. The following git warning does not appear in the log: $ git add . warning: adding embedded git repository: repo2 hint: You've added another git repository inside your current repository. hint: Clones of the outer repository will not contain the contents of hint: the embedded repository and will not know how to obtain it. hint: If you meant to add a submodule, use: hint: hint: git submodule add repo2 hint: hint: If you added this path by mistake, you can remove it from the hint: index with: hint: hint: git rm --cached repo2 hint: hint: See "git help submodule" for more information. $ git submodule status fatal: no submodule mapping found in .gitmodules for path 'repo2' No further git submodule commands can be run on the checkout. We could enhance the `patch_task_postfunc` to look for any embedded git checkouts and add them as submodules, but this seems unnecessary complexity for an obscure edge-case. Although the git repo is left in an invalid state with respect to the submodules, it still serves the purpose required by devtool: To take further commits, and generate patch files from them. We are still able to run these commands to examine any submodules, where git submodule--helper reports paths relative to the top of the checkout: $ git ls-files --stage | grep ^16 16 5feee12d6e974dd8c0614cf5b593380b046439a5 0 repo2 $ git submodule--helper list 16 5feee12d6e974dd8c0614cf5b593380b046439a5 0 repo2 When a recipe sets EXTERNALSRC to a subdirectory of the git checkout, we test for the existence of the reported submodule paths within the EXTERNALSRC directory. The latest versions of git submodule--helper accept a path to a subdirectory and correctly report no submodules within that subdirectory. Regrettably, we still support git versions that don't accept a path to a subdirectory. [YOCTO #14333] Douglas Royds (2): Revert "externalsrc: Detect code changes in submodules" externalsrc: Detect code changes in submodules meta/classes/externalsrc.bbclass | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150274): https://lists.openembedded.org/g/openembedded-core/message/150274 Mute This Topic: https://lists.openembedded.org/mt/81932009/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/2] externalsrc: Detect code changes in submodules
Further to 50ff9afb39, only detect code changes in submodules that are subdirectories of the EXTERNALSRC directory. The (undocumented) git submodule--helper returns a path for each submodule relative to the top of the repo. Don't add submodules that are not within our source subtree. [YOCTO #14333] Signed-off-by: Douglas Royds --- meta/classes/externalsrc.bbclass | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass index c7b2bf2f49a..3d6b80bee2b 100644 --- a/meta/classes/externalsrc.bbclass +++ b/meta/classes/externalsrc.bbclass @@ -220,11 +220,12 @@ def srctree_hash_files(d, srcdir=None): submodule_helper = subprocess.check_output(['git', 'submodule--helper', 'list'], cwd=s_dir, env=env).decode("utf-8") for line in submodule_helper.splitlines(): module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1]) -proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) -proc.communicate() -proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) -stdout, _ = proc.communicate() -git_sha1 += stdout.decode("utf-8") +if os.path.isdir(module_dir): +proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) +proc.communicate() +proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) +stdout, _ = proc.communicate() +git_sha1 += stdout.decode("utf-8") sha1 = hashlib.sha1(git_sha1.encode("utf-8")).hexdigest() with open(oe_hash_file, 'w') as fobj: fobj.write(sha1) -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150275): https://lists.openembedded.org/g/openembedded-core/message/150275 Mute This Topic: https://lists.openembedded.org/mt/81932010/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Yocto Project Summit - registration open
Registration is now open for the upcoming Yocto Project Summit!! details: https://www.yoctoproject.org/yocto-project-virtual-summit-2021/ CfP: https://pretalx.com/yocto-project-summit-2021/cfp registration: https://www.cvent.com/d/yjq4dr/4W?ct=868bfddd-ca91-46bb-aaa5-62d2b61b2501 PS: Don't forget to get in your talk proposals! The CfP closes April 25th -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150273): https://lists.openembedded.org/g/openembedded-core/message/150273 Mute This Topic: https://lists.openembedded.org/mt/81925793/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] libxshmfence: Build fixes for riscv32
On Wed, Apr 7, 2021 at 1:08 AM Yu, Mingli wrote: > > From: Mingli Yu > > NR_futex is not defined by newer architectures e.g. riscv32 as > they only have 64bit variant of time_t. Glibc defines SYS_futex > interface based on __NR_futex, since this is used in applications, > such applications start to fail to build for these newer architectures. > > Define a fallback to alias __NR_futex to __NR_futex_time64 to make > SYS_futex keep working. > > Reference: > https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7 > > Signed-off-by: Mingli Yu > --- > ...h-Define-SYS_futex-if-it-does-not-ex.patch | 39 +++ > .../xorg-lib/libxshmfence_1.3.bb | 4 +- > 2 files changed, 42 insertions(+), 1 deletion(-) > create mode 100644 > meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch > > diff --git > a/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch > > b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch > new file mode 100644 > index 00..3e87794d20 > --- /dev/null > +++ > b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch > @@ -0,0 +1,39 @@ > +From 5827f6389a227157958d14a687fb29223cb3a03a Mon Sep 17 00:00:00 2001 > +From: Mingli Yu > +Date: Wed, 7 Apr 2021 07:48:42 + > +Subject: [PATCH] xshmfence_futex.h: Define SYS_futex if it does not exist > + > +_NR_futex is not defines by newer architectures e.g. riscv32 as > +they only have 64bit variant of time_t. Glibc defines SYS_futex > +interface based on __NR_futex, since this is used in applications, > +such applications start to fail to build for these newer architectures. > +This patch defines a fallback to alias __NR_futex to __NR_futex_time64 > +to make SYS_futex keep working. > + > +Reference: > https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7 > + > +Upstream-Status: Pending > + > +Signed-off-by: Mingli Yu > +--- > + src/xshmfence_futex.h | 4 > + 1 file changed, 4 insertions(+) > + > +diff --git a/src/xshmfence_futex.h b/src/xshmfence_futex.h > +index 673ac0e..a71efa5 100644 > +--- a/src/xshmfence_futex.h > b/src/xshmfence_futex.h > +@@ -53,6 +53,10 @@ static inline int futex_wait(int32_t *addr, int32_t > value) { > + #include > + #include > + > ++#if !defined(SYS_futex) && defined(SYS_futex_time64) > ++#define SYS_futex SYS_futex_time64 > ++#endif > ++ > + static inline long sys_futex(void *addr1, int op, int val1, struct timespec > *timeout, void *addr2, int val3) > + { > + return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); > +-- > +2.29.2 > + > diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb > b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb > index cc45696530..d153c7a603 100644 > --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb > +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb > @@ -13,7 +13,9 @@ DEPENDS += "virtual/libx11" > > EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" > > -BBCLASSEXTEND = "native nativesdk" > +SRC_URI += > "file://0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch" > > SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937" > SRC_URI[sha256sum] = > "b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7" > + > +BBCLASSEXTEND = "native nativesdk" can you also. send a pull to meta-riscv to remove it from there ? -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150272): https://lists.openembedded.org/g/openembedded-core/message/150272 Mute This Topic: https://lists.openembedded.org/mt/81910708/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] arch-armv6m.inc: fix access rights
Signed-off-by: Ulrich Ölmann --- meta/conf/machine/include/arm/arch-armv6m.inc | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 meta/conf/machine/include/arm/arch-armv6m.inc diff --git a/meta/conf/machine/include/arm/arch-armv6m.inc b/meta/conf/machine/include/arm/arch-armv6m.inc old mode 100755 new mode 100644 -- 2.29.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150271): https://lists.openembedded.org/g/openembedded-core/message/150271 Mute This Topic: https://lists.openembedded.org/mt/81920996/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [dunfell][PATCH] build-appliance-image: Update to master head revision
From: Richard Purdie Signed-off-by: Richard Purdie --- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 925235db60..1aeb952db2 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -24,7 +24,7 @@ IMAGE_FSTYPES = "wic.vmdk wic.vhd wic.vhdx" inherit core-image setuptools3 -SRCREV ?= "c6483187f96c6d21b7129ad78de3ff976fbe5970" +SRCREV ?= "42514ade8bdb9502f49a56752561f6c2e9f23348" SRC_URI = "git://git.yoctoproject.org/poky \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ -- 2.31.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150270): https://lists.openembedded.org/g/openembedded-core/message/150270 Mute This Topic: https://lists.openembedded.org/mt/81916773/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [meta-mingw][PATCH] go: add environment setup batch file for go
On Wed, Apr 07, 2021 at 07:56:01AM -0500, Joshua Watt wrote: > On Wed, Apr 7, 2021 at 5:31 AM Peter Morrow > wrote: > > > > When building the nativesdk for mingw we need to set GOROOT in order to > > build > > anything out of the box. > > > > Signed-off-by: Peter Morrow > > --- > > recipes-devtools/go/go_%.bbappend | 9 + > > 1 file changed, 9 insertions(+) > > create mode 100644 recipes-devtools/go/go_%.bbappend > > > > diff --git a/recipes-devtools/go/go_%.bbappend > > b/recipes-devtools/go/go_%.bbappend > > new file mode 100644 > > index 000..9933108 > > --- /dev/null > > +++ b/recipes-devtools/go/go_%.bbappend > > @@ -0,0 +1,9 @@ > > +do_install_append_class-nativesdk_mingw32() { > > +install -d ${D}${SDKPATHNATIVE}/environment-setup.d > > + > > +cat < ${D}${SDKPATHNATIVE}/environment-setup.d/go.bat > > +set GOROOT=%OECORE_NATIVE_SYSROOT%\\usr\\lib\\${BPN} > > +EOF > > +} > > + > > +FILES_${PN}_append_class-nativesdk_mingw32 = " > > ${SDKPATHNATIVE}/environment-setup.d" > > -- > > 1.8.3.1 > > > > I've put this patch in master-next oe meta-mingw. This is the wrong > mailing list for these patches, please use > yo...@lists.yoctoproject.org time. Thanks, noted. Peter. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150269): https://lists.openembedded.org/g/openembedded-core/message/150269 Mute This Topic: https://lists.openembedded.org/mt/81912228/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [meta-mingw][PATCH] go: add environment setup batch file for go
On Wed, Apr 7, 2021 at 5:31 AM Peter Morrow wrote: > > When building the nativesdk for mingw we need to set GOROOT in order to build > anything out of the box. > > Signed-off-by: Peter Morrow > --- > recipes-devtools/go/go_%.bbappend | 9 + > 1 file changed, 9 insertions(+) > create mode 100644 recipes-devtools/go/go_%.bbappend > > diff --git a/recipes-devtools/go/go_%.bbappend > b/recipes-devtools/go/go_%.bbappend > new file mode 100644 > index 000..9933108 > --- /dev/null > +++ b/recipes-devtools/go/go_%.bbappend > @@ -0,0 +1,9 @@ > +do_install_append_class-nativesdk_mingw32() { > +install -d ${D}${SDKPATHNATIVE}/environment-setup.d > + > +cat < ${D}${SDKPATHNATIVE}/environment-setup.d/go.bat > +set GOROOT=%OECORE_NATIVE_SYSROOT%\\usr\\lib\\${BPN} > +EOF > +} > + > +FILES_${PN}_append_class-nativesdk_mingw32 = " > ${SDKPATHNATIVE}/environment-setup.d" > -- > 1.8.3.1 > I've put this patch in master-next oe meta-mingw. This is the wrong mailing list for these patches, please use yo...@lists.yoctoproject.org time. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150268): https://lists.openembedded.org/g/openembedded-core/message/150268 Mute This Topic: https://lists.openembedded.org/mt/81912228/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/3] sysvinit-inittab/start_getty: Check /sys for the tty device existence
The hvc tty driver doesn't populate a file like /proc/tty/driver/serial, so the current implementation of start_getty doesn't work for the hvc console. By checking the /sys/class/tty/ for the tty device existence, it should support more console types and also make the codes more simple. Signed-off-by: Kevin Hao --- .../sysvinit/sysvinit-inittab/start_getty | 44 ++- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty b/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty index dfa799adac2e..699a1ead1a40 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty +++ b/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty @@ -1,17 +1,4 @@ #!/bin/sh -### -# This script is used to automatically set up the serial console(s) on startup. -# The variable SERIAL_CONSOLES can be set in meta/conf/machine/*.conf. -# Script enhancement has been done based on Bug YOCTO #10844. -# Most of the information is retrieved from /proc virtual filesystem containing -# all the runtime system information (eg. system memory, device mount, etc). -### - -# Get active serial filename. -active_serial=$(grep "serial" /proc/tty/drivers | cut -d/ -f1 | sed "s/ *$//") - -# Rephrase input parameter from ttyS target index (ttyS1, ttyS2, ttyAMA0, etc). -runtime_tty=$(echo $2 | grep -oh '[0-9]\+') # busybox' getty does this itself, util-linux' agetty needs extra help getty="/sbin/getty" @@ -25,31 +12,6 @@ case $(readlink -f "${getty}") in ;; esac -# Backup $IFS. -DEFAULT_IFS=$IFS -# Customize Internal Field Separator. -IFS="$(printf '\n\t')" - -for line in $active_serial; do - # Check we have the file containing current active serial target index. - if [ -e "/proc/tty/driver/$line" ] -then - # Remove all unknown entries and discard the first line (desc). - activetty=$(grep -v "unknown" "/proc/tty/driver/$line" \ - | tail -n +2 | grep -oh "^\s*\S*[0-9]\+") - for active in $activetty; do - # If indexes do match then enable the serial console. - if [ $active -eq $runtime_tty ] - then - if [ -c /dev/$2 ] - then - ${setsid:-} ${getty} -L $1 $2 $3 - fi - break - fi - done - fi -done - -# Restore $IFS. -IFS=$DEFAULT_IFS +if [ -e /sys/class/tty/$2 -a -c /dev/$2 ]; then + ${setsid:-} ${getty} -L $1 $2 $3 +fi -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150266): https://lists.openembedded.org/g/openembedded-core/message/150266 Mute This Topic: https://lists.openembedded.org/mt/81913955/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/3] modutils-initscripts: Bail out when no module is installed
Fix the following warning when boot with a core-image-minimal rootfs: depmod: can't change directory to 'lib/modules/5.10.25-yocto-standard': No such file or directory Signed-off-by: Kevin Hao --- meta/recipes-kernel/modutils-initscripts/files/modutils.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh index 28fe6f92d77f..67e1dcd9907e 100755 --- a/meta/recipes-kernel/modutils-initscripts/files/modutils.sh +++ b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh @@ -13,6 +13,7 @@ LOAD_MODULE=modprobe [ -f /proc/modules ] || exit 0 +[ -d /lib/modules/`uname -r` ] || exit 0 # Test if modules.dep exists and has a size greater than zero if [ ! -s /lib/modules/`uname -r`/modules.dep ]; then -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150265): https://lists.openembedded.org/g/openembedded-core/message/150265 Mute This Topic: https://lists.openembedded.org/mt/81913954/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 3/3] Revert "inittab: Add getty launch on hvc0 for qemuppc64"
This reverts commit ed69ef20167da0986bc9363d1a91e62001995af4. The console entry has already been added into /etc/inittab based on the SERIAL_CONSOLES. So drop this redundant entry. Signed-off-by: Kevin Hao --- meta/recipes-core/busybox/busybox-inittab_1.33.0.bb| 3 --- meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 4 2 files changed, 7 deletions(-) diff --git a/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb b/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb index 0021e45511d7..3804f4f7b2d0 100644 --- a/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb +++ b/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb @@ -44,9 +44,6 @@ EOF fi } -do_install_append_qemuppc64 () { -echo "9:12345:respawn:${base_sbindir}/getty 38400 hvc0" >> ${D}${sysconfdir}/inittab -} pkg_postinst_${PN} () { # run this on host and on target diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index 0af116f35cbd..d95d1a63f5c4 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb @@ -53,10 +53,6 @@ EOF fi } -do_install_append_qemuppc64 () { -echo "9:12345:respawn:${base_sbindir}/getty 38400 hvc0" >> ${D}${sysconfdir}/inittab -} - pkg_postinst_${PN} () { # run this on host and on target if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150267): https://lists.openembedded.org/g/openembedded-core/message/150267 Mute This Topic: https://lists.openembedded.org/mt/81913956/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 0/3] Fixes two warnings when boot with qemuppc64
Fixes two following warnings: depmod: can't change directory to 'lib/modules/5.10.25-yocto-standard': No such file or directory INIT: Id "hvc0" respawning too fast: disabled for 5 minutes Kevin Hao (3): modutils-initscripts: Bail out when no module is installed sysvinit-inittab/start_getty: Check /sys for the tty device existence Revert "inittab: Add getty launch on hvc0 for qemuppc64" .../busybox/busybox-inittab_1.33.0.bb | 3 -- .../sysvinit/sysvinit-inittab/start_getty | 44 ++- .../sysvinit/sysvinit-inittab_2.88dsf.bb | 4 -- .../modutils-initscripts/files/modutils.sh| 1 + 4 files changed, 4 insertions(+), 48 deletions(-) -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150264): https://lists.openembedded.org/g/openembedded-core/message/150264 Mute This Topic: https://lists.openembedded.org/mt/81913952/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] cross-canadian: Whitelist "mingw32" as TARGET_OS
If a recipe inherits cross-canadian and contains "nativesdk" in BBCLASSEXTEND and meta-mingw is included and multiconfig is enabled, bitbake will generate the correspending recipe. As meta-mingw sets SDK_OS to "mingw32", that's what TARGET_OS will be set to as well. Thus, currently such a recipe won't pass the check and fail with a message: Building cross-candian for an unknown TARGET_SYS (x86_64-mysdk-mingw32), please update cross-canadian.bbclass Even when building an SDK targeting Linux, but the mentioned conditions are met, bitbake will try to generate the corresponding recipe and fail. As the described combination seems valid, including "mingw32" into the whitelist unconditionally as a fix is suggested. Signed-off-by: Anatol Belski --- meta/classes/cross-canadian.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index f5c9f61595..1e54035084 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -36,7 +36,7 @@ python () { return tos = d.getVar("TARGET_OS") -whitelist = [] +whitelist = ["mingw32"] extralibcs = [""] if "musl" in d.getVar("BASECANADIANEXTRAOS"): extralibcs.append("musl") -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150263): https://lists.openembedded.org/g/openembedded-core/message/150263 Mute This Topic: https://lists.openembedded.org/mt/81912950/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [meta-mingw][PATCH] go: add environment setup batch file for go
When building the nativesdk for mingw we need to set GOROOT in order to build anything out of the box. Signed-off-by: Peter Morrow --- recipes-devtools/go/go_%.bbappend | 9 + 1 file changed, 9 insertions(+) create mode 100644 recipes-devtools/go/go_%.bbappend diff --git a/recipes-devtools/go/go_%.bbappend b/recipes-devtools/go/go_%.bbappend new file mode 100644 index 000..9933108 --- /dev/null +++ b/recipes-devtools/go/go_%.bbappend @@ -0,0 +1,9 @@ +do_install_append_class-nativesdk_mingw32() { +install -d ${D}${SDKPATHNATIVE}/environment-setup.d + +cat < ${D}${SDKPATHNATIVE}/environment-setup.d/go.bat +set GOROOT=%OECORE_NATIVE_SYSROOT%\\usr\\lib\\${BPN} +EOF +} + +FILES_${PN}_append_class-nativesdk_mingw32 = " ${SDKPATHNATIVE}/environment-setup.d" -- 1.8.3.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150262): https://lists.openembedded.org/g/openembedded-core/message/150262 Mute This Topic: https://lists.openembedded.org/mt/81912228/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] packagegroup-core-tools-testapps.bb: Remove kexec for riscv32
From: Mingli Yu kexec is not yet ported to riscv32. Signed-off-by: Mingli Yu --- .../packagegroups/packagegroup-core-tools-testapps.bb| 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index a5fc152859..015810cb6b 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -16,6 +16,7 @@ KEXECTOOLS_e5500-64b ?= "" KEXECTOOLS_microblaze ?= "" KEXECTOOLS_nios2 ?= "" KEXECTOOLS_riscv64 ?= "" +KEXECTOOLS_riscv32 ?= "" GSTEXAMPLES ?= "gst-examples" GSTEXAMPLES_riscv64 = "" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150261): https://lists.openembedded.org/g/openembedded-core/message/150261 Mute This Topic: https://lists.openembedded.org/mt/81911483/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] libxshmfence: Build fixes for riscv32
From: Mingli Yu NR_futex is not defined by newer architectures e.g. riscv32 as they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on __NR_futex, since this is used in applications, such applications start to fail to build for these newer architectures. Define a fallback to alias __NR_futex to __NR_futex_time64 to make SYS_futex keep working. Reference: https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7 Signed-off-by: Mingli Yu --- ...h-Define-SYS_futex-if-it-does-not-ex.patch | 39 +++ .../xorg-lib/libxshmfence_1.3.bb | 4 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch new file mode 100644 index 00..3e87794d20 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch @@ -0,0 +1,39 @@ +From 5827f6389a227157958d14a687fb29223cb3a03a Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 7 Apr 2021 07:48:42 + +Subject: [PATCH] xshmfence_futex.h: Define SYS_futex if it does not exist + +_NR_futex is not defines by newer architectures e.g. riscv32 as +they only have 64bit variant of time_t. Glibc defines SYS_futex +interface based on __NR_futex, since this is used in applications, +such applications start to fail to build for these newer architectures. +This patch defines a fallback to alias __NR_futex to __NR_futex_time64 +to make SYS_futex keep working. + +Reference: https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7 + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + src/xshmfence_futex.h | 4 + 1 file changed, 4 insertions(+) + +diff --git a/src/xshmfence_futex.h b/src/xshmfence_futex.h +index 673ac0e..a71efa5 100644 +--- a/src/xshmfence_futex.h b/src/xshmfence_futex.h +@@ -53,6 +53,10 @@ static inline int futex_wait(int32_t *addr, int32_t value) { + #include + #include + ++#if !defined(SYS_futex) && defined(SYS_futex_time64) ++#define SYS_futex SYS_futex_time64 ++#endif ++ + static inline long sys_futex(void *addr1, int op, int val1, struct timespec *timeout, void *addr2, int val3) + { + return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); +-- +2.29.2 + diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index cc45696530..d153c7a603 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -13,7 +13,9 @@ DEPENDS += "virtual/libx11" EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" -BBCLASSEXTEND = "native nativesdk" +SRC_URI += "file://0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch" SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937" SRC_URI[sha256sum] = "b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7" + +BBCLASSEXTEND = "native nativesdk" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150260): https://lists.openembedded.org/g/openembedded-core/message/150260 Mute This Topic: https://lists.openembedded.org/mt/81910708/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-