Re: [OE-core] Patchtest results for [PATCH v2 1/2] ccache: 4.9.1 -> 4.10
On 6/12/24 13:50, patcht...@automation.yoctoproject.org wrote: Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information: --- Testing patch /home/patchtest/share/mboxes/v2-1-2-ccache-4.9.1---4.10.patch FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) I did add "License-Update:" in V2: * License-Update: - Update LIC_FILES_CHKSUM becaue a few third party licenses have been removed: $ git diff --stat v4.9.1..v4.10 LICENSE.adoc LICENSE.adoc | 222 +- 1 file changed, 15 insertions(+), 207 deletions(-) And add more licenses for third party files. // Robert PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files) PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore) PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint) SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format) SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence) SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list) --- Please address the issues identified and submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you! -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#200566): https://lists.openembedded.org/g/openembedded-core/message/200566 Mute This Topic: https://lists.openembedded.org/mt/106627798/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 2/2] fmt: Add it from meta-oe for ccache 4.10
From: Robert Yang It is required by ccache 4.10, from cmake/Dependencies.cmake: find_package(Fmt 8.0.0 MODULE REQUIRED) Signed-off-by: Robert Yang --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-devtools/fmt/fmt_10.2.1.bb | 16 2 files changed, 17 insertions(+) create mode 100644 meta/recipes-devtools/fmt/fmt_10.2.1.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 2977ca54f1e..42599267c1c 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -176,6 +176,7 @@ RECIPE_MAINTAINER:pn-file = "Yi Zhao " RECIPE_MAINTAINER:pn-findutils = "Chen Qi " RECIPE_MAINTAINER:pn-flac = "Michael Opdenacker " RECIPE_MAINTAINER:pn-flex = "Chen Qi " +RECIPE_MAINTAINER:pn-fmt = "Robert Yang " RECIPE_MAINTAINER:pn-font-alias = "Unassigned " RECIPE_MAINTAINER:pn-font-util = "Unassigned " RECIPE_MAINTAINER:pn-fontconfig = "Ross Burton " diff --git a/meta/recipes-devtools/fmt/fmt_10.2.1.bb b/meta/recipes-devtools/fmt/fmt_10.2.1.bb new file mode 100644 index 000..1437eb48034 --- /dev/null +++ b/meta/recipes-devtools/fmt/fmt_10.2.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "open-source formatting library for C++" +DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." +HOMEPAGE = "https://fmt.dev; +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729" + +SRC_URI = "git://github.com/fmtlib/fmt;branch=10.x;protocol=https" +SRCREV = "e69e5f977d458f2650bb346dadf2ad30c5320281" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#200564): https://lists.openembedded.org/g/openembedded-core/message/200564 Mute This Topic: https://lists.openembedded.org/mt/106627670/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 0/2] ccache: 4.9.1 -> 4.10
From: Robert Yang * V2 Add "License-Update:" tag * V1 The fmt is from meta-oe, will send a patch to remove it from meta-oe after this patch is merged. The following changes since commit 07b4c7a2bd23f8645810e13439e814caaaf9cd94: linuxloader: add -armhf on arm only for TARGET_FPU 'hard' (2024-06-11 11:41:09 +0100) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/ccache https://github.com/robertlinux/yocto/tree/rbt/ccache Robert Yang (2): ccache: 4.9.1 -> 4.10 fmt: Add it from meta-oe for ccache 4.10 meta/conf/distro/include/maintainers.inc | 1 + .../{ccache_4.9.1.bb => ccache_4.10.bb} | 20 ++ .../0001-xxhash.h-Fix-build-with-gcc-12.patch | 37 --- meta/recipes-devtools/fmt/fmt_10.2.1.bb | 16 4 files changed, 30 insertions(+), 44 deletions(-) rename meta/recipes-devtools/ccache/{ccache_4.9.1.bb => ccache_4.10.bb} (44%) delete mode 100644 meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch create mode 100644 meta/recipes-devtools/fmt/fmt_10.2.1.bb -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#200562): https://lists.openembedded.org/g/openembedded-core/message/200562 Mute This Topic: https://lists.openembedded.org/mt/106627668/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 1/2] ccache: 4.9.1 -> 4.10
From: Robert Yang * Remove 0001-xxhash.h-Fix-build-with-gcc-12.patch since there is no xxhash in ccache by default any more. * License-Update: - Update LIC_FILES_CHKSUM becaue a few third party licenses have been removed: $ git diff --stat v4.9.1..v4.10 LICENSE.adoc LICENSE.adoc | 222 +- 1 file changed, 15 insertions(+), 207 deletions(-) And add more licenses for third party files. * Add required recipe fmt and xxhash to DEPENDS. * Set ENABLE_TESTING=OFF since it requires doctest which is not present in oe. Signed-off-by: Robert Yang --- .../{ccache_4.9.1.bb => ccache_4.10.bb} | 20 ++ .../0001-xxhash.h-Fix-build-with-gcc-12.patch | 37 --- 2 files changed, 13 insertions(+), 44 deletions(-) rename meta/recipes-devtools/ccache/{ccache_4.9.1.bb => ccache_4.10.bb} (44%) delete mode 100644 meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch diff --git a/meta/recipes-devtools/ccache/ccache_4.9.1.bb b/meta/recipes-devtools/ccache/ccache_4.10.bb similarity index 44% rename from meta/recipes-devtools/ccache/ccache_4.9.1.bb rename to meta/recipes-devtools/ccache/ccache_4.10.bb index 0d447c49158..df169b9c2b5 100644 --- a/meta/recipes-devtools/ccache/ccache_4.9.1.bb +++ b/meta/recipes-devtools/ccache/ccache_4.10.bb @@ -6,15 +6,18 @@ Objective-C and Objective-C++." HOMEPAGE = "http://ccache.samba.org; SECTION = "devel" -LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=9896d6f0aee4d89b9e5ff0afaae0af06" +LICENSE = "GPL-3.0-or-later & MIT & BSL-1.0 & ISC" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=c72fa5755dc70ec5b439212d47299414 \ + file://src/third_party/cpp-httplib/httplib.h;endline=6;md5=5389d9f5a88a138e42ba58894bbceeac \ + file://src/third_party/nonstd-span/nonstd/span.hpp;endline=9;md5=b4af92a7f068b38c5b3410dceb30c186 \ + file://src/third_party/win32-compat/win32/mktemp.c;endline=17;md5=d287e9c1f1cd2bb2bd164490e1cf449a \ +" -DEPENDS = "zstd" +DEPENDS = "zstd fmt xxhash" -SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ - file://0001-xxhash.h-Fix-build-with-gcc-12.patch \ - " -SRC_URI[sha256sum] = "12834ecaaaf2db069dda1d1d991f91c19e3274cc04a471af5b64195def17e90f" +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz" + +SRC_URI[sha256sum] = "16972ba62c8499045edc3ae7d7b8a0b419a961567f5ff0f01bf5a44194204775" inherit cmake github-releases @@ -24,3 +27,6 @@ BBCLASSEXTEND = "native nativesdk" PACKAGECONFIG[docs] = "-DENABLE_DOCUMENTATION=ON,-DENABLE_DOCUMENTATION=OFF,asciidoc" PACKAGECONFIG[redis] = "-DREDIS_STORAGE_BACKEND=ON,-DREDIS_STORAGE_BACKEND=OFF,hiredis" + +# ENABLE_TESTING requires doctest which is not present in oe +EXTRA_OECMAKE += "-DENABLE_TESTING=OFF" diff --git a/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch b/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch deleted file mode 100644 index e65b8302577..000 --- a/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d17fdacf4892a15fafb56b0890ece05b485e89fb Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Mon, 6 Jun 2022 17:53:20 +0800 -Subject: [PATCH] xxhash.h: Fix build with gcc-12 - -Remove inline attribute to fix below build failure: - | /buildarea/tmp/work/core2-64-poky-linux/ccache/4.6.1-r0/ccache-4.6.1/src/third_party/xxhash.h:3932:1: error: inlining failed in call to 'always_inline' 'XXH3_accumulate_512_sse2': function not considered for inlining - 3932 | XXH3_accumulate_512_sse2( void* XXH_RESTRICT acc, - | ^~~~ - /buildarea/tmp/work/core2-64-poky-linux/ccache/4.6.1-r0/ccache-4.6.1/src/third_party/xxhash.h:4369:9: note: called from here - 4369 | f_acc512(acc, - | ^ - 4370 | in, - | ~~~ - 4371 | secret + n*XXH_SECRET_CONSUME_RATE); - -Upstream-Status: Submitted [https://github.com/Cyan4973/xxHash/pull/720] - -Signed-off-by: Mingli Yu - - src/third_party/xxhash.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/third_party/xxhash.h b/src/third_party/xxhash.h -index a18e8c7..1b72307 100644 a/src/third_party/xxhash.h -+++ b/src/third_party/xxhash.h -@@ -2107,7 +2107,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) - # define XXH_NO_INLINE static - /* enable inlining hints */ - #elif defined(__GNUC__) || defined(__clang__) --# define XXH_FORCE_INLINE static __inline__ __attribute__((always_inline, unused)) -+# define XXH_FORCE_INLINE static - # define XXH_NO_INLINE static __attribute__((noi
Re: [OE-core] [PATCH v2 0/1] quilt: 0.67 -> 0.68
On 5/27/24 13:51, Robert Yang via lists.openembedded.org wrote: From: Robert Yang * V2 Add coreutils to RDEPENDS:quilt-ptest to fix ptest error Ping. // Robert * V1 Initial version The following changes since commit 1187a460c2608369df8de08fe52a5542e4ab6ecd: oe-build-perf-report: Add commit hash link to chart tooltip (2024-05-24 16:59:17 +0100) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/quilt https://github.com/robertlinux/yocto/tree/rbt/quilt Robert Yang (1): quilt: 0.67 -> 0.68 ...lt-native_0.67.bb => quilt-native_0.68.bb} | 0 meta/recipes-devtools/quilt/quilt.inc | 7 +- ...t-Fix-a-race-condition-in-merge.test.patch | 48 -- .../quilt/quilt/faildiff-order.patch | 41 - .../quilt/quilt/fix-grep-3.8.patch| 144 -- .../quilt/{quilt_0.67.bb => quilt_0.68.bb}| 0 6 files changed, 2 insertions(+), 238 deletions(-) rename meta/recipes-devtools/quilt/{quilt-native_0.67.bb => quilt-native_0.68.bb} (100%) delete mode 100644 meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch delete mode 100644 meta/recipes-devtools/quilt/quilt/faildiff-order.patch delete mode 100644 meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch rename meta/recipes-devtools/quilt/{quilt_0.67.bb => quilt_0.68.bb} (100%) -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#200560): https://lists.openembedded.org/g/openembedded-core/message/200560 Mute This Topic: https://lists.openembedded.org/mt/106325977/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] ccache: 4.9.1 -> 4.10
From: Robert Yang The fmt is from meta-oe, will send a patch to remove it from meta-oe after this patch is merged. // Robert The following changes since commit 07b4c7a2bd23f8645810e13439e814caaaf9cd94: linuxloader: add -armhf on arm only for TARGET_FPU 'hard' (2024-06-11 11:41:09 +0100) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/ccache https://github.com/robertlinux/yocto/tree/rbt/ccache Robert Yang (2): ccache: 4.9.1 -> 4.10 fmt: Add it from meta-oe for ccache 4.10 meta/conf/distro/include/maintainers.inc | 1 + .../{ccache_4.9.1.bb => ccache_4.10.bb} | 20 ++ .../0001-xxhash.h-Fix-build-with-gcc-12.patch | 37 --- meta/recipes-devtools/fmt/fmt_10.2.1.bb | 16 4 files changed, 30 insertions(+), 44 deletions(-) rename meta/recipes-devtools/ccache/{ccache_4.9.1.bb => ccache_4.10.bb} (44%) delete mode 100644 meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch create mode 100644 meta/recipes-devtools/fmt/fmt_10.2.1.bb -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#200557): https://lists.openembedded.org/g/openembedded-core/message/200557 Mute This Topic: https://lists.openembedded.org/mt/106626493/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] fmt: Add it from meta-oe for ccache 4.10
From: Robert Yang It is required by ccache 4.10, from cmake/Dependencies.cmake: find_package(Fmt 8.0.0 MODULE REQUIRED) Signed-off-by: Robert Yang --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-devtools/fmt/fmt_10.2.1.bb | 16 2 files changed, 17 insertions(+) create mode 100644 meta/recipes-devtools/fmt/fmt_10.2.1.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 2977ca54f1e..42599267c1c 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -176,6 +176,7 @@ RECIPE_MAINTAINER:pn-file = "Yi Zhao " RECIPE_MAINTAINER:pn-findutils = "Chen Qi " RECIPE_MAINTAINER:pn-flac = "Michael Opdenacker " RECIPE_MAINTAINER:pn-flex = "Chen Qi " +RECIPE_MAINTAINER:pn-fmt = "Robert Yang " RECIPE_MAINTAINER:pn-font-alias = "Unassigned " RECIPE_MAINTAINER:pn-font-util = "Unassigned " RECIPE_MAINTAINER:pn-fontconfig = "Ross Burton " diff --git a/meta/recipes-devtools/fmt/fmt_10.2.1.bb b/meta/recipes-devtools/fmt/fmt_10.2.1.bb new file mode 100644 index 000..1437eb48034 --- /dev/null +++ b/meta/recipes-devtools/fmt/fmt_10.2.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "open-source formatting library for C++" +DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." +HOMEPAGE = "https://fmt.dev; +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729" + +SRC_URI = "git://github.com/fmtlib/fmt;branch=10.x;protocol=https" +SRCREV = "e69e5f977d458f2650bb346dadf2ad30c5320281" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#200559): https://lists.openembedded.org/g/openembedded-core/message/200559 Mute This Topic: https://lists.openembedded.org/mt/106626495/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] ccache: 4.9.1 -> 4.10
From: Robert Yang * Remove 0001-xxhash.h-Fix-build-with-gcc-12.patch since there is no xxhash in ccache by default any more. * Update LIC_FILES_CHKSUM becaue a few third party licenses have been removed: $ git diff --stat v4.9.1..v4.10 LICENSE.adoc LICENSE.adoc | 222 +- 1 file changed, 15 insertions(+), 207 deletions(-) And add more licenses for third party files. * Add required recipe fmt and xxhash to DEPENDS. * Set ENABLE_TESTING=OFF since it requires doctest which is not present in oe. Signed-off-by: Robert Yang --- .../{ccache_4.9.1.bb => ccache_4.10.bb} | 20 ++ .../0001-xxhash.h-Fix-build-with-gcc-12.patch | 37 --- 2 files changed, 13 insertions(+), 44 deletions(-) rename meta/recipes-devtools/ccache/{ccache_4.9.1.bb => ccache_4.10.bb} (44%) delete mode 100644 meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch diff --git a/meta/recipes-devtools/ccache/ccache_4.9.1.bb b/meta/recipes-devtools/ccache/ccache_4.10.bb similarity index 44% rename from meta/recipes-devtools/ccache/ccache_4.9.1.bb rename to meta/recipes-devtools/ccache/ccache_4.10.bb index 0d447c49158..df169b9c2b5 100644 --- a/meta/recipes-devtools/ccache/ccache_4.9.1.bb +++ b/meta/recipes-devtools/ccache/ccache_4.10.bb @@ -6,15 +6,18 @@ Objective-C and Objective-C++." HOMEPAGE = "http://ccache.samba.org; SECTION = "devel" -LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=9896d6f0aee4d89b9e5ff0afaae0af06" +LICENSE = "GPL-3.0-or-later & MIT & BSL-1.0 & ISC" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=c72fa5755dc70ec5b439212d47299414 \ + file://src/third_party/cpp-httplib/httplib.h;endline=6;md5=5389d9f5a88a138e42ba58894bbceeac \ + file://src/third_party/nonstd-span/nonstd/span.hpp;endline=9;md5=b4af92a7f068b38c5b3410dceb30c186 \ + file://src/third_party/win32-compat/win32/mktemp.c;endline=17;md5=d287e9c1f1cd2bb2bd164490e1cf449a \ +" -DEPENDS = "zstd" +DEPENDS = "zstd fmt xxhash" -SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ - file://0001-xxhash.h-Fix-build-with-gcc-12.patch \ - " -SRC_URI[sha256sum] = "12834ecaaaf2db069dda1d1d991f91c19e3274cc04a471af5b64195def17e90f" +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz" + +SRC_URI[sha256sum] = "16972ba62c8499045edc3ae7d7b8a0b419a961567f5ff0f01bf5a44194204775" inherit cmake github-releases @@ -24,3 +27,6 @@ BBCLASSEXTEND = "native nativesdk" PACKAGECONFIG[docs] = "-DENABLE_DOCUMENTATION=ON,-DENABLE_DOCUMENTATION=OFF,asciidoc" PACKAGECONFIG[redis] = "-DREDIS_STORAGE_BACKEND=ON,-DREDIS_STORAGE_BACKEND=OFF,hiredis" + +# ENABLE_TESTING requires doctest which is not present in oe +EXTRA_OECMAKE += "-DENABLE_TESTING=OFF" diff --git a/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch b/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch deleted file mode 100644 index e65b8302577..000 --- a/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d17fdacf4892a15fafb56b0890ece05b485e89fb Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Mon, 6 Jun 2022 17:53:20 +0800 -Subject: [PATCH] xxhash.h: Fix build with gcc-12 - -Remove inline attribute to fix below build failure: - | /buildarea/tmp/work/core2-64-poky-linux/ccache/4.6.1-r0/ccache-4.6.1/src/third_party/xxhash.h:3932:1: error: inlining failed in call to 'always_inline' 'XXH3_accumulate_512_sse2': function not considered for inlining - 3932 | XXH3_accumulate_512_sse2( void* XXH_RESTRICT acc, - | ^~~~ - /buildarea/tmp/work/core2-64-poky-linux/ccache/4.6.1-r0/ccache-4.6.1/src/third_party/xxhash.h:4369:9: note: called from here - 4369 | f_acc512(acc, - | ^ - 4370 | in, - | ~~~ - 4371 | secret + n*XXH_SECRET_CONSUME_RATE); - -Upstream-Status: Submitted [https://github.com/Cyan4973/xxHash/pull/720] - -Signed-off-by: Mingli Yu - - src/third_party/xxhash.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/third_party/xxhash.h b/src/third_party/xxhash.h -index a18e8c7..1b72307 100644 a/src/third_party/xxhash.h -+++ b/src/third_party/xxhash.h -@@ -2107,7 +2107,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) - # define XXH_NO_INLINE static - /* enable inlining hints */ - #elif defined(__GNUC__) || defined(__clang__) --# define XXH_FORCE_INLINE static __inline__ __attribute__((always_inline, unused)) -+# define XXH_FORCE_INLINE static - # define XXH_NO_INLINE static __attribute__((noinline)) - #elif defined(_M
Re: [OE-core] [PATCH 1/1] archiver.bbclass: Improve work-shared checking
Hi Livius, On 6/6/24 05:06, Livius wrote: [Edited Message Follows] Hi, https://github.com/openembedded/openembedded-core/commit/5fbb4ca8da4f4f1ea426275c45634802dcb5a575 This patch caused something terrible wrong behavior, because ".../work-shared//kernel-source/" directory is totally empty and the complete Linux kernel source is missing if INHERIT += "archiver" is used in local.conf file. Please fix it and if there any workaround please send it because at the moment without usage of INHERIT += "archiver" Yocto scarthgap build is working but with use it, all the time it failed to compile Linux kernel because git symbolic folder which linked to kernel-source is totally empty in this case in linux working directory. I use the following settings when i try to making archives but it is failed to fetch kernel source to kernel-source directory (it was fine to use in nanbield release before). INHERIT += "archiver" ARCHIVER_MODE[src] = "patched" ARCHIVER_MODE[compression] = "bz2" ARCHIVER_MODE[mirror] = "combined" COPYLEFT_RECIPE_TYPES = "target" COPYLEFT_AVAILABLE_RECIPE_TYPES = "target" # Don't filter the license COPYLEFT_LICENSE_INCLUDE = "" COPYLEFT_LICENSE_EXCLUDE = "" # Deploy licenses COPY_LIC_MANIFEST = "1" COPY_LIC_DIRS = "1" LICENSE_CREATE_PACKAGE = "1" I added the above settings to conf/layer.conf, and started a fresh build on scarthgap branch, it works well for me: commit ae6cebca5bac9521230c69fed23b375d0de7f5f6 (HEAD -> scarthgap, origin/scarthgap) $ bitbake linux-yocto $ ls tmp/deploy/images/qemux86-64/* -1 tmp/deploy/images/qemux86-64/bzImage tmp/deploy/images/qemux86-64/bzImage--6.6.23+git0+f7f00b22ef_2d01bc1d4e-r0-qemux86-64-20240606092927.bin tmp/deploy/images/qemux86-64/bzImage-qemux86-64.bin tmp/deploy/images/qemux86-64/modules--6.6.23+git0+f7f00b22ef_2d01bc1d4e-r0-qemux86-64-20240606092927.tgz tmp/deploy/images/qemux86-64/modules-qemux86-64.tgz $ du -sh tmp/deploy/sources/x86_64-poky-linux/linux-yocto-6.6.23+git-r0/linux-yocto-6.6.23+ git-r0-patched.tar.bz2 168M tmp/deploy/sources/x86_64-poky-linux/linux-yocto-6.6.23+git-r0/linux-yocto-6.6.23+git-r0-patched.tar.bz2 // Robert -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#200388): https://lists.openembedded.org/g/openembedded-core/message/200388 Mute This Topic: https://lists.openembedded.org/mt/103110276/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 1/1] git: 2.44.1 -> 2.45.1
From: Robert Yang Rebased 0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch Signed-off-by: Robert Yang --- ...mak.uname-do-not-force-RHEL-7-specific-build-.patch | 10 +++--- .../git/{git_2.44.1.bb => git_2.45.1.bb} | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) rename meta/recipes-devtools/git/{git_2.44.1.bb => git_2.45.1.bb} (98%) diff --git a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch index d80d082ba3f..fc803c73c78 100644 --- a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch +++ b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch @@ -9,12 +9,16 @@ different flags than git builds on other host distros. Upstream-Status: Inappropriate [upstream needs to check compiler and component versions properly] Signed-off-by: Alexander Kanavin +Rebased for 2.45.1. + +Signed-off-by: Robert Yang + --- config.mak.uname | 4 1 file changed, 4 deletions(-) diff --git a/config.mak.uname b/config.mak.uname -index 259d151..136ae3b 100644 +index a7607a5..251057e 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux) @@ -22,9 +26,9 @@ index 259d151..136ae3b 100644 HAVE_PLATFORM_PROCINFO = YesPlease COMPAT_OBJS += compat/linux/procinfo.o - # centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7. -- ifneq ($(findstring .el7.,$(uname_R)),) +-ifneq ($(findstring .el7.,$(uname_R)),) - BASIC_CFLAGS += -std=c99 -- endif +-endif endif ifeq ($(uname_S),GNU/kFreeBSD) HAVE_ALLOCA_H = YesPlease diff --git a/meta/recipes-devtools/git/git_2.44.1.bb b/meta/recipes-devtools/git/git_2.45.1.bb similarity index 98% rename from meta/recipes-devtools/git/git_2.44.1.bb rename to meta/recipes-devtools/git/git_2.45.1.bb index 53d67eb40a4..d1b3e6ad408 100644 --- a/meta/recipes-devtools/git/git_2.44.1.bb +++ b/meta/recipes-devtools/git/git_2.45.1.bb @@ -164,4 +164,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "118214bb8d7ba971a62741416e757562b8f5451cefc087a407e91857897c92cc" +SRC_URI[tarball.sha256sum] = "10acb581993061e616be9c5674469335922025a666318e0748cb8306079fef24" -- 2.44.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199982): https://lists.openembedded.org/g/openembedded-core/message/199982 Mute This Topic: https://lists.openembedded.org/mt/106363138/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 0/1] git: 2.44.1 -> 2.45.1
From: Robert Yang * V2 Rebased to latest master * V1 Initial version // Robert The following changes since commit aec96b5aec8d6b4a5ae8a719ca05bb727a6197cb: selftest/rust: correctly form the PATH environment variable (2024-05-28 15:08:59 +0100) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/git https://github.com/robertlinux/yocto/tree/rbt/git Robert Yang (1): git: 2.44.1 -> 2.45.1 ...mak.uname-do-not-force-RHEL-7-specific-build-.patch | 10 +++--- .../git/{git_2.44.1.bb => git_2.45.1.bb} | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) rename meta/recipes-devtools/git/{git_2.44.1.bb => git_2.45.1.bb} (98%) -- 2.44.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199981): https://lists.openembedded.org/g/openembedded-core/message/199981 Mute This Topic: https://lists.openembedded.org/mt/106363137/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 1/1] quilt: 0.67 -> 0.68
From: Robert Yang * Remove backported patches: fix-grep-3.8.patch. faildiff-order.patch 0001-test-Fix-a-race-condition-in-merge.test.patch * Add coreutils to RDEPENDS:quilt-ptest to fix ptest error: $ ln -P ln: invalid option -- 'P' The busybox' ln doesn't have option '-P', so use coreutils to fix it. Signed-off-by: Robert Yang --- ...lt-native_0.67.bb => quilt-native_0.68.bb} | 0 meta/recipes-devtools/quilt/quilt.inc | 7 +- ...t-Fix-a-race-condition-in-merge.test.patch | 48 -- .../quilt/quilt/faildiff-order.patch | 41 - .../quilt/quilt/fix-grep-3.8.patch| 144 -- .../quilt/{quilt_0.67.bb => quilt_0.68.bb}| 0 6 files changed, 2 insertions(+), 238 deletions(-) rename meta/recipes-devtools/quilt/{quilt-native_0.67.bb => quilt-native_0.68.bb} (100%) delete mode 100644 meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch delete mode 100644 meta/recipes-devtools/quilt/quilt/faildiff-order.patch delete mode 100644 meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch rename meta/recipes-devtools/quilt/{quilt_0.67.bb => quilt_0.68.bb} (100%) diff --git a/meta/recipes-devtools/quilt/quilt-native_0.67.bb b/meta/recipes-devtools/quilt/quilt-native_0.68.bb similarity index 100% rename from meta/recipes-devtools/quilt/quilt-native_0.67.bb rename to meta/recipes-devtools/quilt/quilt-native_0.68.bb diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 1d90d3d84d7..19aeae510d4 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -11,14 +11,11 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ file://run-ptest \ file://test.sh \ file://0001-tests-Allow-different-output-from-mv.patch \ -file://fix-grep-3.8.patch \ -file://faildiff-order.patch \ -file://0001-test-Fix-a-race-condition-in-merge.test.patch \ " SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" -SRC_URI[sha256sum] = "3be3be0987e72a6c364678bb827e3e1fcc10322b56bc5f02b576698f55013cc2" +SRC_URI[sha256sum] = "fe8c09de03c106e85b3737c8f03ade147c956b79ed7af485a1c8a3858db38426" inherit autotools-brokensep ptest @@ -97,5 +94,5 @@ RDEPENDS:${PN}-ptest += "file sed gawk diffutils findutils ed perl \ perl-module-filehandle perl-module-getopt-std \ perl-module-posix perl-module-file-temp \ perl-module-text-parsewords perl-module-overloading \ - bash util-linux-getopt ptest-runner \ + bash util-linux-getopt ptest-runner coreutils \ " diff --git a/meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch b/meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch deleted file mode 100644 index 01d4c8befcb..000 --- a/meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c1ce964f3e9312100a60f03c1e1fdd601e1911f2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Tue, 28 Feb 2023 18:45:15 +0100 -Subject: [PATCH] test: Fix a race condition in merge.test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Just like commit 4dfe7f9, (test: Fix a race condition, 2023-01-20), -this fix a test race when stdout and stderr in any order. - -Upstream-Status: Backport [https://git.savannah.nongnu.org/cgit/quilt.git/commit/?id=c1ce964f3e9312100a60f03c1e1fdd601e1911f2] -Signed-off-by: Đoàn Trần Công Danh -Signed-off-by: Jean Delvare - test/merge.test | 6 -- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/test/merge.test b/test/merge.test -index c64b33d..2e67d4f 100644 a/test/merge.test -+++ b/test/merge.test -@@ -39,8 +39,9 @@ Test the patch merging functionality of `quilt diff'. - > Applying patch %{P}c.diff - > Now at patch %{P}c.diff - -- $ quilt diff -P b.diff | grep -v "^\\(---\\|+++\\)" -+ $ quilt diff -P b.diff >/dev/null - > Warning: more recent patches modify files in patch %{P}b.diff -+ $ quilt diff -P b.diff 2>/dev/null | grep -v "^\\(---\\|+++\\)" - >~ Index: [^/]+/abc\.txt - > === - > @@ -1,3 +1,3 @@ -@@ -49,8 +50,9 @@ Test the patch merging functionality of `quilt diff'. - > +b+ - > c - -- $ quilt diff --combine a.diff -P b.diff | grep -v "^\\(---\\|+++\\)" -+ $ quilt diff --combine a.diff -P b.diff >/dev/null - > Warning: more recent patches modify files in patch %{P}b
[OE-core] [PATCH v2 0/1] quilt: 0.67 -> 0.68
From: Robert Yang * V2 Add coreutils to RDEPENDS:quilt-ptest to fix ptest error * V1 Initial version The following changes since commit 1187a460c2608369df8de08fe52a5542e4ab6ecd: oe-build-perf-report: Add commit hash link to chart tooltip (2024-05-24 16:59:17 +0100) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/quilt https://github.com/robertlinux/yocto/tree/rbt/quilt Robert Yang (1): quilt: 0.67 -> 0.68 ...lt-native_0.67.bb => quilt-native_0.68.bb} | 0 meta/recipes-devtools/quilt/quilt.inc | 7 +- ...t-Fix-a-race-condition-in-merge.test.patch | 48 -- .../quilt/quilt/faildiff-order.patch | 41 - .../quilt/quilt/fix-grep-3.8.patch| 144 -- .../quilt/{quilt_0.67.bb => quilt_0.68.bb}| 0 6 files changed, 2 insertions(+), 238 deletions(-) rename meta/recipes-devtools/quilt/{quilt-native_0.67.bb => quilt-native_0.68.bb} (100%) delete mode 100644 meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch delete mode 100644 meta/recipes-devtools/quilt/quilt/faildiff-order.patch delete mode 100644 meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch rename meta/recipes-devtools/quilt/{quilt_0.67.bb => quilt_0.68.bb} (100%) -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199896): https://lists.openembedded.org/g/openembedded-core/message/199896 Mute This Topic: https://lists.openembedded.org/mt/106325977/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 2/3] quilt: 0.67 -> 0.68
On 5/25/24 18:59, Richard Purdie wrote: On Fri, 2024-05-24 at 03:28 -0700, Robert Yang via lists.openembedded.org wrote: From: Robert Yang * Remove backported patches: fix-grep-3.8.patch. faildiff-order.patch 0001-test-Fix-a-race-condition-in-merge.test.patch Signed-off-by: Robert Yang --- ...lt-native_0.67.bb => quilt-native_0.68.bb} | 0 meta/recipes-devtools/quilt/quilt.inc | 5 +- ...t-Fix-a-race-condition-in-merge.test.patch | 48 -- .../quilt/quilt/faildiff-order.patch | 41 - .../quilt/quilt/fix-grep-3.8.patch | 144 -- .../quilt/{quilt_0.67.bb => quilt_0.68.bb} | 0 6 files changed, 1 insertion(+), 237 deletions(-) rename meta/recipes-devtools/quilt/{quilt-native_0.67.bb => quilt-native_0.68.bb} (100%) delete mode 100644 meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch delete mode 100644 meta/recipes-devtools/quilt/quilt/faildiff-order.patch delete mode 100644 meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch rename meta/recipes-devtools/quilt/{quilt_0.67.bb => quilt_0.68.bb} (100%) The quilt ptests fail after the upgrade unfortunately: https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/6454/steps/13/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6645/steps/12/logs/stdio Sorry, it is because quilt-ptest requires coreutils' ln, I will send a V2 for it. // Robert Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199895): https://lists.openembedded.org/g/openembedded-core/message/199895 Mute This Topic: https://lists.openembedded.org/mt/106279054/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] git: 2.44.0 -> 2.45.1
From: Robert Yang Rebased 0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch Signed-off-by: Robert Yang --- ...mak.uname-do-not-force-RHEL-7-specific-build-.patch | 10 +++--- .../git/{git_2.44.0.bb => git_2.45.1.bb} | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) rename meta/recipes-devtools/git/{git_2.44.0.bb => git_2.45.1.bb} (98%) diff --git a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch index d80d082ba3f..fc803c73c78 100644 --- a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch +++ b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch @@ -9,12 +9,16 @@ different flags than git builds on other host distros. Upstream-Status: Inappropriate [upstream needs to check compiler and component versions properly] Signed-off-by: Alexander Kanavin +Rebased for 2.45.1. + +Signed-off-by: Robert Yang + --- config.mak.uname | 4 1 file changed, 4 deletions(-) diff --git a/config.mak.uname b/config.mak.uname -index 259d151..136ae3b 100644 +index a7607a5..251057e 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux) @@ -22,9 +26,9 @@ index 259d151..136ae3b 100644 HAVE_PLATFORM_PROCINFO = YesPlease COMPAT_OBJS += compat/linux/procinfo.o - # centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7. -- ifneq ($(findstring .el7.,$(uname_R)),) +-ifneq ($(findstring .el7.,$(uname_R)),) - BASIC_CFLAGS += -std=c99 -- endif +-endif endif ifeq ($(uname_S),GNU/kFreeBSD) HAVE_ALLOCA_H = YesPlease diff --git a/meta/recipes-devtools/git/git_2.44.0.bb b/meta/recipes-devtools/git/git_2.45.1.bb similarity index 98% rename from meta/recipes-devtools/git/git_2.44.0.bb rename to meta/recipes-devtools/git/git_2.45.1.bb index 78b00dd19f0..d1b3e6ad408 100644 --- a/meta/recipes-devtools/git/git_2.44.0.bb +++ b/meta/recipes-devtools/git/git_2.45.1.bb @@ -164,4 +164,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "f9e36f085458fe9688fbbe7846b8c4770b13d161fcd8953655f36b2b85f06b76" +SRC_URI[tarball.sha256sum] = "10acb581993061e616be9c5674469335922025a666318e0748cb8306079fef24" -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199840): https://lists.openembedded.org/g/openembedded-core/message/199840 Mute This Topic: https://lists.openembedded.org/mt/106279055/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] quilt: 0.67 -> 0.68
From: Robert Yang * Remove backported patches: fix-grep-3.8.patch. faildiff-order.patch 0001-test-Fix-a-race-condition-in-merge.test.patch Signed-off-by: Robert Yang --- ...lt-native_0.67.bb => quilt-native_0.68.bb} | 0 meta/recipes-devtools/quilt/quilt.inc | 5 +- ...t-Fix-a-race-condition-in-merge.test.patch | 48 -- .../quilt/quilt/faildiff-order.patch | 41 - .../quilt/quilt/fix-grep-3.8.patch| 144 -- .../quilt/{quilt_0.67.bb => quilt_0.68.bb}| 0 6 files changed, 1 insertion(+), 237 deletions(-) rename meta/recipes-devtools/quilt/{quilt-native_0.67.bb => quilt-native_0.68.bb} (100%) delete mode 100644 meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch delete mode 100644 meta/recipes-devtools/quilt/quilt/faildiff-order.patch delete mode 100644 meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch rename meta/recipes-devtools/quilt/{quilt_0.67.bb => quilt_0.68.bb} (100%) diff --git a/meta/recipes-devtools/quilt/quilt-native_0.67.bb b/meta/recipes-devtools/quilt/quilt-native_0.68.bb similarity index 100% rename from meta/recipes-devtools/quilt/quilt-native_0.67.bb rename to meta/recipes-devtools/quilt/quilt-native_0.68.bb diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 1d90d3d84d7..9faee82fbc6 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -11,14 +11,11 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ file://run-ptest \ file://test.sh \ file://0001-tests-Allow-different-output-from-mv.patch \ -file://fix-grep-3.8.patch \ -file://faildiff-order.patch \ -file://0001-test-Fix-a-race-condition-in-merge.test.patch \ " SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" -SRC_URI[sha256sum] = "3be3be0987e72a6c364678bb827e3e1fcc10322b56bc5f02b576698f55013cc2" +SRC_URI[sha256sum] = "fe8c09de03c106e85b3737c8f03ade147c956b79ed7af485a1c8a3858db38426" inherit autotools-brokensep ptest diff --git a/meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch b/meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch deleted file mode 100644 index 01d4c8befcb..000 --- a/meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c1ce964f3e9312100a60f03c1e1fdd601e1911f2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Tue, 28 Feb 2023 18:45:15 +0100 -Subject: [PATCH] test: Fix a race condition in merge.test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Just like commit 4dfe7f9, (test: Fix a race condition, 2023-01-20), -this fix a test race when stdout and stderr in any order. - -Upstream-Status: Backport [https://git.savannah.nongnu.org/cgit/quilt.git/commit/?id=c1ce964f3e9312100a60f03c1e1fdd601e1911f2] -Signed-off-by: Đoàn Trần Công Danh -Signed-off-by: Jean Delvare - test/merge.test | 6 -- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/test/merge.test b/test/merge.test -index c64b33d..2e67d4f 100644 a/test/merge.test -+++ b/test/merge.test -@@ -39,8 +39,9 @@ Test the patch merging functionality of `quilt diff'. - > Applying patch %{P}c.diff - > Now at patch %{P}c.diff - -- $ quilt diff -P b.diff | grep -v "^\\(---\\|+++\\)" -+ $ quilt diff -P b.diff >/dev/null - > Warning: more recent patches modify files in patch %{P}b.diff -+ $ quilt diff -P b.diff 2>/dev/null | grep -v "^\\(---\\|+++\\)" - >~ Index: [^/]+/abc\.txt - > === - > @@ -1,3 +1,3 @@ -@@ -49,8 +50,9 @@ Test the patch merging functionality of `quilt diff'. - > +b+ - > c - -- $ quilt diff --combine a.diff -P b.diff | grep -v "^\\(---\\|+++\\)" -+ $ quilt diff --combine a.diff -P b.diff >/dev/null - > Warning: more recent patches modify files in patch %{P}b.diff -+ $ quilt diff --combine a.diff -P b.diff 2>/dev/null | grep -v "^\\(---\\|+++\\)" - >~ Index: [^/]+/abc\.txt - > === - > @@ -1,3 +1,3 @@ --- -2.40.0 - diff --git a/meta/recipes-devtools/quilt/quilt/faildiff-order.patch b/meta/recipes-devtools/quilt/quilt/faildiff-order.patch deleted file mode 100644 index f22065a2507..000 --- a/meta/recipes-devtools/quilt/quilt/faildiff-order.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 4dfe7f9e702c85243a71e4de267a13e434b6d6c2 Mon Sep 17 00:00:00 2001 -From
[OE-core] [PATCH 1/3] strace: upgrade 6.8 -> 6.9
From: Robert Yang This patch is made by AUH and rebased the following patches: 0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch 0001-strace-fix-reproducibilty-issues.patch 0002-tests-Replace-off64_t-with-off_t.patch Makefile-ptest.patch ptest-spacesave.patch skip-load.patch update-gawk-paths.patch Signed-off-by: Robert Yang --- ...toconf-macro-to-detect-largefile-sup.patch | 6 +- ...001-strace-fix-reproducibilty-issues.patch | 9 +-- ...002-tests-Replace-off64_t-with-off_t.patch | 35 ++ .../strace/strace/Makefile-ptest.patch| 9 ++- .../strace/strace/ptest-spacesave.patch | 7 +- .../strace/strace/skip-load.patch | 9 +-- .../strace/strace/update-gawk-paths.patch | 70 ++- .../strace/{strace_6.8.bb => strace_6.9.bb} | 2 +- 8 files changed, 76 insertions(+), 71 deletions(-) rename meta/recipes-devtools/strace/{strace_6.8.bb => strace_6.9.bb} (96%) diff --git a/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch b/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch index 76ca7a76a85..86dcd97713a 100644 --- a/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch +++ b/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch @@ -1,4 +1,4 @@ -From 470399f3636c412b74f9daf6ae430b13c3126f02 Mon Sep 17 00:00:00 2001 +From ec543417b8e1df7c71dfc4728313849d9ab669a6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 15 Dec 2022 15:54:27 -0800 Subject: [PATCH] configure: Use autoconf macro to detect largefile support @@ -13,10 +13,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac -index 4797b42dd..7d57fb254 100644 +index 36fff90..9e40ab5 100644 --- a/configure.ac +++ b/configure.ac -@@ -43,6 +43,8 @@ AC_PROG_INSTALL +@@ -42,6 +42,8 @@ AC_PROG_INSTALL AC_PROG_RANLIB AC_PROG_LN_S diff --git a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch index c4c176e6bcd..9cdb7c6134e 100644 --- a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch +++ b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch @@ -1,4 +1,4 @@ -From 6309792c49ca900cec6a7f1dc5b51bf75b629e11 Mon Sep 17 00:00:00 2001 +From d5f681c2de834110de260f4d071c7bc1fb0d7564 Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman Date: Wed, 11 Mar 2020 19:56:55 + Subject: [PATCH] strace: fix reproducibilty issues @@ -13,7 +13,7 @@ Signed-off-by: Jeremy Puhlman 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh -index 5e1e7c9..1e65eac 100755 +index 8f47651..65267db 100755 --- a/tests/gen_tests.sh +++ b/tests/gen_tests.sh @@ -46,7 +46,7 @@ while read -r name arg0 args; do { @@ -25,7 +25,7 @@ index 5e1e7c9..1e65eac 100755 case "$arg0" in +*) -@@ -80,7 +80,7 @@ while read -r name arg0 args; do { +@@ -91,7 +91,7 @@ while read -r name arg0 args; do { if [ -n "$names" ]; then { @@ -34,6 +34,3 @@ index 5e1e7c9..1e65eac 100755 printf 'GEN_TESTS =' printf ' %s.gen.test' $names echo --- -2.24.1 - diff --git a/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch b/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch index 0cabdfe99f8..fc6ed7ac4d2 100644 --- a/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch +++ b/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch @@ -1,4 +1,4 @@ -From 579b2ebe52d4b97f954e6188df2d07e137820075 Mon Sep 17 00:00:00 2001 +From 1891db87da3b204c512f47155aaa4e692008f1bf Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 15 Dec 2022 15:56:13 -0800 Subject: [PATCH] tests: Replace off64_t with off_t @@ -10,9 +10,12 @@ Upstream-Status: Submitted [https://github.com/strace/strace/pull/230] Signed-off-by: Khem Raj --- tests/readahead.c| 2 +- + tests/sync_file_range.c | 4 ++-- tests/sync_file_range2.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + 3 files changed, 5 insertions(+), 5 deletions(-) +diff --git a/tests/readahead.c b/tests/readahead.c +index 1072378..b9597e6 100644 --- a/tests/readahead.c +++ b/tests/readahead.c @@ -42,7 +42,7 @@ static const int fds[] = { @@ -24,29 +27,33 @@ Signed-off-by: Khem Raj -0x8000LL, -0x5060708090a0b0c0LL, -1LL, a/tests/sync_file_range2.c -+++ b/tests/sync_file_range2.c +diff --git a/tests/sync_file_range.c b/tests/sync_file_range.c +index e93ab6c..dc76865 100644 +--- a/tests/sync_file_range.c b/tests/sync_file_range.c @@ -20,
[OE-core] [PATCH 0/3] Upgrade strace quilt and git
From: Robert Yang The following changes since commit 50f78cb9de68cd4317f34321dfdb06d72ce5d3c6: useradd-example: Fix S = WORKDIR reference (2024-05-23 11:25:27 +0100) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/upgrade https://github.com/robertlinux/yocto/tree/rbt/upgrade Robert Yang (3): strace: upgrade 6.8 -> 6.9 quilt: 0.67 -> 0.68 git: 2.44.0 -> 2.45.1 ...-do-not-force-RHEL-7-specific-build-.patch | 10 +- .../git/{git_2.44.0.bb => git_2.45.1.bb} | 2 +- ...lt-native_0.67.bb => quilt-native_0.68.bb} | 0 meta/recipes-devtools/quilt/quilt.inc | 5 +- ...t-Fix-a-race-condition-in-merge.test.patch | 48 -- .../quilt/quilt/faildiff-order.patch | 41 - .../quilt/quilt/fix-grep-3.8.patch| 144 -- .../quilt/{quilt_0.67.bb => quilt_0.68.bb}| 0 ...toconf-macro-to-detect-largefile-sup.patch | 6 +- ...001-strace-fix-reproducibilty-issues.patch | 9 +- ...002-tests-Replace-off64_t-with-off_t.patch | 35 +++-- .../strace/strace/Makefile-ptest.patch| 9 +- .../strace/strace/ptest-spacesave.patch | 7 +- .../strace/strace/skip-load.patch | 9 +- .../strace/strace/update-gawk-paths.patch | 70 - .../strace/{strace_6.8.bb => strace_6.9.bb} | 2 +- 16 files changed, 85 insertions(+), 312 deletions(-) rename meta/recipes-devtools/git/{git_2.44.0.bb => git_2.45.1.bb} (98%) rename meta/recipes-devtools/quilt/{quilt-native_0.67.bb => quilt-native_0.68.bb} (100%) delete mode 100644 meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch delete mode 100644 meta/recipes-devtools/quilt/quilt/faildiff-order.patch delete mode 100644 meta/recipes-devtools/quilt/quilt/fix-grep-3.8.patch rename meta/recipes-devtools/quilt/{quilt_0.67.bb => quilt_0.68.bb} (100%) rename meta/recipes-devtools/strace/{strace_6.8.bb => strace_6.9.bb} (96%) -- 2.45.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199837): https://lists.openembedded.org/g/openembedded-core/message/199837 Mute This Topic: https://lists.openembedded.org/mt/106279052/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/1] autoconf: 2.72d -> 2.72e
From: Robert Yang The following changes since commit 38a5fc5dbb33fd3314f0a98c861a842342add064: xmlcatalog: limit to native recipes only (2024-01-12 11:51:18 +) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/upgrade https://github.com/robertlinux/yocto/tree/rbt/upgrade Robert Yang (1): autoconf: 2.72d -> 2.72e .../autoconf/autoreconf-exclude.patch | 26 +-- .../autotest-automake-result-format.patch | 22 +++- .../autoconf/autoconf/man-host-perl.patch | 13 +++--- .../autoconf/autoconf/no-man.patch| 19 -- .../autoconf/autoconf/preferbash.patch| 12 - .../autoconf/autoconf/program_prefix.patch| 12 - .../remove-usr-local-lib-from-m4.patch| 12 - .../{autoconf_2.72d.bb => autoconf_2.72e.bb} | 2 +- 8 files changed, 65 insertions(+), 53 deletions(-) rename meta/recipes-devtools/autoconf/{autoconf_2.72d.bb => autoconf_2.72e.bb} (96%) -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#193632): https://lists.openembedded.org/g/openembedded-core/message/193632 Mute This Topic: https://lists.openembedded.org/mt/103734281/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/1] autoconf: 2.72d -> 2.72e
From: Robert Yang Refresh patches with devtool to fix do_patch errors. Signed-off-by: Robert Yang --- .../autoconf/autoreconf-exclude.patch | 26 +-- .../autotest-automake-result-format.patch | 22 +++- .../autoconf/autoconf/man-host-perl.patch | 13 +++--- .../autoconf/autoconf/no-man.patch| 19 -- .../autoconf/autoconf/preferbash.patch| 12 - .../autoconf/autoconf/program_prefix.patch| 12 - .../remove-usr-local-lib-from-m4.patch| 12 - .../{autoconf_2.72d.bb => autoconf_2.72e.bb} | 2 +- 8 files changed, 65 insertions(+), 53 deletions(-) rename meta/recipes-devtools/autoconf/{autoconf_2.72d.bb => autoconf_2.72e.bb} (96%) diff --git a/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch index c73aca41ee8..28141962008 100644 --- a/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch +++ b/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch @@ -1,25 +1,26 @@ -From 0071d28e304745a16871561f23117fdb00dd2559 Mon Sep 17 00:00:00 2001 +From 1a50157aa11da48921200a0d8d4308863716eab0 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 12 Mar 2020 17:25:23 + -Subject: [PATCH 4/7] autoreconf-exclude.patch +Subject: [PATCH] autoreconf-exclude.patch Upstream-Status: Inappropriate [oe specific] + --- bin/autoreconf.in | 26 ++ 1 file changed, 26 insertions(+) diff --git a/bin/autoreconf.in b/bin/autoreconf.in -index bb9f316d..7da3005b 100644 +index 98ebab6..937f758 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in -@@ -82,6 +82,7 @@ Operation modes: +@@ -83,6 +83,7 @@ Operation modes: -i, --installcopy missing standard auxiliary files --no-recursive don't rebuild sub-packages -s, --symlinkwith -i, install symbolic links instead of copies + -x, --exclude=STEPS steps we should not run -m, --make when applicable, re-run ./configure && make - -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] - + -W, --warnings=CATEGORY report the warnings falling in CATEGORY +(comma-separated list accepted) @@ -141,6 +142,10 @@ my $run_make = 0; # Recurse into subpackages my $recursive = 1; @@ -60,7 +61,7 @@ index bb9f316d..7da3005b 100644 } -@@ -687,9 +698,12 @@ sub autoreconf_current_directory ($) +@@ -691,9 +702,12 @@ sub autoreconf_current_directory ($) { $libtoolize .= " --ltdl"; } @@ -73,7 +74,7 @@ index bb9f316d..7da3005b 100644 } else { -@@ -726,8 +740,11 @@ sub autoreconf_current_directory ($) +@@ -730,8 +744,11 @@ sub autoreconf_current_directory ($) } elsif ($install) { @@ -85,7 +86,7 @@ index bb9f316d..7da3005b 100644 } else { -@@ -765,7 +782,10 @@ sub autoreconf_current_directory ($) +@@ -769,7 +786,10 @@ sub autoreconf_current_directory ($) # latter runs the former, and (ii) autoconf is stricter than # autoheader. So all in all, autoconf should give better error # messages. @@ -96,7 +97,7 @@ index bb9f316d..7da3005b 100644 # # -@@ -786,7 +806,10 @@ sub autoreconf_current_directory ($) +@@ -790,7 +810,10 @@ sub autoreconf_current_directory ($) } else { @@ -107,7 +108,7 @@ index bb9f316d..7da3005b 100644 } -@@ -803,7 +826,10 @@ sub autoreconf_current_directory ($) +@@ -807,7 +830,10 @@ sub autoreconf_current_directory ($) # We should always run automake, and let it decide whether it shall # update the file or not. In fact, the effect of '$force' is already # included in '$automake' via '--no-force'. @@ -118,6 +119,3 @@ index bb9f316d..7da3005b 100644 } # # --- -2.25.1 - diff --git a/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch b/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch index 23329f79279..38725574bac 100644 --- a/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch +++ b/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch @@ -1,18 +1,19 @@ -From 8c0f24404bebffdaf3132d81e2b9560d34ff1677 Mon Sep 17 00:00:00 2001 +From b28bd61e4716e744617bd681a5b0d5472f62bd67 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 12 Mar 2020 17:25:45 + -Subject: [PATCH 6/7] autotest-automake-result-format.patch +Subject: [PATCH] autotest-automake-result-format.patch Upstream-Status: Inappropriate [oe specific] + --- lib/autotest/general.m4 | 39 +-- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4 -index 0c0e3c5b..17590e96 100644 +index
[OE-core] [PATCH v2 1/1] archiver.bbclass: Drop tarfile module to improve performance
From: Robert Yang * The tarfile module doesn't support xz options or environment varible XZ_DEFAULTS, this makes do_ar_patched incrediblely slow when the file is large, for example, chromium-x11 is about 3GB: - "bitbake chromium-x11 -car_patched" hasn't been done after 3 hours on my host, I checked the partial tar.xz file is only 1.5GB, so maybe more than 6 hours is required to complete the task. - Now only less than 4 minutes is needed on the same host. * Need add xz to HOSTTOOLS when archiver.bbclass is enabled and compression is xz. Signed-off-by: Robert Yang --- meta/classes/archiver.bbclass | 28 meta/conf/bitbake.conf| 3 +++ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 80a69cf31db..2d0bbfbd422 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -401,19 +401,11 @@ python do_ar_mirror() { subprocess.check_call(cmd, shell=True) } -def exclude_useless_paths(tarinfo): -if tarinfo.isdir(): -if tarinfo.name.endswith('/temp') or tarinfo.name.endswith('/patches') or tarinfo.name.endswith('/.pc'): -return None -elif tarinfo.name == 'temp' or tarinfo.name == 'patches' or tarinfo.name == '.pc': -return None -return tarinfo - def create_tarball(d, srcdir, suffix, ar_outdir): """ create the tarball from srcdir """ -import tarfile +import subprocess # Make sure we are only creating a single tarball for gcc sources if (d.getVar('SRC_URI') == ""): @@ -425,6 +417,16 @@ def create_tarball(d, srcdir, suffix, ar_outdir): srcdir = os.path.realpath(srcdir) compression_method = d.getVarFlag('ARCHIVER_MODE', 'compression') +if compression_method == "xz": +compression_cmd = "xz %s" % d.getVar('XZ_DEFAULTS') +# To keep compatibility with ARCHIVER_MODE[compression] +elif compression_method == "gz": +compression_cmd = "gzip" +elif compression_method == "bz2": +compression_cmd = "bzip2" +else: +bb.fatal("Unsupported compression_method: %s" % compression_method) + bb.utils.mkdirhier(ar_outdir) if suffix: filename = '%s-%s.tar.%s' % (d.getVar('PF'), suffix, compression_method) @@ -433,9 +435,11 @@ def create_tarball(d, srcdir, suffix, ar_outdir): tarname = os.path.join(ar_outdir, filename) bb.note('Creating %s' % tarname) -tar = tarfile.open(tarname, 'w:%s' % compression_method) -tar.add(srcdir, arcname=os.path.basename(srcdir), filter=exclude_useless_paths) -tar.close() +dirname = os.path.dirname(srcdir) +basename = os.path.basename(srcdir) +exclude = "--exclude=temp --exclude=patches --exclude='.pc'" +tar_cmd = "tar %s -cf - %s | %s > %s" % (exclude, basename, compression_cmd, tarname) +subprocess.check_call(tar_cmd, cwd=dirname, shell=True) # creating .diff.gz between source.orig and source def create_diff_gz(d, src_orig, src, ar_outdir): diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 83b12cbc158..f838444af03 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -529,6 +529,9 @@ HOSTTOOLS += " \ # Tools needed to run testimage runtime image testing HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}" +# Used by archiver.bbclass when compression is xz +HOSTTOOLS += "${@'xz' if (('archiver.bbclass' in (d.getVar('BBINCLUDED') or '')) and (d.getVarFlag('ARCHIVER_MODE', 'compression') == 'xz')) else ''}" + # Link to these if present HOSTTOOLS_NONFATAL += "aws gcc-ar gpg gpg-agent ld.bfd ld.gold nc pigz sftp socat ssh sudo" -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192864): https://lists.openembedded.org/g/openembedded-core/message/192864 Mute This Topic: https://lists.openembedded.org/mt/103314944/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 0/1] archiver.bbclass: Drop tarfile module to improve performance
From: Robert Yang * V2: - Fix for layerindex error: TypeError: argument of type 'NoneType' is not iterable The following changes since commit 1bfa564f1aa8b865f6c3ae3501e6d5f6cc0542eb: curl: Disable two intermittently failing tests (2023-12-21 13:49:45 +) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/archiver https://github.com/robertlinux/yocto/tree/rbt/archiver Robert Yang (1): archiver.bbclass: Drop tarfile module to improve performance meta/classes/archiver.bbclass | 28 meta/conf/bitbake.conf| 3 +++ 2 files changed, 19 insertions(+), 12 deletions(-) -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192863): https://lists.openembedded.org/g/openembedded-core/message/192863 Mute This Topic: https://lists.openembedded.org/mt/103314943/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 1/1] archiver.bbclass: Drop tarfile module to improve performance
On 12/20/23 02:52, Robert Yang via lists.openembedded.org wrote: From: Robert Yang * The tarfile module doesn't support xz options or environment varible XZ_DEFAULTS, this makes do_ar_patched incrediblely slow when the file is large, for example, chromium-x11 is about 3GB: - "bitbake chromium-x11 -car_patched" hasn't been done after 3 hours on my host, I checked the partial tar.xz file is only 1.5GB, so maybe more than 6 hours is required to complete the task. - Now only less than 4 minutes is needed on the same host. * Need add xz to HOSTTOOLS when archiver.bbclass is enabled and compression is xz. Signed-off-by: Robert Yang --- meta/classes/archiver.bbclass | 28 meta/conf/bitbake.conf| 3 +++ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 80a69cf31db..2d0bbfbd422 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -401,19 +401,11 @@ python do_ar_mirror() { subprocess.check_call(cmd, shell=True) } -def exclude_useless_paths(tarinfo): -if tarinfo.isdir(): -if tarinfo.name.endswith('/temp') or tarinfo.name.endswith('/patches') or tarinfo.name.endswith('/.pc'): -return None -elif tarinfo.name == 'temp' or tarinfo.name == 'patches' or tarinfo.name == '.pc': -return None -return tarinfo - def create_tarball(d, srcdir, suffix, ar_outdir): """ create the tarball from srcdir """ -import tarfile +import subprocess # Make sure we are only creating a single tarball for gcc sources if (d.getVar('SRC_URI') == ""): @@ -425,6 +417,16 @@ def create_tarball(d, srcdir, suffix, ar_outdir): srcdir = os.path.realpath(srcdir) compression_method = d.getVarFlag('ARCHIVER_MODE', 'compression') +if compression_method == "xz": +compression_cmd = "xz %s" % d.getVar('XZ_DEFAULTS') +# To keep compatibility with ARCHIVER_MODE[compression] +elif compression_method == "gz": +compression_cmd = "gzip" +elif compression_method == "bz2": +compression_cmd = "bzip2" +else: +bb.fatal("Unsupported compression_method: %s" % compression_method) + bb.utils.mkdirhier(ar_outdir) if suffix: filename = '%s-%s.tar.%s' % (d.getVar('PF'), suffix, compression_method) @@ -433,9 +435,11 @@ def create_tarball(d, srcdir, suffix, ar_outdir): tarname = os.path.join(ar_outdir, filename) bb.note('Creating %s' % tarname) -tar = tarfile.open(tarname, 'w:%s' % compression_method) -tar.add(srcdir, arcname=os.path.basename(srcdir), filter=exclude_useless_paths) -tar.close() +dirname = os.path.dirname(srcdir) +basename = os.path.basename(srcdir) +exclude = "--exclude=temp --exclude=patches --exclude='.pc'" +tar_cmd = "tar %s -cf - %s | %s > %s" % (exclude, basename, compression_cmd, tarname) +subprocess.check_call(tar_cmd, cwd=dirname, shell=True) # creating .diff.gz between source.orig and source def create_diff_gz(d, src_orig, src, ar_outdir): diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index e7826e7af96..681af512bfa 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -528,6 +528,9 @@ HOSTTOOLS += " \ # Tools needed to run testimage runtime image testing HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}" +# Used by archiver.bbclass when compression is xz +HOSTTOOLS += "${@'xz' if (('archiver.bbclass' in d.getVar('BBINCLUDED')) and (d.getVarFlag('ARCHIVER_MODE', 'compression') == 'xz')) else ''}" Sorry, please ignore this patch, I will send a V2. The BBINCLUDED maybe None in layerindex which makes layerindex failed. // Robert + # Link to these if present HOSTTOOLS_NONFATAL += "aws gcc-ar gpg gpg-agent ld.bfd ld.gold nc pigz sftp socat ssh sudo" -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192856): https://lists.openembedded.org/g/openembedded-core/message/192856 Mute This Topic: https://lists.openembedded.org/mt/103268096/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/1] archiver.bbclass: Drop tarfile module to improve performance
From: Robert Yang * The tarfile module doesn't support xz options or environment varible XZ_DEFAULTS, this makes do_ar_patched incrediblely slow when the file is large, for example, chromium-x11 is about 3GB: - "bitbake chromium-x11 -car_patched" hasn't been done after 3 hours on my host, I checked the partial tar.xz file is only 1.5GB, so maybe more than 6 hours is required to complete the task. - Now only less than 4 minutes is needed on the same host. * Need add xz to HOSTTOOLS when archiver.bbclass is enabled and compression is xz. Signed-off-by: Robert Yang --- meta/classes/archiver.bbclass | 28 meta/conf/bitbake.conf| 3 +++ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 80a69cf31db..2d0bbfbd422 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -401,19 +401,11 @@ python do_ar_mirror() { subprocess.check_call(cmd, shell=True) } -def exclude_useless_paths(tarinfo): -if tarinfo.isdir(): -if tarinfo.name.endswith('/temp') or tarinfo.name.endswith('/patches') or tarinfo.name.endswith('/.pc'): -return None -elif tarinfo.name == 'temp' or tarinfo.name == 'patches' or tarinfo.name == '.pc': -return None -return tarinfo - def create_tarball(d, srcdir, suffix, ar_outdir): """ create the tarball from srcdir """ -import tarfile +import subprocess # Make sure we are only creating a single tarball for gcc sources if (d.getVar('SRC_URI') == ""): @@ -425,6 +417,16 @@ def create_tarball(d, srcdir, suffix, ar_outdir): srcdir = os.path.realpath(srcdir) compression_method = d.getVarFlag('ARCHIVER_MODE', 'compression') +if compression_method == "xz": +compression_cmd = "xz %s" % d.getVar('XZ_DEFAULTS') +# To keep compatibility with ARCHIVER_MODE[compression] +elif compression_method == "gz": +compression_cmd = "gzip" +elif compression_method == "bz2": +compression_cmd = "bzip2" +else: +bb.fatal("Unsupported compression_method: %s" % compression_method) + bb.utils.mkdirhier(ar_outdir) if suffix: filename = '%s-%s.tar.%s' % (d.getVar('PF'), suffix, compression_method) @@ -433,9 +435,11 @@ def create_tarball(d, srcdir, suffix, ar_outdir): tarname = os.path.join(ar_outdir, filename) bb.note('Creating %s' % tarname) -tar = tarfile.open(tarname, 'w:%s' % compression_method) -tar.add(srcdir, arcname=os.path.basename(srcdir), filter=exclude_useless_paths) -tar.close() +dirname = os.path.dirname(srcdir) +basename = os.path.basename(srcdir) +exclude = "--exclude=temp --exclude=patches --exclude='.pc'" +tar_cmd = "tar %s -cf - %s | %s > %s" % (exclude, basename, compression_cmd, tarname) +subprocess.check_call(tar_cmd, cwd=dirname, shell=True) # creating .diff.gz between source.orig and source def create_diff_gz(d, src_orig, src, ar_outdir): diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index e7826e7af96..681af512bfa 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -528,6 +528,9 @@ HOSTTOOLS += " \ # Tools needed to run testimage runtime image testing HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}" +# Used by archiver.bbclass when compression is xz +HOSTTOOLS += "${@'xz' if (('archiver.bbclass' in d.getVar('BBINCLUDED')) and (d.getVarFlag('ARCHIVER_MODE', 'compression') == 'xz')) else ''}" + # Link to these if present HOSTTOOLS_NONFATAL += "aws gcc-ar gpg gpg-agent ld.bfd ld.gold nc pigz sftp socat ssh sudo" -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192756): https://lists.openembedded.org/g/openembedded-core/message/192756 Mute This Topic: https://lists.openembedded.org/mt/103268096/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/1] archiver.bbclass: Drop tarfile module to improve performance
From: Robert Yang The following changes since commit 6b729088dce302eb3a967cb6839f00488025be0e: build-appliance-image: Update to master head revision (2023-12-18 09:42:59 +) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/archiver https://github.com/robertlinux/yocto/tree/rbt/archiver Robert Yang (1): archiver.bbclass: Drop tarfile module to improve performance meta/classes/archiver.bbclass | 28 meta/conf/bitbake.conf| 3 +++ 2 files changed, 19 insertions(+), 12 deletions(-) -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192755): https://lists.openembedded.org/g/openembedded-core/message/192755 Mute This Topic: https://lists.openembedded.org/mt/103268095/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/1] nfs-utils: Update Upstream-Status
From: Robert Yang The following changes since commit ae642a4b038c6946e6c8aa9778bf09099d938a31: sstate: Fix dir ownership issues in SSTATE_DIR (2023-12-15 11:14:29 +) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/nfs-utils https://github.com/robertlinux/yocto/tree/rbt/nfs-utils Robert Yang (1): nfs-utils: Update Upstream-Status .../0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192432): https://lists.openembedded.org/g/openembedded-core/message/192432 Mute This Topic: https://lists.openembedded.org/mt/103190381/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/1] nfs-utils: Update Upstream-Status
From: Robert Yang Update Upstream-Status for 0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch. Signed-off-by: Robert Yang --- .../0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch index 8607b64cb1f..57d4660571f 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch @@ -9,7 +9,7 @@ reexport.c:62:17: error: implicit declaration of function 'sleep' [-Werror=impli 62 | sleep(1); -Upstream-Status: Pending +Upstream-Status: Submitted [https://marc.info/?l=linux-nfs=170254661824522=2] Signed-off-by: Robert Yang --- -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192433): https://lists.openembedded.org/g/openembedded-core/message/192433 Mute This Topic: https://lists.openembedded.org/mt/103190382/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 v3 1/1] nfs-utils: Upgrade 2.6.3 -> 2.6.4
Hi Ross, On 12/13/23 19:19, Ross Burton wrote: On 11 Dec 2023, at 14:49, Robert Yang via lists.openembedded.org wrote: +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch @@ -0,0 +1,34 @@ +From 45597a58e98f351b18db8444292b1cf6dd0cd810 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Sat, 9 Dec 2023 23:34:08 -0800 +Subject: [PATCH] reexport.h: Include unistd.h to compile with musl + +Fixed error when compile with musl +reexport.c: In function 'reexpdb_init': +reexport.c:62:17: error: implicit declaration of function 'sleep' [-Werror=implicit-function-declaration] + 62 | sleep(1); + + +Upstream-Status: Pending Can you upstream this please? Submitted: https://marc.info/?l=linux-nfs=170254661824522=2 // Robert Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192342): https://lists.openembedded.org/g/openembedded-core/message/192342 Mute This Topic: https://lists.openembedded.org/mt/103109787/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/1] archiver.bbclass: Improve work-shared checking
From: Robert Yang There are other recipes except the listed ones which use work-shared, improve the checking to make other recipes such as llvm-project-source work with do_ar_patched. Signed-off-by: Robert Yang --- meta/classes/archiver.bbclass | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 0eee1abefab..80a69cf31db 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -468,10 +468,8 @@ def create_diff_gz(d, src_orig, src, ar_outdir): os.chdir(cwd) def is_work_shared(d): -pn = d.getVar('PN') -return pn.startswith('gcc-source') or \ -bb.data.inherits_class('kernel', d) or \ -(bb.data.inherits_class('kernelsrc', d) and d.expand("${TMPDIR}/work-shared") in d.getVar('S')) +sharedworkdir = os.path.join(d.getVar('TMPDIR'), 'work-shared') +return d.getVar('S').startswith(sharedworkdir) # Run do_unpack and do_patch python do_unpack_and_patch() { -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192173): https://lists.openembedded.org/g/openembedded-core/message/192173 Mute This Topic: https://lists.openembedded.org/mt/103110276/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/1] archiver.bbclass: Improve work-shared checking
From: Robert Yang The following changes since commit 564339afb73fc52a66c1a08437587cad1c4d46e7: useradd: Fix useradd do_populate_sysroot dependency bug (2023-12-10 09:23:58 +) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/archiver https://github.com/robertlinux/yocto/tree/rbt/archiver Robert Yang (1): archiver.bbclass: Improve work-shared checking meta/classes/archiver.bbclass | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192174): https://lists.openembedded.org/g/openembedded-core/message/192174 Mute This Topic: https://lists.openembedded.org/mt/103110277/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 v3 0/1] nfs-utils: Upgrade 2.6.3 -> 2.6.4
From: Robert Yang * V3: Add the lost patch 0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch * V2: Fix build error with musl * V1: Initial version The following changes since commit 564339afb73fc52a66c1a08437587cad1c4d46e7: useradd: Fix useradd do_populate_sysroot dependency bug (2023-12-10 09:23:58 +) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/upgrade https://github.com/robertlinux/yocto/tree/rbt/upgrade Robert Yang (1): nfs-utils: Upgrade 2.6.3 -> 2.6.4 ...event-and-libsqlite3-checked-when-nf.patch | 80 --- ...nclude-unistd.h-to-compile-with-musl.patch | 34 ...{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} | 8 +- 3 files changed, 38 insertions(+), 84 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} (94%) -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192171): https://lists.openembedded.org/g/openembedded-core/message/192171 Mute This Topic: https://lists.openembedded.org/mt/103109786/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 v3 1/1] nfs-utils: Upgrade 2.6.3 -> 2.6.4
From: Robert Yang * Remove backported patch 0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch. * Add 0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch to fix build with musl Signed-off-by: Robert Yang --- ...event-and-libsqlite3-checked-when-nf.patch | 80 --- ...nclude-unistd.h-to-compile-with-musl.patch | 34 ...{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} | 8 +- 3 files changed, 38 insertions(+), 84 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} (94%) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch deleted file mode 100644 index 5afc714f190..000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch +++ /dev/null @@ -1,80 +0,0 @@ -From b62a3fe424026b73ec6b1934483b16863c7dff23 Mon Sep 17 00:00:00 2001 -From: Wiktor Jaskulski -Date: Thu, 11 May 2023 15:28:23 -0400 -Subject: [PATCH] configure.ac: libevent and libsqlite3 checked when nfsv4 is - disabled - -Upstream-Status: Backport -(http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca) - -Signed-off-by: Steve Dickson -Signed-off-by: Trevor Gamblin - configure.ac | 38 +++--- - 1 file changed, 15 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4ade528d..519cacbf 100644 a/configure.ac -+++ b/configure.ac -@@ -335,42 +335,34 @@ AC_CHECK_HEADER(rpc/rpc.h, , - AC_MSG_ERROR([Header file rpc/rpc.h not found - maybe try building with --enable-tirpc])) - CPPFLAGS="${nfsutils_save_CPPFLAGS}" - -+dnl check for libevent libraries and headers -+AC_LIBEVENT -+ -+dnl Check for sqlite3 -+AC_SQLITE3_VERS -+ -+case $libsqlite3_cv_is_recent in -+yes) ;; -+unknown) -+ dnl do not fail when cross-compiling -+ AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; -+*) -+ AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; -+esac -+ - if test "$enable_nfsv4" = yes; then -- dnl check for libevent libraries and headers -- AC_LIBEVENT - - dnl check for the keyutils libraries and headers - AC_KEYUTILS - -- dnl Check for sqlite3 -- AC_SQLITE3_VERS -- - if test "$enable_nfsdcld" = "yes"; then - AC_CHECK_HEADERS([libgen.h sys/inotify.h], , - AC_MSG_ERROR([Cannot find header needed for nfsdcld])) -- --case $libsqlite3_cv_is_recent in --yes) ;; --unknown) -- dnl do not fail when cross-compiling -- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; --*) -- AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; --esac - fi - - if test "$enable_nfsdcltrack" = "yes"; then - AC_CHECK_HEADERS([libgen.h sys/inotify.h], , - AC_MSG_ERROR([Cannot find header needed for nfsdcltrack])) -- --case $libsqlite3_cv_is_recent in --yes) ;; --unknown) -- dnl do not fail when cross-compiling -- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; --*) -- AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;; --esac - fi - - else --- -2.41.0 - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch new file mode 100644 index 000..8607b64cb1f --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch @@ -0,0 +1,34 @@ +From 45597a58e98f351b18db8444292b1cf6dd0cd810 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Sat, 9 Dec 2023 23:34:08 -0800 +Subject: [PATCH] reexport.h: Include unistd.h to compile with musl + +Fixed error when compile with musl +reexport.c: In function 'reexpdb_init': +reexport.c:62:17: error: implicit declaration of function 'sleep' [-Werror=implicit-function-declaration] + 62 | sleep(1); + + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + support/reexport/reexport.h | 1 + + 1 files changed, 1 insertions(+) + +diff --git a/support/reexport/reexport.h b/support/reexport/reexport.h +index 85fd59c..02f8684 100644 +--- a/support/reexport/reexport.h b/support/reexport/reexport.h +@@ -1,6 +1,8 @@ + #ifndef REEXPORT_H + #define REEXPORT_H + ++#include ++ + #include "nfslib.h" + + enum { +-- +2.42.0 + diff --git a/meta/recipes-connectivity/nfs-utils/
Re: [OE-core] [PATCH v2 0/1] nfs-utils: Upgrade 2.6.3 -> 2.6.4
On 12/11/23 18:41, Robert Yang via lists.openembedded.org wrote: From: Robert Yang * V2: Fix build error with musl Sorry, please ignore V2, a patch was lost. // Robert * V1: Initial version The following changes since commit 564339afb73fc52a66c1a08437587cad1c4d46e7: useradd: Fix useradd do_populate_sysroot dependency bug (2023-12-10 09:23:58 +) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/upgrade https://github.com/robertlinux/yocto/tree/rbt/upgrade Robert Yang (1): nfs-utils: Upgrade 2.6.3 -> 2.6.4 ...event-and-libsqlite3-checked-when-nf.patch | 80 --- ...{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} | 3 +- 2 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} (97%) -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192170): https://lists.openembedded.org/g/openembedded-core/message/192170 Mute This Topic: https://lists.openembedded.org/mt/103106403/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 1/1] nfs-utils: Upgrade 2.6.3 -> 2.6.4
From: Robert Yang Remove backported patch 0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch. Signed-off-by: Robert Yang --- ...event-and-libsqlite3-checked-when-nf.patch | 80 --- ...{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} | 3 +- 2 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} (97%) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch deleted file mode 100644 index 5afc714f190..000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch +++ /dev/null @@ -1,80 +0,0 @@ -From b62a3fe424026b73ec6b1934483b16863c7dff23 Mon Sep 17 00:00:00 2001 -From: Wiktor Jaskulski -Date: Thu, 11 May 2023 15:28:23 -0400 -Subject: [PATCH] configure.ac: libevent and libsqlite3 checked when nfsv4 is - disabled - -Upstream-Status: Backport -(http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca) - -Signed-off-by: Steve Dickson -Signed-off-by: Trevor Gamblin - configure.ac | 38 +++--- - 1 file changed, 15 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4ade528d..519cacbf 100644 a/configure.ac -+++ b/configure.ac -@@ -335,42 +335,34 @@ AC_CHECK_HEADER(rpc/rpc.h, , - AC_MSG_ERROR([Header file rpc/rpc.h not found - maybe try building with --enable-tirpc])) - CPPFLAGS="${nfsutils_save_CPPFLAGS}" - -+dnl check for libevent libraries and headers -+AC_LIBEVENT -+ -+dnl Check for sqlite3 -+AC_SQLITE3_VERS -+ -+case $libsqlite3_cv_is_recent in -+yes) ;; -+unknown) -+ dnl do not fail when cross-compiling -+ AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; -+*) -+ AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; -+esac -+ - if test "$enable_nfsv4" = yes; then -- dnl check for libevent libraries and headers -- AC_LIBEVENT - - dnl check for the keyutils libraries and headers - AC_KEYUTILS - -- dnl Check for sqlite3 -- AC_SQLITE3_VERS -- - if test "$enable_nfsdcld" = "yes"; then - AC_CHECK_HEADERS([libgen.h sys/inotify.h], , - AC_MSG_ERROR([Cannot find header needed for nfsdcld])) -- --case $libsqlite3_cv_is_recent in --yes) ;; --unknown) -- dnl do not fail when cross-compiling -- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; --*) -- AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; --esac - fi - - if test "$enable_nfsdcltrack" = "yes"; then - AC_CHECK_HEADERS([libgen.h sys/inotify.h], , - AC_MSG_ERROR([Cannot find header needed for nfsdcltrack])) -- --case $libsqlite3_cv_is_recent in --yes) ;; --unknown) -- dnl do not fail when cross-compiling -- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; --*) -- AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;; --esac - fi - - else --- -2.41.0 - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb similarity index 97% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb index 35cf6af6d46..31290f6d44c 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb @@ -30,11 +30,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://bugfix-adjust-statd-service-name.patch \ file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ file://clang-warnings.patch \ - file://0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch \ file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \ file://0001-tools-locktest-Use-intmax_t-to-print-off_t.patch \ " -SRC_URI[sha256sum] = "38d89e853a71d3c560ff026af3d969d75e24f782ff68324e76261fe0344459e1" +SRC_URI[sha256sum] = "01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192160): https://lists.openembedded.org/g/openembedded-core/message/192160 Mute This Topic: https://lists.openembedded.org/mt/103106404/21656 Group Owner: openembedded-core+ow...@lists.opene
[OE-core] [PATCH v2 0/1] nfs-utils: Upgrade 2.6.3 -> 2.6.4
From: Robert Yang * V2: Fix build error with musl * V1: Initial version The following changes since commit 564339afb73fc52a66c1a08437587cad1c4d46e7: useradd: Fix useradd do_populate_sysroot dependency bug (2023-12-10 09:23:58 +) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/upgrade https://github.com/robertlinux/yocto/tree/rbt/upgrade Robert Yang (1): nfs-utils: Upgrade 2.6.3 -> 2.6.4 ...event-and-libsqlite3-checked-when-nf.patch | 80 --- ...{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} | 3 +- 2 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} (97%) -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192159): https://lists.openembedded.org/g/openembedded-core/message/192159 Mute This Topic: https://lists.openembedded.org/mt/103106403/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] meta: Upgrade gettext and nfs-utils
From: Robert Yang The following changes since commit d2c4e8cb85c6a5ca37c7990f879c3b650df5770b: vte: Separate out gtk4 pieces of vte into individual packages (2023-12-04 12:45:20 +) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/upgrade https://github.com/robertlinux/yocto/tree/rbt/upgrade Robert Yang (2): gettext: Upgrade 0.22.3 -> 0.22.4 nfs-utils: Upgrade 2.6.3 -> 2.6.4 ...event-and-libsqlite3-checked-when-nf.patch | 80 --- ...{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} | 3 +- 3.bb => gettext-minimal-native_0.22.4.bb} | 0 meta/recipes-core/gettext/gettext-sources.inc | 2 +- .../{gettext_0.22.3.bb => gettext_0.22.4.bb} | 0 5 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} (97%) rename meta/recipes-core/gettext/{gettext-minimal-native_0.22.3.bb => gettext-minimal-native_0.22.4.bb} (100%) rename meta/recipes-core/gettext/{gettext_0.22.3.bb => gettext_0.22.4.bb} (100%) -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191799): https://lists.openembedded.org/g/openembedded-core/message/191799 Mute This Topic: https://lists.openembedded.org/mt/102987609/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] nfs-utils: Upgrade 2.6.3 -> 2.6.4
From: Robert Yang Remove backported patch 0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch. Signed-off-by: Robert Yang --- ...event-and-libsqlite3-checked-when-nf.patch | 80 --- ...{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} | 3 +- 2 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} (97%) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch deleted file mode 100644 index 5afc714f190..000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch +++ /dev/null @@ -1,80 +0,0 @@ -From b62a3fe424026b73ec6b1934483b16863c7dff23 Mon Sep 17 00:00:00 2001 -From: Wiktor Jaskulski -Date: Thu, 11 May 2023 15:28:23 -0400 -Subject: [PATCH] configure.ac: libevent and libsqlite3 checked when nfsv4 is - disabled - -Upstream-Status: Backport -(http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca) - -Signed-off-by: Steve Dickson -Signed-off-by: Trevor Gamblin - configure.ac | 38 +++--- - 1 file changed, 15 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4ade528d..519cacbf 100644 a/configure.ac -+++ b/configure.ac -@@ -335,42 +335,34 @@ AC_CHECK_HEADER(rpc/rpc.h, , - AC_MSG_ERROR([Header file rpc/rpc.h not found - maybe try building with --enable-tirpc])) - CPPFLAGS="${nfsutils_save_CPPFLAGS}" - -+dnl check for libevent libraries and headers -+AC_LIBEVENT -+ -+dnl Check for sqlite3 -+AC_SQLITE3_VERS -+ -+case $libsqlite3_cv_is_recent in -+yes) ;; -+unknown) -+ dnl do not fail when cross-compiling -+ AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; -+*) -+ AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; -+esac -+ - if test "$enable_nfsv4" = yes; then -- dnl check for libevent libraries and headers -- AC_LIBEVENT - - dnl check for the keyutils libraries and headers - AC_KEYUTILS - -- dnl Check for sqlite3 -- AC_SQLITE3_VERS -- - if test "$enable_nfsdcld" = "yes"; then - AC_CHECK_HEADERS([libgen.h sys/inotify.h], , - AC_MSG_ERROR([Cannot find header needed for nfsdcld])) -- --case $libsqlite3_cv_is_recent in --yes) ;; --unknown) -- dnl do not fail when cross-compiling -- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; --*) -- AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; --esac - fi - - if test "$enable_nfsdcltrack" = "yes"; then - AC_CHECK_HEADERS([libgen.h sys/inotify.h], , - AC_MSG_ERROR([Cannot find header needed for nfsdcltrack])) -- --case $libsqlite3_cv_is_recent in --yes) ;; --unknown) -- dnl do not fail when cross-compiling -- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; --*) -- AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;; --esac - fi - - else --- -2.41.0 - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb similarity index 97% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb index 35cf6af6d46..31290f6d44c 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb @@ -30,11 +30,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://bugfix-adjust-statd-service-name.patch \ file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ file://clang-warnings.patch \ - file://0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch \ file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \ file://0001-tools-locktest-Use-intmax_t-to-print-off_t.patch \ " -SRC_URI[sha256sum] = "38d89e853a71d3c560ff026af3d969d75e24f782ff68324e76261fe0344459e1" +SRC_URI[sha256sum] = "01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191800): https://lists.openembedded.org/g/openembedded-core/message/191800 Mute This Topic: https://lists.openembedded.org/mt/102987610/21656 Group Owner: openembedded-core+ow...@lists.opene
[OE-core] [PATCH 1/2] gettext: Upgrade 0.22.3 -> 0.22.4
From: Robert Yang >From NEWS: Version 0.22.4 - November 2023 * Bug fixes: - AM_GNU_GETTEXT now recognizes a statically built libintl on macOS and AIX. - Build fixes on AIX. Signed-off-by: Robert Yang --- ...inimal-native_0.22.3.bb => gettext-minimal-native_0.22.4.bb} | 0 meta/recipes-core/gettext/gettext-sources.inc | 2 +- .../gettext/{gettext_0.22.3.bb => gettext_0.22.4.bb}| 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/gettext/{gettext-minimal-native_0.22.3.bb => gettext-minimal-native_0.22.4.bb} (100%) rename meta/recipes-core/gettext/{gettext_0.22.3.bb => gettext_0.22.4.bb} (100%) diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.22.3.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.22.4.bb similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-native_0.22.3.bb rename to meta/recipes-core/gettext/gettext-minimal-native_0.22.4.bb diff --git a/meta/recipes-core/gettext/gettext-sources.inc b/meta/recipes-core/gettext/gettext-sources.inc index 31dabfc5436..8b4e2401010 100644 --- a/meta/recipes-core/gettext/gettext-sources.inc +++ b/meta/recipes-core/gettext/gettext-sources.inc @@ -1,4 +1,4 @@ HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html; SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "839a260b2314ba66274dae7d245ec19fce190a3aa67869bf31354cb558df42c7" +SRC_URI[sha256sum] = "c1e0bb2a4427a9024390c662cd532d664c4b36b8ff444ed5e54b115fdb7a1aea" diff --git a/meta/recipes-core/gettext/gettext_0.22.3.bb b/meta/recipes-core/gettext/gettext_0.22.4.bb similarity index 100% rename from meta/recipes-core/gettext/gettext_0.22.3.bb rename to meta/recipes-core/gettext/gettext_0.22.4.bb -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191798): https://lists.openembedded.org/g/openembedded-core/message/191798 Mute This Topic: https://lists.openembedded.org/mt/102987608/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 1/2] gnu-config: Update to latest revision
On 12/1/23 4:16 PM, Alexandre Belloni wrote: Please follow https://docs.yoctoproject.org/dev/contributor-guide/submit-changes.html#fixing-your-from-identity Thanks, fixed. // Robert On 27/11/2023 23:55:06-0800, Robert Yang via lists.openembedded.org wrote: Signed-off-by: Robert Yang --- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 2a0e6f8e41..718f798a00 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -9,8 +9,8 @@ DEPENDS:class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "63acb96f92473ceb5e21d873d7c0aee266b3d6d3" -PV = "20230216+git" +SRCREV = "28ea239c53a2d5d8800c472bc2452eaa16e37af2" +PV = "20231127+git" SRC_URI = "git://git.savannah.gnu.org/git/config.git;protocol=https;branch=master \ file://gnu-configize.in" -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191725): https://lists.openembedded.org/g/openembedded-core/message/191725 Mute This Topic: https://lists.openembedded.org/mt/102846999/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] gettext: Upgrade 0.22 -> 0.22.3
Signed-off-by: Robert Yang --- ...-minimal-native_0.22.bb => gettext-minimal-native_0.22.3.bb} | 0 meta/recipes-core/gettext/gettext-sources.inc | 2 +- .../recipes-core/gettext/{gettext_0.22.bb => gettext_0.22.3.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/gettext/{gettext-minimal-native_0.22.bb => gettext-minimal-native_0.22.3.bb} (100%) rename meta/recipes-core/gettext/{gettext_0.22.bb => gettext_0.22.3.bb} (100%) diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.22.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.22.3.bb similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-native_0.22.bb rename to meta/recipes-core/gettext/gettext-minimal-native_0.22.3.bb diff --git a/meta/recipes-core/gettext/gettext-sources.inc b/meta/recipes-core/gettext/gettext-sources.inc index b4fb647916..31dabfc543 100644 --- a/meta/recipes-core/gettext/gettext-sources.inc +++ b/meta/recipes-core/gettext/gettext-sources.inc @@ -1,4 +1,4 @@ HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html; SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "49f089be11b490170bbf09ed2f51e5f5177f55be4cc66504a5861820e0fb06ab" +SRC_URI[sha256sum] = "839a260b2314ba66274dae7d245ec19fce190a3aa67869bf31354cb558df42c7" diff --git a/meta/recipes-core/gettext/gettext_0.22.bb b/meta/recipes-core/gettext/gettext_0.22.3.bb similarity index 100% rename from meta/recipes-core/gettext/gettext_0.22.bb rename to meta/recipes-core/gettext/gettext_0.22.3.bb -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191339): https://lists.openembedded.org/g/openembedded-core/message/191339 Mute This Topic: https://lists.openembedded.org/mt/102847000/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] Upgrade gnu-config and gettext
The following changes since commit 212affe748e2f628ecf11f26485b07dd303fe6e3: Revert "binutils: Fix CVE-2022-47007" (2023-11-23 14:58:06 +) are available in the Git repository at: https://github.com/robertlinux/yocto rbt/upgrade https://github.com/robertlinux/yocto/tree/rbt/upgrade Robert Yang (2): gnu-config: Update to latest revision gettext: Upgrade 0.22 -> 0.22.3 ...inimal-native_0.22.bb => gettext-minimal-native_0.22.3.bb} | 0 meta/recipes-core/gettext/gettext-sources.inc | 2 +- .../gettext/{gettext_0.22.bb => gettext_0.22.3.bb}| 0 meta/recipes-devtools/gnu-config/gnu-config_git.bb| 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-core/gettext/{gettext-minimal-native_0.22.bb => gettext-minimal-native_0.22.3.bb} (100%) rename meta/recipes-core/gettext/{gettext_0.22.bb => gettext_0.22.3.bb} (100%) -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191337): https://lists.openembedded.org/g/openembedded-core/message/191337 Mute This Topic: https://lists.openembedded.org/mt/102846998/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] gnu-config: Update to latest revision
Signed-off-by: Robert Yang --- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 2a0e6f8e41..718f798a00 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -9,8 +9,8 @@ DEPENDS:class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "63acb96f92473ceb5e21d873d7c0aee266b3d6d3" -PV = "20230216+git" +SRCREV = "28ea239c53a2d5d8800c472bc2452eaa16e37af2" +PV = "20231127+git" SRC_URI = "git://git.savannah.gnu.org/git/config.git;protocol=https;branch=master \ file://gnu-configize.in" -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191338): https://lists.openembedded.org/g/openembedded-core/message/191338 Mute This Topic: https://lists.openembedded.org/mt/102846999/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/1] libxcrypt-compat: Remove libcrypt.so to fix conflict with libcrypt
The following changes since commit 03d37854b1dacbecd2c522821c59ef01d9bd305c: build-appliance-image: Update to master head revision (2023-09-10 09:03:42 +0100) are available in the Git repository at: https://git.openembedded.org/openembedded-core-contrib rbt/crypt https://git.openembedded.org/openembedded-core-contrib/log/?h=rbt/crypt Robert Yang (1): libxcrypt-compat: Remove libcrypt.so to fix conflict with libcrypt meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#187484): https://lists.openembedded.org/g/openembedded-core/message/187484 Mute This Topic: https://lists.openembedded.org/mt/101288924/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/1] libxcrypt-compat: Remove libcrypt.so to fix conflict with libcrypt
Fixed: IMAGE_INSTALL:append = " libxcrypt-compat" $ bitbake -cpopulate_sdk file /usr/lib/libcrypt.so from install of libxcrypt-compat-dev-4.4.33-r0.0.aarch64 conflicts with file from package libcrypt-dev-4.4.33-r0.2.aarch64 Remove libcrypt.so like other files to fix the error. Signed-off-by: Robert Yang --- meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb index ec9f9f4fa3..d5546ce9ba 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb @@ -13,6 +13,6 @@ API = "--enable-obsolete-api" do_install:append () { rm -rf ${D}${includedir} rm -rf ${D}${libdir}/pkgconfig + rm -rf ${D}${libdir}/libcrypt.so rm -rf ${D}${datadir} } - -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#187485): https://lists.openembedded.org/g/openembedded-core/message/187485 Mute This Topic: https://lists.openembedded.org/mt/101288925/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][kirkstone][PATCH] go: fix CVE-2023-29406 net/http insufficient sanitization of Host header
Hello, This patch caused docker failed to run on kirkstone branch: $ docker run --rm -it ubuntu /bin/bash Unable to find image 'ubuntu:latest' locally latest: Pulling from library/ubuntu 3153aa388d02: Pull complete Digest: sha256:0bced47fffa3361afa981854fcabcd4577cd43cebbb808cea2b1f33a3dd7f508 Status: Downloaded newer image for ubuntu:latest http: invalid Host header Maybe we need consider revert it atm since CVE-2023-29406 is a medium bug. // Robert On 7/26/23 12:37, vkumbhar wrote: Signed-off-by: Vivek Kumbhar --- meta/recipes-devtools/go/go-1.17.13.inc | 1 + .../go/go-1.18/CVE-2023-29406.patch | 210 ++ 2 files changed, 211 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.18/CVE-2023-29406.patch diff --git a/meta/recipes-devtools/go/go-1.17.13.inc b/meta/recipes-devtools/go/go-1.17.13.inc index 73921852fc..36904a92fb 100644 --- a/meta/recipes-devtools/go/go-1.17.13.inc +++ b/meta/recipes-devtools/go/go-1.17.13.inc @@ -36,6 +36,7 @@ SRC_URI += "\ file://CVE-2023-29405.patch \ file://CVE-2023-29402.patch \ file://CVE-2023-29400.patch \ +file://CVE-2023-29406.patch \ " SRC_URI[main.sha256sum] = "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd" diff --git a/meta/recipes-devtools/go/go-1.18/CVE-2023-29406.patch b/meta/recipes-devtools/go/go-1.18/CVE-2023-29406.patch new file mode 100644 index 00..a326cda5c4 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.18/CVE-2023-29406.patch @@ -0,0 +1,210 @@ +From 5fa6923b1ea891400153d04ddf1545e23b40041b Mon Sep 17 00:00:00 2001 +From: Damien Neil +Date: Wed, 28 Jun 2023 13:20:08 -0700 +Subject: [PATCH] [release-branch.go1.19] net/http: validate Host header before + sending + +Verify that the Host header we send is valid. +Avoids surprising behavior such as a Host of "go.dev\r\nX-Evil:oops" +adding an X-Evil header to HTTP/1 requests. + +Add a test, skip the test for HTTP/2. HTTP/2 is not vulnerable to +header injection in the way HTTP/1 is, but x/net/http2 doesn't validate +the header and will go into a retry loop when the server rejects it. +CL 506995 adds the necessary validation to x/net/http2. + +Updates #60374 +Fixes #61075 +For CVE-2023-29406 + +Change-Id: I05cb6866a9bead043101954dfded199258c6dd04 +Reviewed-on: https://go-review.googlesource.com/c/go/+/506996 +Reviewed-by: Tatiana Bradley +TryBot-Result: Gopher Robot +Run-TryBot: Damien Neil +(cherry picked from commit 499458f7ca04087958987a33c2703c3ef03e27e2) +Reviewed-on: https://go-review.googlesource.com/c/go/+/507358 +Run-TryBot: Tatiana Bradley +Reviewed-by: Roland Shoemaker + +Upstream-Status: Backport [https://github.com/golang/go/commit/5fa6923b1ea891400153d04ddf1545e23b40041b] +CVE: CVE-2023-29406 +Signed-off-by: Vivek Kumbhar +--- + src/net/http/http_test.go | 29 -- + src/net/http/request.go| 45 -- + src/net/http/request_test.go | 11 ++--- + src/net/http/transport_test.go | 18 ++ + 4 files changed, 30 insertions(+), 73 deletions(-) + +diff --git a/src/net/http/http_test.go b/src/net/http/http_test.go +index 0d92fe5..f03272a 100644 +--- a/src/net/http/http_test.go b/src/net/http/http_test.go +@@ -48,35 +48,6 @@ func TestForeachHeaderElement(t *testing.T) { + } + } + +-func TestCleanHost(t *testing.T) { +- tests := []struct { +- in, want string +- }{ +- {"www.google.com", "www.google.com"}, +- {"www.google.com foo", "www.google.com"}, +- {"www.google.com/foo", "www.google.com"}, +- {" first character is a space", ""}, +- {"[1::6]:8080", "[1::6]:8080"}, +- +- // Punycode: +- {"гофер.рф/foo", "xn--c1ae0ajs.xn--p1ai"}, +- {"bücher.de", "xn--bcher-kva.de"}, +- {"bücher.de:8080", "xn--bcher-kva.de:8080"}, +- // Verify we convert to lowercase before punycode: +- {"BÜCHER.de", "xn--bcher-kva.de"}, +- {"BÜCHER.de:8080", "xn--bcher-kva.de:8080"}, +- // Verify we normalize to NFC before punycode: +- {"gophér.nfc", "xn--gophr-esa.nfc"},// NFC input; no work needed +- {"goph\u0065\u0301r.nfd", "xn--gophr-esa.nfd"}, // NFD input +- } +- for _, tt := range tests { +- got := cleanHost(tt.in) +- if tt.want != got { +- t.Errorf("cleanHost(%q) = %q, want %q", tt.in, got, tt.want) +- } +- } +-} +- + // Test that cmd/go doesn't link in the HTTP server. + // + // This catches accidental dependencies between the HTTP transport and +diff --git a/src/net/http/request.go b/src/net/http/request.go +index 09cb0c7..2f4e740 100644 +--- a/src/net/http/request.go b/src/net/http/request.go +@@ -17,7 +17,6 @@ import ( + "io" + "mime" + "mime/multipart" +- "net" +
Re: [OE-core] [PATCH 1/1] rootfs.py: Set PACKAGE_FEED_ARCHS when it is not defined
On 2/14/23 18:38, Alexander Kanavin wrote: On Tue, 14 Feb 2023 at 10:12, Robert Yang wrote: This is used for online package feeds (When PACKAGE_FEED_URIS is set), the default PACKAGE_FEED_ARCHS is None, so "dnf install/upgrade" or "apt-get update" doesn't work by default, we must set PACKAGE_FEED_ARCHS to make it work, but it's hard to maintain PACKAGE_FEED_ARCHS manually since we can't add more/less archs: 1) When add less archs in PACKAGE_FEED_ARCHS, "dnf update" can't find the missed packages. 2) When add more archs in PACKAGE_FEED_ARCHS, "dnf upgrade" will report "can't find package feed" errors. We must set the accurate package feed archs to make it work correctly, but different builds may have different values since recipes can set PACKAGE_ARCH. Set it automatically (when not set manually) can make it work smoothly. Tests for online package feeds exist in meta/lib/oeqa/selftest/cases/runtime_test.py and they work without setting PACKAGE_FEED_ARCHS, so something isn't quite right on your side, or the tests aren't covering your local setup (and maybe need to be extended for it). Thanks, I will look into it on why it works. // Robert As I said, you need to tweak existing code that handles empty PACKAGE_FEED_ARCHS, not add a whole another overlay function that clobbers that. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#177140): https://lists.openembedded.org/g/openembedded-core/message/177140 Mute This Topic: https://lists.openembedded.org/mt/96955951/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 1/1] base.bbclass: Fix dangling NATIVELSBSTRING
Hi RP, On 2/14/23 16:44, Richard Purdie wrote: On Tue, 2023-02-14 at 00:28 -0800, Robert Yang wrote: Fixed: $ rm -fr tmp; bitbake quilt-native -n Build Configuration: [snip] NATIVELSBSTRING = "ubuntu-18.04" [snip] And when run bitbake again: $ bitbake quilt-native -n Build Configuration: NATIVELSBSTRING = "universal" It has been changed from ubuntu-18.04 to universal on the same host and build directory, this is because it is overridded by NATIVELSBSTRING. This patch makes it print the correct value. Signed-off-by: Robert Yang --- meta/classes-global/base.bbclass | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 64e805c947..cf42d9d4d2 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -226,7 +226,12 @@ BUILDCFG_FUNCS[type] = "list" def buildcfg_vars(d): statusvars = oe.data.typed_value('BUILDCFG_VARS', d) for var in statusvars: -value = d.getVar(var) +# NATIVELSBSTRING var may have been overridden with "universal", so +# get actual host distribution id and version +if var == 'NATIVELSBSTRING': +value = lsb_distro_identifier(d) +else: +value = d.getVar(var) if value is not None: yield '%-20s = "%s"' % (var, value) The uninative code runs "late" and this is an known issue, there is an open bug for it if I remember correctly. I don't really want to put hacks into the BUILDCFG display code to work around it since it is just going to make it less clear what is going on and is also likely to break if we evern change the way NATIVELSBSTRING is set. If you really don't like this, we should fix it properly some other way rather than work around it. I'd like to drop the patch since it doesn't affect the build. // Robert Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#177135): https://lists.openembedded.org/g/openembedded-core/message/177135 Mute This Topic: https://lists.openembedded.org/mt/96955945/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 1/1] rootfs.py: Set PACKAGE_FEED_ARCHS when it is not defined
Hi RP and Alexander, On 2/14/23 16:47, Richard Purdie wrote: On Tue, 2023-02-14 at 00:28 -0800, Robert Yang wrote: The PACKAGE_FEED_ARCHS is highly related to ALL_MULTILIB_PACKAGE_ARCHS, set it automatically is better than manually, for example, we may forget to upgrade PACKAGE_FEED_ARCHS when ALL_MULTILIB_PACKAGE_ARCHS is changed if set it manually. The workflow is: Use PACKAGE_FEED_ARCHS if it is defined, if not, check DEPLOY_DIR_XXX/, add to PACKAGE_FEED_ARCHS if it exists. This says what the code does, which I can see from the patch. What this doesn't say is *why*. What issue is this change needed for? When would we currently need to set these things manually? This is used for online package feeds (When PACKAGE_FEED_URIS is set), the default PACKAGE_FEED_ARCHS is None, so "dnf install/upgrade" or "apt-get update" doesn't work by default, we must set PACKAGE_FEED_ARCHS to make it work, but it's hard to maintain PACKAGE_FEED_ARCHS manually since we can't add more/less archs: 1) When add less archs in PACKAGE_FEED_ARCHS, "dnf update" can't find the missed packages. 2) When add more archs in PACKAGE_FEED_ARCHS, "dnf upgrade" will report "can't find package feed" errors. We must set the accurate package feed archs to make it work correctly, but different builds may have different values since recipes can set PACKAGE_ARCH. Set it automatically (when not set manually) can make it work smoothly. The multilib variables are not really meant to be used in generic code and the multilib classes are meant to to be getting in the way like this. Does this mean multilib is not setting up something correctly? No, multilib works correctly, I just use it find archs in DEPLOY_DIR. // Robert Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#177134): https://lists.openembedded.org/g/openembedded-core/message/177134 Mute This Topic: https://lists.openembedded.org/mt/96955951/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/1] rootfs.py: Set PACKAGE_FEED_ARCHS when it is not defined
The PACKAGE_FEED_ARCHS is highly related to ALL_MULTILIB_PACKAGE_ARCHS, set it automatically is better than manually, for example, we may forget to upgrade PACKAGE_FEED_ARCHS when ALL_MULTILIB_PACKAGE_ARCHS is changed if set it manually. The workflow is: Use PACKAGE_FEED_ARCHS if it is defined, if not, check DEPLOY_DIR_XXX/, add to PACKAGE_FEED_ARCHS if it exists. Signed-off-by: Robert Yang --- meta/lib/oe/rootfs.py | 26 +- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 890ba5f039..f26b66ba7a 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -89,12 +89,36 @@ class Rootfs(object, metaclass=ABCMeta): def _log_check_error(self): self._log_check_common('error', self.log_check_regex) +def _get_feed_archs(self): +feed_archs = self.d.getVar('PACKAGE_FEED_ARCHS') or '' +if not feed_archs: +bb.note(" Figuring PACKAGE_FEED_ARCHS from ALL_MULTILIB_PACKAGE_ARCHS") +manager = self.d.getVar('ROOTFS_PKGMANAGE') +deploy_dir = '' +if 'rpm' in manager: +deploy_dir = self.d.getVar('DEPLOY_DIR_RPM') +elif 'opkg' in manager: +deploy_dir = self.d.getVar('DEPLOY_DIR_IPK') +elif 'dpkg' in manager: +deploy_dir = self.d.getVar('DEPLOY_DIR_DEB') +else: +bb.warn('Failed to figure out deploy_dir') +return '' + +for arch in self.d.getVar('ALL_MULTILIB_PACKAGE_ARCHS').split(): +if 'rpm' in manager: +arch = arch.replace("-", "_") +arch_path = os.path.join(deploy_dir, arch) +if os.path.exists(arch_path): +feed_archs += " %s" % arch +return feed_archs.strip() + def _insert_feed_uris(self): if bb.utils.contains("IMAGE_FEATURES", "package-management", True, False, self.d): self.pm.insert_feeds_uris(self.d.getVar('PACKAGE_FEED_URIS') or "", self.d.getVar('PACKAGE_FEED_BASE_PATHS') or "", -self.d.getVar('PACKAGE_FEED_ARCHS')) +self._get_feed_archs()) """ -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#177127): https://lists.openembedded.org/g/openembedded-core/message/177127 Mute This Topic: https://lists.openembedded.org/mt/96955951/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/1] rootfs.py: Set PACKAGE_FEED_ARCHS when it is not defined
The following changes since commit 0049f6757f6f956fb4cc77b3df6a672c20b53cf4: oeqa qemurunner.py: try to avoid reading one character at a time (2023-02-10 09:25:41 +) are available in the Git repository at: https://git.openembedded.org/openembedded-core-contrib rbt/feed http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/feed Robert Yang (1): rootfs.py: Set PACKAGE_FEED_ARCHS when it is not defined meta/lib/oe/rootfs.py | 26 +- 1 file changed, 25 insertions(+), 1 deletion(-) -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#177126): https://lists.openembedded.org/g/openembedded-core/message/177126 Mute This Topic: https://lists.openembedded.org/mt/96955950/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/1] base.bbclass: Fix dangling NATIVELSBSTRING
Fixed: $ rm -fr tmp; bitbake quilt-native -n Build Configuration: [snip] NATIVELSBSTRING = "ubuntu-18.04" [snip] And when run bitbake again: $ bitbake quilt-native -n Build Configuration: NATIVELSBSTRING = "universal" It has been changed from ubuntu-18.04 to universal on the same host and build directory, this is because it is overridded by NATIVELSBSTRING. This patch makes it print the correct value. Signed-off-by: Robert Yang --- meta/classes-global/base.bbclass | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 64e805c947..cf42d9d4d2 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -226,7 +226,12 @@ BUILDCFG_FUNCS[type] = "list" def buildcfg_vars(d): statusvars = oe.data.typed_value('BUILDCFG_VARS', d) for var in statusvars: -value = d.getVar(var) +# NATIVELSBSTRING var may have been overridden with "universal", so +# get actual host distribution id and version +if var == 'NATIVELSBSTRING': +value = lsb_distro_identifier(d) +else: +value = d.getVar(var) if value is not None: yield '%-20s = "%s"' % (var, value) -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#177125): https://lists.openembedded.org/g/openembedded-core/message/177125 Mute This Topic: https://lists.openembedded.org/mt/96955945/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/1] base.bbclass: Fix dangling NATIVELSBSTRING
The following changes since commit 0049f6757f6f956fb4cc77b3df6a672c20b53cf4: oeqa qemurunner.py: try to avoid reading one character at a time (2023-02-10 09:25:41 +) are available in the Git repository at: https://git.openembedded.org/openembedded-core-contrib rbt/lsb http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/lsb Robert Yang (1): base.bbclass: Fix dangling NATIVELSBSTRING meta/classes-global/base.bbclass | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#177124): https://lists.openembedded.org/g/openembedded-core/message/177124 Mute This Topic: https://lists.openembedded.org/mt/96955944/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 1/1] wic: Use ROOTFS_DIR to locate pseudo_dir
On 6/15/22 3:26 PM, Alexandre Belloni wrote: Hello, On 14/06/2022 23:35:29-0700, Robert Yang wrote: Fixed when wks is: part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --fixed-size 256M part / --source rootfs --exclude-path=var/ --ondisk mmcblk0 --fstype=ext4 --label root --align 4096 part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrive mmcblk0 --fstype=ext4 --label var --align 4096 --fixed-size 1024M --fsoptions=ro,relatime,sync $ bitbake $ wic create -e WARNING: /path/to/rootfs/var/../pseudo folder does not exist. Usernames and permissions will be invalid The --rootfs-dir can be anywhere, so the ../pseudo may not exist, use ROOTFS_DIR to fix the problem. The patch is from "Rath Anil Kumar " We need a proper Signed-off-by and From: to reflect that. I got the raw patch from a website and added the commit messages, so I didn't add a formal 'From:', and yes, add it would be better, but I can't add the SOB for others. I've added the 'From:' in the PULL: git://git.openembedded.org/openembedded-core-contrib rbt/wic wic: Use ROOTFS_DIR to locate pseudo_dir Fixed when wks is: part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --fixed-size 256M part / --source rootfs --exclude-path=var/ --ondisk mmcblk0 --fstype=ext4 --label root --align 4096 part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrive mmcblk0 --fstype=ext4 --label var --align 4096 --fixed-size 1024M - -fsoptions=ro,relatime,sync $ bitbake $ wic create -e WARNING: /path/to/rootfs/var/../pseudo folder does not exist. Usernames and permissions will be invalid The --rootfs-dir can be anywhere, so the ../pseudo may not exist, use ROOTFS_DIR to fix the problem. From: Rath Anil Kumar Signed-off-by: Robert Yang // Robert Signed-off-by: Robert Yang --- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 25bb41dd702..11b09c1e80e 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -95,7 +95,7 @@ class RootfsPlugin(SourcePlugin): part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir) part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab")) -pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo") +pseudo_dir = os.path.join(krootfs_dir['ROOTFS_DIR'], "../pseudo") if not os.path.lexists(pseudo_dir): pseudo_dir = os.path.join(cls.__get_rootfs_dir(None), '../pseudo') -- 2.33.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#166925): https://lists.openembedded.org/g/openembedded-core/message/166925 Mute This Topic: https://lists.openembedded.org/mt/91771589/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/1] wic: Use ROOTFS_DIR to locate pseudo_dir
Fixed when wks is: part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --fixed-size 256M part / --source rootfs --exclude-path=var/ --ondisk mmcblk0 --fstype=ext4 --label root --align 4096 part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrive mmcblk0 --fstype=ext4 --label var --align 4096 --fixed-size 1024M --fsoptions=ro,relatime,sync $ bitbake $ wic create -e WARNING: /path/to/rootfs/var/../pseudo folder does not exist. Usernames and permissions will be invalid The --rootfs-dir can be anywhere, so the ../pseudo may not exist, use ROOTFS_DIR to fix the problem. The patch is from "Rath Anil Kumar " Signed-off-by: Robert Yang --- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 25bb41dd702..11b09c1e80e 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -95,7 +95,7 @@ class RootfsPlugin(SourcePlugin): part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir) part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab")) -pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo") +pseudo_dir = os.path.join(krootfs_dir['ROOTFS_DIR'], "../pseudo") if not os.path.lexists(pseudo_dir): pseudo_dir = os.path.join(cls.__get_rootfs_dir(None), '../pseudo') -- 2.33.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#166909): https://lists.openembedded.org/g/openembedded-core/message/166909 Mute This Topic: https://lists.openembedded.org/mt/91771589/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/1] wic: Use ROOTFS_DIR to locate pseudo_dir
The following changes since commit dd39446dff75c6e48f4aa44ec90087f172d717d4: python3-cryptography: remove test_x509.py (2022-06-14 10:03:58 +0100) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/wic http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/wic Robert Yang (1): wic: Use ROOTFS_DIR to locate pseudo_dir scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.33.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#166908): https://lists.openembedded.org/g/openembedded-core/message/166908 Mute This Topic: https://lists.openembedded.org/mt/91771588/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 1/1] systemd: Set RebootWatchdogSec to 60s as watchdog
Hi Alexander, On 5/28/22 03:12, Alexander Kanavin wrote: Where is the default of 10 minutes set? Should it be fixed there? Patching things with sed after the fact is not necessarily a good idea. It's set in src/core/main.c, line 2451: arg_reboot_watchdog = 10 * USEC_PER_MINUTE; The ${sysconfdir}/systemd/system.conf is used for configing it, so I didn't modify src/core/main.c, and even if we modify src/core/main.c, we still need config the value depend on the boards, for example, rpi4 (max: 15 seconds), nxp-imx8 (max: 128 seconds), other boards may have a higher or lower value than 60. // Robert Alex On Fri, 27 May 2022 at 09:07, Robert Yang wrote: The systemd-shutdown sets watchdog timeout to 10m (600 seconds) which is too large, and caused errors when reboot on boars such as rpi4: systemd-shutdown[1]: Failed to set timeout to 10min: Invalid argument The watchog's default value is 60s, so set RebootWatchdogSec to 60s to fix the errors. And can set WATCHDOG_TIMEOUT when needed, for example, the max timeout of rpi4 is 15 seconds. Signed-off-by: Robert Yang --- meta/recipes-core/systemd/systemd_250.5.bb| 8 meta/recipes-extended/watchdog/watchdog-config.bb | 7 +++ 2 files changed, 15 insertions(+) diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb index 006b2f86eab..6fac27ee56d 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_250.5.bb @@ -238,6 +238,9 @@ EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \ -Dnologin-path=${base_sbindir}/nologin \ -Dumount-path=${base_bindir}/umount" +# The 60 seconds is watchdog's default vaule. +WATCHDOG_TIMEOUT ??= "60" + do_install() { meson_do_install install -d ${D}/${base_sbindir} @@ -337,6 +340,11 @@ do_install() { # add a profile fragment to disable systemd pager with busybox less install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh + +if [ -n "${WATCHDOG_TIMEOUT}" ]; then +sed -i -e 's/#RebootWatchdogSec=10min/RebootWatchdogSec=${WATCHDOG_TIMEOUT}/' \ +${D}/${sysconfdir}/systemd/system.conf +fi } python populate_packages:prepend (){ diff --git a/meta/recipes-extended/watchdog/watchdog-config.bb b/meta/recipes-extended/watchdog/watchdog-config.bb index a28d28033bc..f1389521284 100644 --- a/meta/recipes-extended/watchdog/watchdog-config.bb +++ b/meta/recipes-extended/watchdog/watchdog-config.bb @@ -13,8 +13,15 @@ SRC_URI = " \ file://watchdog.conf \ " +# The default value is 60 seconds when null. +WATCHDOG_TIMEOUT ??= "" + do_install() { install -Dm 0644 ${WORKDIR}/watchdog.default ${D}${sysconfdir}/default/watchdog install -Dm 0644 ${WORKDIR}/watchdog.conf ${D}${sysconfdir}/watchdog.conf + +if [ -n "${WATCHDOG_TIMEOUT}" ]; then +echo "watchdog-timeout = ${WATCHDOG_TIMEOUT}" >> ${D}/etc/watchdog.conf +fi } -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#166222): https://lists.openembedded.org/g/openembedded-core/message/166222 Mute This Topic: https://lists.openembedded.org/mt/91371988/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/1] systemd: Set RebootWatchdogSec to 60s as watchdog
The systemd-shutdown sets watchdog timeout to 10m (600 seconds) which is too large, and caused errors when reboot on boars such as rpi4: systemd-shutdown[1]: Failed to set timeout to 10min: Invalid argument The watchog's default value is 60s, so set RebootWatchdogSec to 60s to fix the errors. And can set WATCHDOG_TIMEOUT when needed, for example, the max timeout of rpi4 is 15 seconds. Signed-off-by: Robert Yang --- meta/recipes-core/systemd/systemd_250.5.bb| 8 meta/recipes-extended/watchdog/watchdog-config.bb | 7 +++ 2 files changed, 15 insertions(+) diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb index 006b2f86eab..6fac27ee56d 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_250.5.bb @@ -238,6 +238,9 @@ EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \ -Dnologin-path=${base_sbindir}/nologin \ -Dumount-path=${base_bindir}/umount" +# The 60 seconds is watchdog's default vaule. +WATCHDOG_TIMEOUT ??= "60" + do_install() { meson_do_install install -d ${D}/${base_sbindir} @@ -337,6 +340,11 @@ do_install() { # add a profile fragment to disable systemd pager with busybox less install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh + +if [ -n "${WATCHDOG_TIMEOUT}" ]; then +sed -i -e 's/#RebootWatchdogSec=10min/RebootWatchdogSec=${WATCHDOG_TIMEOUT}/' \ +${D}/${sysconfdir}/systemd/system.conf +fi } python populate_packages:prepend (){ diff --git a/meta/recipes-extended/watchdog/watchdog-config.bb b/meta/recipes-extended/watchdog/watchdog-config.bb index a28d28033bc..f1389521284 100644 --- a/meta/recipes-extended/watchdog/watchdog-config.bb +++ b/meta/recipes-extended/watchdog/watchdog-config.bb @@ -13,8 +13,15 @@ SRC_URI = " \ file://watchdog.conf \ " +# The default value is 60 seconds when null. +WATCHDOG_TIMEOUT ??= "" + do_install() { install -Dm 0644 ${WORKDIR}/watchdog.default ${D}${sysconfdir}/default/watchdog install -Dm 0644 ${WORKDIR}/watchdog.conf ${D}${sysconfdir}/watchdog.conf + +if [ -n "${WATCHDOG_TIMEOUT}" ]; then +echo "watchdog-timeout = ${WATCHDOG_TIMEOUT}" >> ${D}/etc/watchdog.conf +fi } -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#166202): https://lists.openembedded.org/g/openembedded-core/message/166202 Mute This Topic: https://lists.openembedded.org/mt/91371988/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/1] systemd: Set RebootWatchdogSec to 60s as watchdog
The following changes since commit 579906b9f4ea32c8d4e0e11a87ee6c9e27cdf0dc: kernel.bbclass: Do not overwrite recipe's custom postinst (2022-05-23 21:31:07 +0100) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/watdog http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/watdog Robert Yang (1): systemd: Set RebootWatchdogSec to 60s as watchdog meta/recipes-core/systemd/systemd_250.5.bb| 8 meta/recipes-extended/watchdog/watchdog-config.bb | 7 +++ 2 files changed, 15 insertions(+) -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#166201): https://lists.openembedded.org/g/openembedded-core/message/166201 Mute This Topic: https://lists.openembedded.org/mt/91371986/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 1/1] libxshmfence: Correct LICENSE to HPND
From: Richard Purdie The license in this code is listed as MIT and whilst it is compatible with and usable as MIT, it actually looks like HPND. Clarify the license field accordingly. (From OE-Core master rev: 922b645f443c33060a8990d32e6b7b62ea5497c3) Signed-off-by: Richard Purdie Signed-off-by: Robert Yang --- meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb | 2 +- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb index 062d6a7a058..ad9f475d151 100644 --- a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb +++ b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Test recipe for recipeutils.patch_recipe()" require recipeutils-test.inc -LICENSE = "Proprietary" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://${WORKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e" DEPENDS += "zlib" diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index d153c7a603e..b0b6cb6b567 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -6,7 +6,7 @@ using file descriptor passing." require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" DEPENDS += "virtual/libx11" -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164541): https://lists.openembedded.org/g/openembedded-core/message/164541 Mute This Topic: https://lists.openembedded.org/mt/90503472/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [honister][PATCH 0/1] libxshmfence: Correct LICENSE to HPND
The following changes since commit 75e47b96d8cf82ec4a7fa3225c7fbb5b6ab62b02: webkitgtk: update to 2.32.4 (2022-04-07 14:40:14 +0800) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/license-honister http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/license-honister Richard Purdie (1): libxshmfence: Correct LICENSE to HPND meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb | 2 +- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164540): https://lists.openembedded.org/g/openembedded-core/message/164540 Mute This Topic: https://lists.openembedded.org/mt/90503471/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [hardknott][PATCH 1/1] libxshmfence: Correct LICENSE to HPND
From: Richard Purdie The license in this code is listed as MIT and whilst it is compatible with and usable as MIT, it actually looks like HPND. Clarify the license field accordingly. (From OE-Core master rev: 922b645f443c33060a8990d32e6b7b62ea5497c3) Signed-off-by: Richard Purdie Signed-off-by: Robert Yang --- meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb | 2 +- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb index 0cd0494da8f..fd113b5ec5e 100644 --- a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb +++ b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Test recipe for recipeutils.patch_recipe()" require recipeutils-test.inc -LICENSE = "Proprietary" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://${WORKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e" DEPENDS += "zlib" diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index d153c7a603e..b0b6cb6b567 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -6,7 +6,7 @@ using file descriptor passing." require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" DEPENDS += "virtual/libx11" -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164539): https://lists.openembedded.org/g/openembedded-core/message/164539 Mute This Topic: https://lists.openembedded.org/mt/90503440/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [hardknott][PATCH 0/1] libxshmfence: Correct LICENSE to HPND
The following changes since commit bcef80623f015c006778edee5cf40dad063e51db: wic: Use custom kernel path if provided (2022-03-15 23:00:09 +0800) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/license-hardknott http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/license-hardknott Richard Purdie (1): libxshmfence: Correct LICENSE to HPND meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb | 2 +- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164538): https://lists.openembedded.org/g/openembedded-core/message/164538 Mute This Topic: https://lists.openembedded.org/mt/90503439/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 1/1] libxshmfence: Correct LICENSE to HPND
From: Richard Purdie The license in this code is listed as MIT and whilst it is compatible with and usable as MIT, it actually looks like HPND. Clarify the license field accordingly. (From OE-Core master rev: 922b645f443c33060a8990d32e6b7b62ea5497c3) Signed-off-by: Richard Purdie Signed-off-by: Robert Yang --- meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb | 2 +- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb index 0cd0494da8f..fd113b5ec5e 100644 --- a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb +++ b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Test recipe for recipeutils.patch_recipe()" require recipeutils-test.inc -LICENSE = "Proprietary" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://${WORKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e" DEPENDS += "zlib" diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index cc456965305..38cab99bbeb 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -6,7 +6,7 @@ using file descriptor passing." require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" DEPENDS += "virtual/libx11" -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164536): https://lists.openembedded.org/g/openembedded-core/message/164536 Mute This Topic: https://lists.openembedded.org/mt/90503419/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 0/1] libxshmfence: Correct LICENSE to HPND
The following changes since commit aa2bb4f62dd7e5c6fdf220264c3d62fbf2cc7d16: xserver-xorg: update to 1.20.14 (2022-03-29 11:43:54 -1000) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/license http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/license Richard Purdie (1): libxshmfence: Correct LICENSE to HPND meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb | 2 +- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164537): https://lists.openembedded.org/g/openembedded-core/message/164537 Mute This Topic: https://lists.openembedded.org/mt/90503420/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 0/1] libxshmfence: Correct LICENSE to HPND
Sorry, please ignore this, should be prefixed with [dunfell] // Robert On 4/16/22 18:43, Robert Yang wrote: The following changes since commit aa2bb4f62dd7e5c6fdf220264c3d62fbf2cc7d16: xserver-xorg: update to 1.20.14 (2022-03-29 11:43:54 -1000) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/license http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/license Richard Purdie (1): libxshmfence: Correct LICENSE to HPND meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb | 2 +- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164535): https://lists.openembedded.org/g/openembedded-core/message/164535 Mute This Topic: https://lists.openembedded.org/mt/90503383/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/1] libxshmfence: Correct LICENSE to HPND
From: Richard Purdie The license in this code is listed as MIT and whilst it is compatible with and usable as MIT, it actually looks like HPND. Clarify the license field accordingly. (From OE-Core master rev: 922b645f443c33060a8990d32e6b7b62ea5497c3) Signed-off-by: Richard Purdie Signed-off-by: Robert Yang --- meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb | 2 +- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb index 0cd0494da8f..fd113b5ec5e 100644 --- a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb +++ b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Test recipe for recipeutils.patch_recipe()" require recipeutils-test.inc -LICENSE = "Proprietary" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://${WORKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e" DEPENDS += "zlib" diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index cc456965305..38cab99bbeb 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -6,7 +6,7 @@ using file descriptor passing." require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" DEPENDS += "virtual/libx11" -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164534): https://lists.openembedded.org/g/openembedded-core/message/164534 Mute This Topic: https://lists.openembedded.org/mt/90503384/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/1] libxshmfence: Correct LICENSE to HPND
The following changes since commit aa2bb4f62dd7e5c6fdf220264c3d62fbf2cc7d16: xserver-xorg: update to 1.20.14 (2022-03-29 11:43:54 -1000) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/license http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/license Richard Purdie (1): libxshmfence: Correct LICENSE to HPND meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb | 2 +- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164533): https://lists.openembedded.org/g/openembedded-core/message/164533 Mute This Topic: https://lists.openembedded.org/mt/90503383/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] License mismatched for libxshmfence_1.3.bb and recipeutils-test_1.2.bb
On 4/16/22 17:50, Richard Purdie wrote: On Sat, 2022-04-16 at 17:48 +0800, Robert Yang wrote: Thank you very much, I'm trying to run the test cases, but I found that you've already fixed them, thanks again. I don't know why it was set to proprietary in the test but it doesn't seem to cause any regressions so I removed it. It is at an older version which should mean it doesn't affect other builds so I'm happy to leave it on the older version. The following supported versions have the same problem, should we also fix them? Dunfell Hardknott Honister I'd like to send the patches after testing if we need fix them. // Robert Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164530): https://lists.openembedded.org/g/openembedded-core/message/164530 Mute This Topic: https://lists.openembedded.org/mt/90480400/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] License mismatched for libxshmfence_1.3.bb and recipeutils-test_1.2.bb
Hi RP, Thank you very much, I'm trying to run the test cases, but I found that you've already fixed them, thanks again. // Robert On 4/15/22 15:01, Richard Purdie wrote: On Fri, 2022-04-15 at 11:55 +0800, Robert Yang wrote: Hello, The following two recipes use the similar sources, but their LICENSE are different in the recipe: meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb SRC_URI = "http://xorg.freedesktop.org/releases/individual/lib/libxshmfence-1.2.tar.bz2; LICENSE = "Proprietary" meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb SRC_URI = "https://www.x.org/releases//individual/lib/libxshmfence-1.3.tar.bz2; LICENSE = "MIT" There is a COPYING file inside ibxshmfence-1.2.tar.bz2 and libxshmfence-1.3.tar.bz2, they exactly the same: $ diff libxshmfence-1.2/COPYING libxshmfence-1.3/COPYING Please check the end for the full contents of COPYING, it's not either MIT or Proprietary, but should be a free software. How to fix the LICENSE name, please? Add a license file called libxshmfence? Any comments is appreciated. Having looked at a few SPDX licenses, I think this looks like HPND: https://spdx.org/licenses/HPND.html I suspect the license set in the recipeutils-test is there for testing purposes and not as a "real" license but we probably need to make that clear, or only modify it at runtime in the test. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164528): https://lists.openembedded.org/g/openembedded-core/message/164528 Mute This Topic: https://lists.openembedded.org/mt/90480400/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] License mismatched for libxshmfence_1.3.bb and recipeutils-test_1.2.bb
On 4/15/22 11:55 AM, Robert Yang wrote: Hello, The following two recipes use the similar sources, but their LICENSE are different in the recipe: meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb SRC_URI = "http://xorg.freedesktop.org/releases/individual/lib/libxshmfence-1.2.tar.bz2; LICENSE = "Proprietary" meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb SRC_URI = "https://www.x.org/releases//individual/lib/libxshmfence-1.3.tar.bz2; LICENSE = "MIT" There is a COPYING file inside ibxshmfence-1.2.tar.bz2 and libxshmfence-1.3.tar.bz2, they exactly the same: $ diff libxshmfence-1.2/COPYING libxshmfence-1.3/COPYING Please check the end for the full contents of COPYING, it's not either MIT or Proprietary, but should be a free software. How to fix the LICENSE name, please? Add a license file called libxshmfence? Any comments is appreciated. Here is the COPYING: Copyright © 2013 Keith Packard Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of the copyright holders not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. The copyright holders make no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. // Robert -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164418): https://lists.openembedded.org/g/openembedded-core/message/164418 Mute This Topic: https://lists.openembedded.org/mt/90480400/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] License mismatched for libxshmfence_1.3.bb and recipeutils-test_1.2.bb
Hello, The following two recipes use the similar sources, but their LICENSE are different in the recipe: meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb SRC_URI = "http://xorg.freedesktop.org/releases/individual/lib/libxshmfence-1.2.tar.bz2; LICENSE = "Proprietary" meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb SRC_URI = "https://www.x.org/releases//individual/lib/libxshmfence-1.3.tar.bz2; LICENSE = "MIT" There is a COPYING file inside ibxshmfence-1.2.tar.bz2 and libxshmfence-1.3.tar.bz2, they exactly the same: $ diff libxshmfence-1.2/COPYING libxshmfence-1.3/COPYING Please check the end for the full contents of COPYING, it's not either MIT or Proprietary, but should be a free software. How to fix the LICENSE name, please? Add a license file called libxshmfence? Any comments is appreciated. -- Thanks Robert -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164417): https://lists.openembedded.org/g/openembedded-core/message/164417 Mute This Topic: https://lists.openembedded.org/mt/90480400/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/1] waffle: The surfaceless-egl and gbm requires opengl
Fixed when opengl is not in DISTRO_FEATURES: ERROR: Nothing PROVIDES 'virtual/libgbm' (but /path/to/waffle/waffle_1.7.0.bb DEPENDS on or otherwise requires it) Signed-off-by: Robert Yang --- meta/recipes-graphics/waffle/waffle_1.7.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/waffle/waffle_1.7.0.bb b/meta/recipes-graphics/waffle/waffle_1.7.0.bb index b9315157007..f1fd9e7630d 100644 --- a/meta/recipes-graphics/waffle/waffle_1.7.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.7.0.bb @@ -23,7 +23,8 @@ DEPENDS:append = " python3 cmake-native" # stack. PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ - surfaceless-egl gbm" + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gbm surfaceless-egl', '', d)} \ +" # virtual/libgl requires opengl in DISTRO_FEATURES. REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}" -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163951): https://lists.openembedded.org/g/openembedded-core/message/163951 Mute This Topic: https://lists.openembedded.org/mt/90194788/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/1] waffle: The surfaceless-egl and gbm requires opengl
The following changes since commit ff75909f2a9e970aaf389e0012888c29f02376e3: meson: Robustify compiler detection logic (2022-04-01 23:11:32 +0100) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/pc http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/pc Robert Yang (1): waffle: The surfaceless-egl and gbm requires opengl meta/recipes-graphics/waffle/waffle_1.7.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163950): https://lists.openembedded.org/g/openembedded-core/message/163950 Mute This Topic: https://lists.openembedded.org/mt/90194787/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 2/3] perl: Makefile.PL: Fix _PATH_LOG for deterministic build
On 3/2/22 4:48 PM, Alexander Kanavin wrote: Yes, but you do not need to submit the patch for inclusion, only to file a ticket, and ask upstream what can be done about the issue. Thanks, submitted a ticket to upstream and add the url in the patch: Submitted a ticket to upstream: https://rt.cpan.org/Ticket/Display.html?id=141612 Upstream-Status: Inappropriate [OE specific] Signed-off-by: Robert Yang And updated the patch in the PULL: git://git.openembedded.org/openembedded-core-contrib rbt/deterministic http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/deterministic // Robert Alex On Wed, 2 Mar 2022 at 09:47, Robert Yang wrote: Hi On 3/2/22 4:42 PM, Alexander Kanavin wrote: Can you file a ticket upstream for this please, and include the link in the patch? This patch won't work for upstream, only work by cross building, let me check on how to make it work for all cases. // Robert Alex On Wed, 2 Mar 2022 at 08:13, Robert Yang wrote: It checks host's path such as /dev/log and uses it, this doesn't make sense for cross build, and it causes undeterministic, for example, the contianer os usually doesn't have /dev/log which leads to a different build result since other host usually has /dev/log, so make it always use the default value to fix the issue. Signed-off-by: Robert Yang --- ...Makefile.PL-Fix-_PATH_LOG-for-determ.patch | 34 +++ meta/recipes-devtools/perl/perl_5.34.0.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch diff --git a/meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch b/meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch new file mode 100644 index 000..f6bcbce6856 --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch @@ -0,0 +1,34 @@ +From a73fff1fcf0def4ce93964f1b63fe3ad0967259d Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Fri, 18 Feb 2022 09:44:26 + +Subject: [PATCH] cpan/Sys-Syslog/Makefile.PL: Fix _PATH_LOG for deterministic + +It checks host's path such as /dev/log and uses it, this doesn't make sense for +cross build, and it causes undeterministic, for example, the contianer os +usually doesn't have /dev/log which leads to a different build result since +other host usually has /dev/log, so make it always use the default value to fix +the issue. + +Upstream-Status:Inappropriate [OE specific] + +Signed-off-by: Robert Yang +--- + cpan/Sys-Syslog/Makefile.PL | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cpan/Sys-Syslog/Makefile.PL b/cpan/Sys-Syslog/Makefile.PL +index d09ba69..d44e58c 100644 +--- a/cpan/Sys-Syslog/Makefile.PL b/cpan/Sys-Syslog/Makefile.PL +@@ -130,6 +130,8 @@ else { + $_PATH_LOG = ""; + } + ++# OE specific ++$_PATH_LOG = ""; + + # if possible, generate the code that handles the constants with + # ExtUtils::Constant, otherwise use cached copy in fallback/ +-- +2.31.1 + diff --git a/meta/recipes-devtools/perl/perl_5.34.0.bb b/meta/recipes-devtools/perl/perl_5.34.0.bb index a97da872032..8a1db7ed359 100644 --- a/meta/recipes-devtools/perl/perl_5.34.0.bb +++ b/meta/recipes-devtools/perl/perl_5.34.0.bb @@ -20,6 +20,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://aacd2398e766500cb5d83c4d76b642fcf31d997a.patch \ file://ea57297a58b8f10ab885c19eec48ea076116cc1f.patch \ file://5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch \ + file://0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch \ " SRC_URI:append:class-native = " \ file://perl-configpm-switch.patch \ -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162602): https://lists.openembedded.org/g/openembedded-core/message/162602 Mute This Topic: https://lists.openembedded.org/mt/89496472/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 2/3] perl: Makefile.PL: Fix _PATH_LOG for deterministic build
Hi On 3/2/22 4:42 PM, Alexander Kanavin wrote: Can you file a ticket upstream for this please, and include the link in the patch? This patch won't work for upstream, only work by cross building, let me check on how to make it work for all cases. // Robert Alex On Wed, 2 Mar 2022 at 08:13, Robert Yang wrote: It checks host's path such as /dev/log and uses it, this doesn't make sense for cross build, and it causes undeterministic, for example, the contianer os usually doesn't have /dev/log which leads to a different build result since other host usually has /dev/log, so make it always use the default value to fix the issue. Signed-off-by: Robert Yang --- ...Makefile.PL-Fix-_PATH_LOG-for-determ.patch | 34 +++ meta/recipes-devtools/perl/perl_5.34.0.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch diff --git a/meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch b/meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch new file mode 100644 index 000..f6bcbce6856 --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch @@ -0,0 +1,34 @@ +From a73fff1fcf0def4ce93964f1b63fe3ad0967259d Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Fri, 18 Feb 2022 09:44:26 + +Subject: [PATCH] cpan/Sys-Syslog/Makefile.PL: Fix _PATH_LOG for deterministic + +It checks host's path such as /dev/log and uses it, this doesn't make sense for +cross build, and it causes undeterministic, for example, the contianer os +usually doesn't have /dev/log which leads to a different build result since +other host usually has /dev/log, so make it always use the default value to fix +the issue. + +Upstream-Status:Inappropriate [OE specific] + +Signed-off-by: Robert Yang +--- + cpan/Sys-Syslog/Makefile.PL | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cpan/Sys-Syslog/Makefile.PL b/cpan/Sys-Syslog/Makefile.PL +index d09ba69..d44e58c 100644 +--- a/cpan/Sys-Syslog/Makefile.PL b/cpan/Sys-Syslog/Makefile.PL +@@ -130,6 +130,8 @@ else { + $_PATH_LOG = ""; + } + ++# OE specific ++$_PATH_LOG = ""; + + # if possible, generate the code that handles the constants with + # ExtUtils::Constant, otherwise use cached copy in fallback/ +-- +2.31.1 + diff --git a/meta/recipes-devtools/perl/perl_5.34.0.bb b/meta/recipes-devtools/perl/perl_5.34.0.bb index a97da872032..8a1db7ed359 100644 --- a/meta/recipes-devtools/perl/perl_5.34.0.bb +++ b/meta/recipes-devtools/perl/perl_5.34.0.bb @@ -20,6 +20,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://aacd2398e766500cb5d83c4d76b642fcf31d997a.patch \ file://ea57297a58b8f10ab885c19eec48ea076116cc1f.patch \ file://5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch \ + file://0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch \ " SRC_URI:append:class-native = " \ file://perl-configpm-switch.patch \ -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162597): https://lists.openembedded.org/g/openembedded-core/message/162597 Mute This Topic: https://lists.openembedded.org/mt/89496472/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] cups: Add --with-dbusdir to EXTRA_OECONF for deterministic build
The configure checks /etc/dbus-1 and set DBUSDIR is null: if test -d /etc/dbus-1 -a "x$DBUSDIR" = x; then DBUSDIR="/etc/dbus-1" fi So that the build resutl would be different w/o /etc/dbus-1: /etc/dbus-1/system.d/cups.conf (Only exists when DBUSDIR is set) Add --with-dbusdir to EXTRA_OECONF to fix the issue Signed-off-by: Robert Yang --- meta/recipes-extended/cups/cups.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 6f28dc30d03..8f2ad8a0098 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -49,6 +49,7 @@ PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,x EXTRA_OECONF = " \ --enable-dbus \ + --with-dbusdir=${sysconfdir}/dbus-1 \ --enable-browsing \ --disable-gssapi \ --enable-debug \ -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162592): https://lists.openembedded.org/g/openembedded-core/message/162592 Mute This Topic: https://lists.openembedded.org/mt/89496474/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] perl: Makefile.PL: Fix _PATH_LOG for deterministic build
It checks host's path such as /dev/log and uses it, this doesn't make sense for cross build, and it causes undeterministic, for example, the contianer os usually doesn't have /dev/log which leads to a different build result since other host usually has /dev/log, so make it always use the default value to fix the issue. Signed-off-by: Robert Yang --- ...Makefile.PL-Fix-_PATH_LOG-for-determ.patch | 34 +++ meta/recipes-devtools/perl/perl_5.34.0.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch diff --git a/meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch b/meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch new file mode 100644 index 000..f6bcbce6856 --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch @@ -0,0 +1,34 @@ +From a73fff1fcf0def4ce93964f1b63fe3ad0967259d Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Fri, 18 Feb 2022 09:44:26 + +Subject: [PATCH] cpan/Sys-Syslog/Makefile.PL: Fix _PATH_LOG for deterministic + +It checks host's path such as /dev/log and uses it, this doesn't make sense for +cross build, and it causes undeterministic, for example, the contianer os +usually doesn't have /dev/log which leads to a different build result since +other host usually has /dev/log, so make it always use the default value to fix +the issue. + +Upstream-Status:Inappropriate [OE specific] + +Signed-off-by: Robert Yang +--- + cpan/Sys-Syslog/Makefile.PL | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cpan/Sys-Syslog/Makefile.PL b/cpan/Sys-Syslog/Makefile.PL +index d09ba69..d44e58c 100644 +--- a/cpan/Sys-Syslog/Makefile.PL b/cpan/Sys-Syslog/Makefile.PL +@@ -130,6 +130,8 @@ else { + $_PATH_LOG = ""; + } + ++# OE specific ++$_PATH_LOG = ""; + + # if possible, generate the code that handles the constants with + # ExtUtils::Constant, otherwise use cached copy in fallback/ +-- +2.31.1 + diff --git a/meta/recipes-devtools/perl/perl_5.34.0.bb b/meta/recipes-devtools/perl/perl_5.34.0.bb index a97da872032..8a1db7ed359 100644 --- a/meta/recipes-devtools/perl/perl_5.34.0.bb +++ b/meta/recipes-devtools/perl/perl_5.34.0.bb @@ -20,6 +20,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://aacd2398e766500cb5d83c4d76b642fcf31d997a.patch \ file://ea57297a58b8f10ab885c19eec48ea076116cc1f.patch \ file://5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch \ + file://0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch \ " SRC_URI:append:class-native = " \ file://perl-configpm-switch.patch \ -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162590): https://lists.openembedded.org/g/openembedded-core/message/162590 Mute This Topic: https://lists.openembedded.org/mt/89496472/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] quilt: Disable external sendmail for deterministic build
Otherwise, the build results would be different w/o host's /usr/sbin/sendmail: 1) The /usr/share/quilt/compat/sendmail will be genrated if no /usr/sbin/sendmail on host 2) No /usr/share/quilt/compat/sendmail if host's has /usr/sbin/sendmail Use --without-sendmail to make it always generate /usr/share/quilt/compat/sendmail. Signed-off-by: Robert Yang --- meta/recipes-devtools/quilt/quilt.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 19532051cda..07611e6d853 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -25,8 +25,9 @@ PATCHTOOL:class-native = "patch" CLEANBROKEN = "1" -EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" +EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch --without-sendmail" EXTRA_OECONF:append:class-native = " --disable-nls" + EXTRA_AUTORECONF += "--exclude=aclocal" CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash ac_cv_path_COLUMN=column" -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162593): https://lists.openembedded.org/g/openembedded-core/message/162593 Mute This Topic: https://lists.openembedded.org/mt/89496475/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] 3 fixes for deterministic build
The following changes since commit 7f7eb82ce47ede6ec6f50cbcb56cbfbe10e8d20c: insane.bbclass: Update insane.bbclass to work on FIPS enabled hosts (2022-03-01 23:44:29 +) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/deterministic http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/deterministic Robert Yang (3): quilt: Disable external sendmail for deterministic build perl: Makefile.PL: Fix _PATH_LOG for deterministic build cups: Add --with-dbusdir to EXTRA_OECONF for deterministic build ...Makefile.PL-Fix-_PATH_LOG-for-determ.patch | 34 +++ meta/recipes-devtools/perl/perl_5.34.0.bb | 1 + meta/recipes-devtools/quilt/quilt.inc | 3 +- meta/recipes-extended/cups/cups.inc | 1 + 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162591): https://lists.openembedded.org/g/openembedded-core/message/162591 Mute This Topic: https://lists.openembedded.org/mt/89496473/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 1/1] coreutils: Disable statx for native build
The statx requires glibc >= 2.28 and linux kernel >= 4.11, but coreutils's configure only checks glibc compatibility for statx syscall but fail to check kernel support, e.g.: RedHat Enterprise Linux Server 7.6 (Maipo) Host kernel: 3.10.0-1127.8.2.el7.x86_64 Docker OS: Ubuntu 20.04.1 LTS $ bitbake coreutils-native find the binary ls and run it as "ls -l ." The result is something like: "?. ? ? ? ? ? foo" This is because glibc is 2.31 (Ubunut 20.04 in docker) which has statx, but host's kernel is 3.10.0 (CentOS 7) which doesn't support statx. Disable statx for native build to fix the problem. Original from: Davi Poyastro Signed-off-by: Robert Yang --- meta/recipes-core/coreutils/coreutils_9.0.bb | 7 +++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-core/coreutils/coreutils_9.0.bb b/meta/recipes-core/coreutils/coreutils_9.0.bb index e4633949f42..e4a948c7e5f 100644 --- a/meta/recipes-core/coreutils/coreutils_9.0.bb +++ b/meta/recipes-core/coreutils/coreutils_9.0.bb @@ -151,6 +151,13 @@ ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1" ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1" +# The statx() requires glibc >= 2.28 and linux kernel >= 4.11, it doesn't work +# when glibc >= 2.28 ((Ubuntu 20.04 in docker) and kernel < 4.11 (Host OS +# CentOS 7), we can check kernel version and disable it, but that would cause +# two different signatures for coreutils-native, so disable it unconditionally +# for deterministic build. +EXTRA_OECONF:append:class-native = " ac_cv_func_statx=0" + python __anonymous() { for prog in d.getVar('base_bindir_progs').split(): d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162536): https://lists.openembedded.org/g/openembedded-core/message/162536 Mute This Topic: https://lists.openembedded.org/mt/89472059/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 0/1] coreutils: Disable statx for native build
The following changes since commit b1bb4e2d73985c6e8cf03b0fea94e8b739648cf7: flit_core: inherit setuptools3-base (2022-02-27 12:34:05 +) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/coreutils http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/coreutils Robert Yang (1): coreutils: Disable statx for native build meta/recipes-core/coreutils/coreutils_9.0.bb | 7 +++ 1 file changed, 7 insertions(+) -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162535): https://lists.openembedded.org/g/openembedded-core/message/162535 Mute This Topic: https://lists.openembedded.org/mt/89472058/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 1/1] coreutils: fix statx failure on native builds
On 3/1/22 4:21 PM, Richard Purdie wrote: On Tue, 2022-03-01 at 16:19 +0800, Robert Yang wrote: On 3/1/22 3:59 PM, Richard Purdie wrote: On Mon, 2022-02-28 at 23:24 -0800, Robert Yang wrote: From: Davi Poyastro Coreutils configure only checks glibc compatibility for statx syscall but fail to check kernel support. Fixed on RedHat Enterprise Linux Server 7.6 (Maipo) Host kernel: 3.10.0-1127.8.2.el7.x86_64 Docker distro: Ubuntu 20.04.1 LTS $ bitbake coreutils-native find the binary ls and run it as "ls -l ." The result is something like: "?. ? ? ? ? ? foo" Signed-off-by: Davi Poyastro Signed-off-by: Robert Yang --- meta/recipes-core/coreutils/coreutils_9.0.bb | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-core/coreutils/coreutils_9.0.bb b/meta/recipes-core/coreutils/coreutils_9.0.bb index e4633949f42..40fad72bbf4 100644 --- a/meta/recipes-core/coreutils/coreutils_9.0.bb +++ b/meta/recipes-core/coreutils/coreutils_9.0.bb @@ -152,6 +152,11 @@ ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1" python __anonymous() { +from distutils.version import LooseVersion +# statx syscall require glibc >= 2.28 and linux kernel >= 4.11 +if LooseVersion(os.uname().release) < LooseVersion('4.11'): +d.appendVar("EXTRA_OECONF_class-native", " ac_cv_func_statx=0") + Shouldn't that be EXTRA_OECONF:class-native? Yes, you're right, I took this patch from hardknott and built it, but didn't realize that I need change the override syntax. Which makes me worry about where this was tested/needed? I'm then a bit worried we have two different signatures for coreutils-native depending upon which host this runs on, which will cause a number of other issues. I don't think we can do this. That's a problem, maybe we need disable statx for coreutils-native? The errors happens when glibc has a higher version (Ubuntu 20.04 in docker) which has statx(), but kernel version is low (CentOS 7) which doesn't support statx. Disabling it unconditionally which a comment about the version issues may be the only option we have. I'm not sure everyone will like that but if we want to support that combination, I'm not sure we have much choice. It's worth trying for deterministic build, and we only disable coreutils-native, I will send a patch for it. // Robert Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162534): https://lists.openembedded.org/g/openembedded-core/message/162534 Mute This Topic: https://lists.openembedded.org/mt/89471262/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 1/1] coreutils: fix statx failure on native builds
On 3/1/22 3:59 PM, Richard Purdie wrote: On Mon, 2022-02-28 at 23:24 -0800, Robert Yang wrote: From: Davi Poyastro Coreutils configure only checks glibc compatibility for statx syscall but fail to check kernel support. Fixed on RedHat Enterprise Linux Server 7.6 (Maipo) Host kernel: 3.10.0-1127.8.2.el7.x86_64 Docker distro: Ubuntu 20.04.1 LTS $ bitbake coreutils-native find the binary ls and run it as "ls -l ." The result is something like: "?. ? ? ? ? ? foo" Signed-off-by: Davi Poyastro Signed-off-by: Robert Yang --- meta/recipes-core/coreutils/coreutils_9.0.bb | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-core/coreutils/coreutils_9.0.bb b/meta/recipes-core/coreutils/coreutils_9.0.bb index e4633949f42..40fad72bbf4 100644 --- a/meta/recipes-core/coreutils/coreutils_9.0.bb +++ b/meta/recipes-core/coreutils/coreutils_9.0.bb @@ -152,6 +152,11 @@ ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1" python __anonymous() { +from distutils.version import LooseVersion +# statx syscall require glibc >= 2.28 and linux kernel >= 4.11 +if LooseVersion(os.uname().release) < LooseVersion('4.11'): +d.appendVar("EXTRA_OECONF_class-native", " ac_cv_func_statx=0") + Shouldn't that be EXTRA_OECONF:class-native? Yes, you're right, I took this patch from hardknott and built it, but didn't realize that I need change the override syntax. Which makes me worry about where this was tested/needed? I'm then a bit worried we have two different signatures for coreutils-native depending upon which host this runs on, which will cause a number of other issues. I don't think we can do this. That's a problem, maybe we need disable statx for coreutils-native? The errors happens when glibc has a higher version (Ubuntu 20.04 in docker) which has statx(), but kernel version is low (CentOS 7) which doesn't support statx. // Robert Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162532): https://lists.openembedded.org/g/openembedded-core/message/162532 Mute This Topic: https://lists.openembedded.org/mt/89471262/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/1] coreutils: fix statx failure on native builds
The following changes since commit b1bb4e2d73985c6e8cf03b0fea94e8b739648cf7: flit_core: inherit setuptools3-base (2022-02-27 12:34:05 +) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/coreutils http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/coreutils Davi Poyastro (1): coreutils: fix statx failure on native builds meta/recipes-core/coreutils/coreutils_9.0.bb | 5 + 1 file changed, 5 insertions(+) -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162526): https://lists.openembedded.org/g/openembedded-core/message/162526 Mute This Topic: https://lists.openembedded.org/mt/89471263/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/1] coreutils: fix statx failure on native builds
From: Davi Poyastro Coreutils configure only checks glibc compatibility for statx syscall but fail to check kernel support. Fixed on RedHat Enterprise Linux Server 7.6 (Maipo) Host kernel: 3.10.0-1127.8.2.el7.x86_64 Docker distro: Ubuntu 20.04.1 LTS $ bitbake coreutils-native find the binary ls and run it as "ls -l ." The result is something like: "?. ? ? ? ? ? foo" Signed-off-by: Davi Poyastro Signed-off-by: Robert Yang --- meta/recipes-core/coreutils/coreutils_9.0.bb | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-core/coreutils/coreutils_9.0.bb b/meta/recipes-core/coreutils/coreutils_9.0.bb index e4633949f42..40fad72bbf4 100644 --- a/meta/recipes-core/coreutils/coreutils_9.0.bb +++ b/meta/recipes-core/coreutils/coreutils_9.0.bb @@ -152,6 +152,11 @@ ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1" python __anonymous() { +from distutils.version import LooseVersion +# statx syscall require glibc >= 2.28 and linux kernel >= 4.11 +if LooseVersion(os.uname().release) < LooseVersion('4.11'): +d.appendVar("EXTRA_OECONF_class-native", " ac_cv_func_statx=0") + for prog in d.getVar('base_bindir_progs').split(): d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162525): https://lists.openembedded.org/g/openembedded-core/message/162525 Mute This Topic: https://lists.openembedded.org/mt/89471262/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 1/1] bitbake.conf: Add BB_TASK_NETWORK to enable task network globally
On 1/20/22 9:47 PM, Peter Kjellerstedt wrote: -Original Message- From: openembedded-core@lists.openembedded.org On Behalf Of Robert Yang Sent: den 20 januari 2022 08:09 To: openembedded-core@lists.openembedded.org Cc: jupiter@gmail.com Subject: [OE-core] [PATCH 1/1] bitbake.conf: Add BB_TASK_NETWORK to enable task network globally The NIS or icecc can't work when task network is dissable, add BB_TASK_NETWORK to enable network globally for such exceptions. Note, enable nscd on the build machine might be a solution, but that isn't reliable since it depends on whether the network function has been cached or not. Signed-off-by: Robert Yang --- meta/classes/icecc.bbclass | 2 ++ meta/conf/bitbake.conf | 3 +++ meta/lib/oe/utils.py | 15 +++ 3 files changed, 20 insertions(+) diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 794e9930ad9..c39c86458a4 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -41,6 +41,8 @@ ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env" HOSTTOOLS_NONFATAL += "icecc patchelf" +BB_TASK_NETWORK ? = "1" + # This version can be incremented when changes are made to the environment that # invalidate the version on the compile nodes. Changing it will cause a new # environment to be created. diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index fba99e8f0cd..bf5bcd55519 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -946,3 +946,6 @@ MULTILIB_VARIANTS ??= "" # what it would be anyway if the signature generator (e.g. OEEquivHash) doesn't # support unihashes. BB_UNIHASH ?= "${BB_TASKHASH}" + +# Enable task network for remote user such as NIS. +BB_TASK_NETWORK ??= "${@['1', '0'][oe.utils.is_local_uid()]}" I think this is more readable: BB_TASK_NETWORK ??= "${@0 if oe.utils.is_local_uid() else 1}" An even more readable solution would be to rename the function to is_nonlocal_uid() and make it return the inverse of what it returns now. You probably also want to change it to use := instead of ??= so that /etc/passwd is only parsed once. This might require to introduce another variable: UID_IS_NONLOCAL := "${@0 if oe.utils.is_local_uid() else 1}" BB_TASK_NETWORK ??= "${UID_IS_NONLOCAL}" We may not need this any more since NIS seems that is the only case which doesn't work, and can't be fixed (or not easy to fix) by set network per task. // Robert diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 136650e6f74..c21f034aafc 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -595,3 +595,18 @@ def directory_size(root, blocksize=4096): total += sum(roundup(getsize(os.path.join(root, name))) for name in files) total += roundup(getsize(root)) return total + +def is_local_uid(uid=''): +""" +Check whether uid is a local one or not. +Can't use pwd module since it gets all UIDs, not local ones only. +""" +if not uid: +uid = os.getuid() +local_uids = set() +with open('/etc/passwd', 'r') as f: +for line in f.readlines(): +if not ':' in line: +continue +local_uids.add(line.split(':')[2]) +return uid in local_uids -- 2.31.1 //Peter -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#160813): https://lists.openembedded.org/g/openembedded-core/message/160813 Mute This Topic: https://lists.openembedded.org/mt/88554465/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 1/1] bitbake.conf: Add BB_TASK_NETWORK to enable task network globally
On 1/20/22 9:38 PM, Richard Purdie wrote: On Wed, 2022-01-19 at 23:09 -0800, Robert Yang wrote: The NIS or icecc can't work when task network is dissable, add BB_TASK_NETWORK to enable network globally for such exceptions. Note, enable nscd on the build machine might be a solution, but that isn't reliable since it depends on whether the network function has been cached or not. Signed-off-by: Robert Yang --- meta/classes/icecc.bbclass | 2 ++ meta/conf/bitbake.conf | 3 +++ meta/lib/oe/utils.py | 15 +++ 3 files changed, 20 insertions(+) diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 794e9930ad9..c39c86458a4 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -41,6 +41,8 @@ ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env" HOSTTOOLS_NONFATAL += "icecc patchelf" +BB_TASK_NETWORK ? = "1" + As Quentin mentions, I'd much rather this was done on the tasks using icecc using the flag. # This version can be incremented when changes are made to the environment that # invalidate the version on the compile nodes. Changing it will cause a new # environment to be created. diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index fba99e8f0cd..bf5bcd55519 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -946,3 +946,6 @@ MULTILIB_VARIANTS ??= "" # what it would be anyway if the signature generator (e.g. OEEquivHash) doesn't # support unihashes. BB_UNIHASH ?= "${BB_TASKHASH}" + +# Enable task network for remote user such as NIS. +BB_TASK_NETWORK ??= "${@['1', '0'][oe.utils.is_local_uid()]}" diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 136650e6f74..c21f034aafc 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -595,3 +595,18 @@ def directory_size(root, blocksize=4096): total += sum(roundup(getsize(os.path.join(root, name))) for name in files) total += roundup(getsize(root)) return total + +def is_local_uid(uid=''): +""" +Check whether uid is a local one or not. +Can't use pwd module since it gets all UIDs, not local ones only. +""" +if not uid: +uid = os.getuid() +local_uids = set() +with open('/etc/passwd', 'r') as f: +for line in f.readlines(): +if not ':' in line: +continue +local_uids.add(line.split(':')[2]) +return uid in local_uids I think we should move this code into bitbake as I really dislike having it in bitbake.conf and that [0][1] syntax is horrible too... I'm also not convinced about the name "BB_TASK_NETWORK" and think we need something better. If we're moving the code to bitbake we might not need a name right now though. Yes, it's enough for NIS without a name, it seems that NIS is the only case atm, I will send a V2 about this. // Robert Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#160812): https://lists.openembedded.org/g/openembedded-core/message/160812 Mute This Topic: https://lists.openembedded.org/mt/88554465/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 1/1] bitbake.conf: Add BB_TASK_NETWORK to enable task network globally
On 1/20/22 9:31 PM, Quentin Schulz wrote: Hi Robert, On 1/20/22 08:09, Robert Yang wrote: The NIS or icecc can't work when task network is dissable, add BB_TASK_NETWORK to enable network globally for such exceptions. Note, enable nscd on the build machine might be a solution, but that isn't reliable since it depends on whether the network function has been cached or not. Signed-off-by: Robert Yang --- meta/classes/icecc.bbclass | 2 ++ meta/conf/bitbake.conf | 3 +++ meta/lib/oe/utils.py | 15 +++ 3 files changed, 20 insertions(+) diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 794e9930ad9..c39c86458a4 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -41,6 +41,8 @@ ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env" HOSTTOOLS_NONFATAL += "icecc patchelf" +BB_TASK_NETWORK ? = "1" + # This version can be incremented when changes are made to the environment that # invalidate the version on the compile nodes. Changing it will cause a new # environment to be created. diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index fba99e8f0cd..bf5bcd55519 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -946,3 +946,6 @@ MULTILIB_VARIANTS ??= "" # what it would be anyway if the signature generator (e.g. OEEquivHash) doesn't # support unihashes. BB_UNIHASH ?= "${BB_TASKHASH}" + +# Enable task network for remote user such as NIS. +BB_TASK_NETWORK ??= "${@['1', '0'][oe.utils.is_local_uid()]}" diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 136650e6f74..c21f034aafc 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -595,3 +595,18 @@ def directory_size(root, blocksize=4096): total += sum(roundup(getsize(os.path.join(root, name))) for name in files) total += roundup(getsize(root)) return total + +def is_local_uid(uid=''): + """ + Check whether uid is a local one or not. + Can't use pwd module since it gets all UIDs, not local ones only. + """ + if not uid: + uid = os.getuid() + local_uids = set() + with open('/etc/passwd', 'r') as f: + for line in f.readlines(): + if not ':' in line: + continue + local_uids.add(line.split(':')[2]) + return uid in local_uids You can return ASAP instead of iterating over all users: with open('/etc/passwd', 'r') as f: for line in f.readlines(): if not ':' in line: continue if line.split(':')[2] == uid: return True return False Yes, you're right, I renamed the func from get_all_local_uids to is_local_uid(), and forgot to change the logical. Otherwise, since we explicitly add icecc functions to existing tasks, can't you just add [network] = "1" to all those tasks in icecc.bbclass? e.g. do_configure[network] = "1" ? The icecc issue is reported by Jose, I'm not sure whether that works for him or not. Also, even if icecc is globally inherited and enabled, recipes can still disable its use on a per-recipe basis in which case I don't think we should have the network enabled? The network is disabled by default unless set task[network] = "1", and BB_TASK_NETWORK is for preventing the disable, so you can't disable network per-recipe basis, otherwise, it won't work for the case like NIS. Maybe a better name should be FORBIDDEN_DISABLE_TASK_NETWORK. // Robert I can't comment on NIS support. > Cheers, Quentin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#160811): https://lists.openembedded.org/g/openembedded-core/message/160811 Mute This Topic: https://lists.openembedded.org/mt/88554465/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/1] bitbake.conf: Add BB_TASK_NETWORK to enable task network globally
The NIS or icecc can't work when task network is dissable, add BB_TASK_NETWORK to enable network globally for such exceptions. Note, enable nscd on the build machine might be a solution, but that isn't reliable since it depends on whether the network function has been cached or not. Signed-off-by: Robert Yang --- meta/classes/icecc.bbclass | 2 ++ meta/conf/bitbake.conf | 3 +++ meta/lib/oe/utils.py | 15 +++ 3 files changed, 20 insertions(+) diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 794e9930ad9..c39c86458a4 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -41,6 +41,8 @@ ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env" HOSTTOOLS_NONFATAL += "icecc patchelf" +BB_TASK_NETWORK ? = "1" + # This version can be incremented when changes are made to the environment that # invalidate the version on the compile nodes. Changing it will cause a new # environment to be created. diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index fba99e8f0cd..bf5bcd55519 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -946,3 +946,6 @@ MULTILIB_VARIANTS ??= "" # what it would be anyway if the signature generator (e.g. OEEquivHash) doesn't # support unihashes. BB_UNIHASH ?= "${BB_TASKHASH}" + +# Enable task network for remote user such as NIS. +BB_TASK_NETWORK ??= "${@['1', '0'][oe.utils.is_local_uid()]}" diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 136650e6f74..c21f034aafc 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -595,3 +595,18 @@ def directory_size(root, blocksize=4096): total += sum(roundup(getsize(os.path.join(root, name))) for name in files) total += roundup(getsize(root)) return total + +def is_local_uid(uid=''): +""" +Check whether uid is a local one or not. +Can't use pwd module since it gets all UIDs, not local ones only. +""" +if not uid: +uid = os.getuid() +local_uids = set() +with open('/etc/passwd', 'r') as f: +for line in f.readlines(): +if not ':' in line: +continue +local_uids.add(line.split(':')[2]) +return uid in local_uids -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#160752): https://lists.openembedded.org/g/openembedded-core/message/160752 Mute This Topic: https://lists.openembedded.org/mt/88554465/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/1] bitbake.conf: Add BB_TASK_NETWORK to enable task network globally
The following changes since commit ecb61b36938754cf925bf58aad3edf7346deced0: build-appliance-image: Update to master head revision (2022-01-19 23:04:05 +) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/network http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/network Robert Yang (1): bitbake.conf: Add BB_TASK_NETWORK to enable task network globally meta/classes/icecc.bbclass | 2 ++ meta/conf/bitbake.conf | 3 +++ meta/lib/oe/utils.py | 15 +++ 3 files changed, 20 insertions(+) -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#160751): https://lists.openembedded.org/g/openembedded-core/message/160751 Mute This Topic: https://lists.openembedded.org/mt/88554464/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 10/39] logrotate: update 3.18.1 -> 3.19.0, drop rotate-across-filesystems patches
sg) diff --git a/meta/recipes-extended/logrotate/logrotate/0001-Update-the-manual.patch b/meta/recipes-extended/logrotate/logrotate/0001-Update-the-manual.patch deleted file mode 100644 index 50a3852078..00 --- a/meta/recipes-extended/logrotate/logrotate/0001-Update-the-manual.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3e2cfa88b6538bb0fee3d9a6e99622055d05ac4a Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Tue, 17 Feb 2015 21:14:37 -0800 -Subject: [PATCH] Update the manual - -Update the manual for rotating on different filesystems. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang - - logrotate.8.in | 10 -- - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/logrotate.8.in b/logrotate.8.in -index 98fea91..70b4c44 100644 a/logrotate.8.in -+++ b/logrotate.8.in -@@ -202,12 +202,10 @@ at all (use with caution, may waste performance and disk space). Default is 0. - - .TP - \fBolddir \fIdirectory\fR --Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR must be --on the same physical device as the log file being rotated, unless \fBcopy\fR, --\fBcopytruncate\fR or \fBrenamecopy\fR option is used. The \fIdirectory\fR --is assumed to be relative to the directory holding the log file --unless an absolute path name is specified. When this option is used all --old versions of the log end up in \fIdirectory\fR. This option may be -+Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR -+is assumed to be relative to the directory holding the log file unless -+an absolute path name is specified. When this option is used all old -+versions of the log end up in \fIdirectory\fR. This option may be - overridden by the \fBnoolddir\fR option. - - .TP --- -2.24.0 - diff --git a/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch b/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch deleted file mode 100644 index 4efd471906..00 --- a/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 17d57a2a923a4af53c8910aaebeab3f5d83a Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Tue, 17 Feb 2015 21:08:07 -0800 -Subject: [PATCH] Act as the "mv" command when rotate log - -Act as the "mv" command when rotate log, first rename, if failed, then -read and write. - -Upstream-Status: Inappropriate [needs a rework according to https://github.com/logrotate/logrotate/pull/429] - -Signed-off-by: Robert Yang - - logrotate.c | 71 - - 1 file changed, 59 insertions(+), 12 deletions(-) - -diff --git a/logrotate.c b/logrotate.c -index 45b3eb6..231371a 100644 a/logrotate.c -+++ b/logrotate.c -@@ -1463,6 +1463,53 @@ static int findNeedRotating(const struct logInfo *log, unsigned logNum, int forc - return 0; - } - -+/* Act as the "mv" command, if rename failed, then read the old file and -+ * write to new file. The function which invokes the mvFile will use -+ * the strerror(errorno) to handle the error message, so we don't have -+ * to print the error message here */ -+ -+int mvFile (char *oldName, char *newName, struct logInfo *log, acl_type acl) -+{ -+struct stat sbprev; -+int fd_old, fd_new, n; -+char buf[BUFSIZ]; -+ -+/* Do the rename first */ -+if (!rename(oldName, newName)) -+return 0; -+ -+/* If the errno is EXDEV, then read old file, write newfile and -+ * remove the oldfile */ -+if (errno == EXDEV) { -+/* Open the old file to read */ -+if ((fd_old = open(oldName, O_RDONLY)) < 0) -+return 1; -+ -+/* Create the file to write, keep the same attribute as the old file */ -+if (stat(oldName, )) -+return 1; -+else { -+if ((fd_new = createOutputFile(newName, -+O_WRONLY | O_CREAT | O_TRUNC, , acl, 0)) < 0 ) -+return 1; -+} -+ -+/* Read and write */ -+while ((n = read(fd_old, buf, BUFSIZ)) > 0) -+if (write(fd_new, buf, n) != n) -+return 1; -+ -+if ((close(fd_old) < 0) || -+removeLogFile(oldName, log) || -+(close(fd_new) < 0)) -+return 1; -+ -+return 0; -+} -+ -+return 1; -+} -+ - /* find the rotated file with the highest index */ - static int findLastRotated(const struct logNames *rotNames, -const char *fileext, const char *compext) -@@ -1958,15 +2005,15 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum, - } - - message(MESS_DEBUG, --"renaming %s to %s (rotatecount %d, logstart %d, i %d), \n", -+"moving %s to %s (rotatecount %d, logstart %d, i %d), \n", - oldName, newName, rotateCount, logStart, i); - --
Re: [OE-core] [PATCH 1/1] bitbake.conf: Set ZSTD_THREADS to half of cpu number
Hi RP, On 11/9/21 6:26 PM, Richard Purdie wrote: On Tue, 2021-11-09 at 10:56 +0100, Alexander Kanavin wrote: On Tue, 9 Nov 2021 at 10:51, Robert Yang wrote: Maybe, but once we start doing tweaks like this, where do they stop? Hey, I'd I think that it's not only a performance tweak, but this should be considered as a bug since it would be failed to build on powerful machine, which isn't good for oe-core's user experience. I managed to bring down a powerful machine just yesterday by building webkit and llvm together at the same time. They together ate all the RAM, and someone in the office had to go and reset the box. Do I see it as a bug? Absolutely not: it's in fact my fault for not ensuring system resource consumption doesn't overwhelm the machine. This is the same: if you do not have RAM to match the cores on your specific rig, add RAM or limit the threads. I can see both sides of this. If we had a pool for all the threads and the pieces of the system all used the same pool, it would work well as implemented. Sadly the bitbake threads, the make processes and now the compression threads are all separate. We do see the autobuilder break due to load issues too and on that we have scaled back some of the defaults but not ZSTD as yet that I recall. As such I think limiting the upper value on number of threads may be a good compromise, both for compression and maybe for parallel make too. What should we do next, please? Limit bb thread + parallel make + zstd thread? Or just limit zstd's thread since other people may concern about the performance. // Robert Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158147): https://lists.openembedded.org/g/openembedded-core/message/158147 Mute This Topic: https://lists.openembedded.org/mt/86926962/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 1/1] bitbake.conf: Set ZSTD_THREADS to half of cpu number
Hi Alexander, On 11/9/21 5:44 PM, Alexander Kanavin wrote: Maybe, but once we start doing tweaks like this, where do they stop? Hey, I'd I think that it's not only a performance tweak, but this should be considered as a bug since it would be failed to build on powerful machine, which isn't good for oe-core's user experience. // Robert like to limit llvm and webkit threads too, they eat disproportionally large amounts of RAM compared to everything else! I'd rather err on the side of simple, striaghtforward, universal defaults, and having better documentation for tweaking system resource consumption. Each build system is different. Alex On Tue, 9 Nov 2021 at 10:40, Robert Yang <mailto:liezhi.y...@windriver.com>> wrote: On 11/9/21 4:41 PM, Konrad Weihmann wrote: > > > On 09.11.21 09:48, Robert Yang wrote: >> The original value is very easy to cause do_packge error when cpu number is >> larger, for example, 128 cores and 512G mem: >> >> error: create archive failed: cpio: write failed - Cannot allocate memory" >> >> Set the ZSTD_THREADS to half of the CPU number can avoid the error in my >> testing. >> >> Signed-off-by: Robert Yang mailto:liezhi.y...@windriver.com>> >> --- >> meta/conf/bitbake.conf | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf >> index 71c1e52ad6..46ebf5113f 100644 >> --- a/meta/conf/bitbake.conf >> +++ b/meta/conf/bitbake.conf >> @@ -833,7 +833,7 @@ XZ_DEFAULTS ?= "--memlimit=${XZ_MEMLIMIT} >> --threads=${XZ_THREADS}" >> XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" >> # Default parallelism for zstd >> -ZSTD_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" >> +ZSTD_THREADS ?= "${@int(oe.utils.cpu_count(at_least=4)/2)}" > > Then why not just limit it for the large setups you are referring to in the > example, for instance like > > ZSTD_THREADS ?= "${@min(int(oe.utils.cpu_count(at_least=4)), value of your choice>)}" This sounds like a good choice. > > BTW this can be also done in your local.conf - as Alex already said, there is Set it in my local.conf can make it work, but it isn't good for oe-core's OOBE since the issue still exists. > simply no reason to make it slower for everyone, while also half the threads of The whole build contains a lot of tasks, for lower cpu cores, the total resources are fixed, so when zstd uses less mem, other tasks can use more. Limit zstd's thread doesn't make the build slower, but faster in my testing, it would be great if you can help test it. The simple testing commands are: # Make everything ready: $ bitbake linux-yocto # Before the patch, set ZSTD_THREADS to 128 and run 6 times: $ for i in `seq 0 5`; do time bitbake linux-yocto -cpackage_write_rpm -f > before_$i.log; done Note, the time will be printed on the screen, not the before.log, the before.log is for strip the logs and then we can read the time easier. What I get is: real 2m12.079s real 2m0.177s real 1m52.426s real 2m3.396s real 2m16.018s real 1m58.595s Drop the first build time since it *may* contain parsing time, and for the last five builds: Total: 609 seconds Average: 609 / 5.0 = 121.8 # After the patch, set ZSTD_THREADS to 64, and run 6 times: $ for i in `seq 0 5`; do time bitbake linux-yocto -cpackage_write_rpm -f > after_$i.log; done What I get is: real 1m50.017s real 1m50.400s real 1m53.174s real 2m4.817s real 1m53.476s real 1m56.794s Drop the first build time since it *may* contain parsing time, and for the last five builds: Total: 576 seconds Average: 576 / 5.0 = 115.2 So the smaller number is faster than the larger one. // Robert > a 128 core machine could be a trouble some setup. > > Last time I had this issue (with XZ back then) I used > "${@min(int(oe.utils.cpu_count(at_least=4)), 20}" > >> ZSTD_THREADS[vardepvalue] = "1" >> # Limit the number of threads that OpenMP libraries will use. Otherwise they >> >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158007): https://lists.openembedded.org/g/openembedded-core/message/158007 Mute This Topic: https://lists.openembedded.org/mt/86926962/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 1/1] bitbake.conf: Set ZSTD_THREADS to half of cpu number
Hi Alexander, On 11/9/21 4:21 PM, Alexander Kanavin wrote: But does this mean we need to globally restrict this and make things twice slower for everyone? I'm not sure. Please see my reply to Konrad, it doesn't cause any slower, but faster in my testing. BTW, the XZ_MEMLIMIT is 50% for command xz, but there isn't a similar option for zstd, so I have to limit ZSTD_THREADS. // Robert Alex On Tue, 9 Nov 2021 at 09:12, Robert Yang <mailto:liezhi.y...@windriver.com>> wrote: The original value is very easy to cause do_packge error when cpu number is larger, for example, 128 cores and 512G mem: error: create archive failed: cpio: write failed - Cannot allocate memory" Set the ZSTD_THREADS to half of the CPU number can avoid the error in my testing. Signed-off-by: Robert Yang mailto:liezhi.y...@windriver.com>> --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 71c1e52ad6..46ebf5113f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -833,7 +833,7 @@ XZ_DEFAULTS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" # Default parallelism for zstd -ZSTD_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" +ZSTD_THREADS ?= "${@int(oe.utils.cpu_count(at_least=4)/2)}" ZSTD_THREADS[vardepvalue] = "1" # Limit the number of threads that OpenMP libraries will use. Otherwise they -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158006): https://lists.openembedded.org/g/openembedded-core/message/158006 Mute This Topic: https://lists.openembedded.org/mt/86926962/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 1/1] bitbake.conf: Set ZSTD_THREADS to half of cpu number
On 11/9/21 4:41 PM, Konrad Weihmann wrote: On 09.11.21 09:48, Robert Yang wrote: The original value is very easy to cause do_packge error when cpu number is larger, for example, 128 cores and 512G mem: error: create archive failed: cpio: write failed - Cannot allocate memory" Set the ZSTD_THREADS to half of the CPU number can avoid the error in my testing. Signed-off-by: Robert Yang --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 71c1e52ad6..46ebf5113f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -833,7 +833,7 @@ XZ_DEFAULTS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" # Default parallelism for zstd -ZSTD_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" +ZSTD_THREADS ?= "${@int(oe.utils.cpu_count(at_least=4)/2)}" Then why not just limit it for the large setups you are referring to in the example, for instance like ZSTD_THREADS ?= "${@min(int(oe.utils.cpu_count(at_least=4)), value of your choice>)}" This sounds like a good choice. BTW this can be also done in your local.conf - as Alex already said, there is Set it in my local.conf can make it work, but it isn't good for oe-core's OOBE since the issue still exists. simply no reason to make it slower for everyone, while also half the threads of The whole build contains a lot of tasks, for lower cpu cores, the total resources are fixed, so when zstd uses less mem, other tasks can use more. Limit zstd's thread doesn't make the build slower, but faster in my testing, it would be great if you can help test it. The simple testing commands are: # Make everything ready: $ bitbake linux-yocto # Before the patch, set ZSTD_THREADS to 128 and run 6 times: $ for i in `seq 0 5`; do time bitbake linux-yocto -cpackage_write_rpm -f > before_$i.log; done Note, the time will be printed on the screen, not the before.log, the before.log is for strip the logs and then we can read the time easier. What I get is: real2m12.079s real2m0.177s real1m52.426s real2m3.396s real2m16.018s real1m58.595s Drop the first build time since it *may* contain parsing time, and for the last five builds: Total: 609 seconds Average: 609 / 5.0 = 121.8 # After the patch, set ZSTD_THREADS to 64, and run 6 times: $ for i in `seq 0 5`; do time bitbake linux-yocto -cpackage_write_rpm -f > after_$i.log; done What I get is: real1m50.017s real1m50.400s real1m53.174s real2m4.817s real1m53.476s real1m56.794s Drop the first build time since it *may* contain parsing time, and for the last five builds: Total: 576 seconds Average: 576 / 5.0 = 115.2 So the smaller number is faster than the larger one. // Robert a 128 core machine could be a trouble some setup. Last time I had this issue (with XZ back then) I used "${@min(int(oe.utils.cpu_count(at_least=4)), 20}" ZSTD_THREADS[vardepvalue] = "1" # Limit the number of threads that OpenMP libraries will use. Otherwise they -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158004): https://lists.openembedded.org/g/openembedded-core/message/158004 Mute This Topic: https://lists.openembedded.org/mt/86926962/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/1] bitbake.conf: Set ZSTD_THREADS to half of cpu number
The following changes since commit afad2f09ebbfe395f8fafce8218e26056479fe39: meson: improve SDK's wrapper to make Wraps work (2021-11-08 22:01:53 +) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/zstd http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/zstd Robert Yang (1): bitbake.conf: Set ZSTD_THREADS to half of cpu number meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157999): https://lists.openembedded.org/g/openembedded-core/message/157999 Mute This Topic: https://lists.openembedded.org/mt/86926963/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/1] bitbake.conf: Set ZSTD_THREADS to half of cpu number
The original value is very easy to cause do_packge error when cpu number is larger, for example, 128 cores and 512G mem: error: create archive failed: cpio: write failed - Cannot allocate memory" Set the ZSTD_THREADS to half of the CPU number can avoid the error in my testing. Signed-off-by: Robert Yang --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 71c1e52ad6..46ebf5113f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -833,7 +833,7 @@ XZ_DEFAULTS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" # Default parallelism for zstd -ZSTD_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" +ZSTD_THREADS ?= "${@int(oe.utils.cpu_count(at_least=4)/2)}" ZSTD_THREADS[vardepvalue] = "1" # Limit the number of threads that OpenMP libraries will use. Otherwise they -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157998): https://lists.openembedded.org/g/openembedded-core/message/157998 Mute This Topic: https://lists.openembedded.org/mt/86926962/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 1/1] sanity.bbclass: Update required gcc version to v7.5
HI Khem, On 11/1/21 11:18 PM, Khem Raj wrote: On Mon, Nov 1, 2021 at 8:05 AM Robert Yang <mailto:liezhi.y...@windriver.com>> wrote: qemu-native 6.1.0 requires at least gcc v7.5: ERROR: You need at least GCC v7.5 or Clang v6.0 (or XCode Clang v10.0) Which supported distros still ship gcc < 7.5 CentOS-7: SANITY_TESTED_DISTROS ?= " \ [snip] centos-7 \n \ Its gcc is 4.8.5 // Robert Signed-off-by: Robert Yang mailto:liezhi.y...@windriver.com>> --- meta/classes/sanity.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index ddba1e6e1e..9fbc9c18e7 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -530,7 +530,7 @@ def check_wsl(d): bb.warn("You are running bitbake under WSLv2, this works properly but you should optimize your VHDX file eventually to avoid running out of storage space") return None -# Require at least gcc version 6.0. +# Require at least gcc version 7.5. # # This can be fixed on CentOS-7 with devtoolset-6+ # https://www.softwarecollections.org/en/scls/rhscl/devtoolset-6/ <https://urldefense.com/v3/__https://www.softwarecollections.org/en/scls/rhscl/devtoolset-6/__;!!AjveYdw8EvQ!Lgf9R1VVp7NnmQ2_34OejSiQF4VTR4FFlyIm_7pg5abwOZHY2z7ir1SPnplXDpu3CJJc$> @@ -544,8 +544,8 @@ def check_gcc_version(sanity_data): build_cc, version = oe.utils.get_host_compiler_version(sanity_data) if build_cc.strip() == "gcc": - if LooseVersion(version) < LooseVersion("6.0"): - return "Your version of gcc is older than 6.0 and will break builds. Please install a newer version of gcc (you could use the project's buildtools-extended-tarball or use scripts/install-buildtools).\n" + if LooseVersion(version) < LooseVersion("7.5"): + return "Your version of gcc is older than 7.5 and will break builds. Please install a newer version of gcc (you could use the project's buildtools-extended-tarball or use scripts/install-buildtools).\n" return None # Tar version 1.24 and onwards handle overwriting symlinks correctly -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157734): https://lists.openembedded.org/g/openembedded-core/message/157734 Mute This Topic: https://lists.openembedded.org/mt/86742639/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/1] sanity.bbclass: Update required gcc version to v7.5
The following changes since commit f33f3f1d3800fe4a1fe47f2ae1056d1ac2b0c2a5: base-files: Ignore the empty-dirs QA error due to files in /var/volatile (2021-11-01 10:41:15 +) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/gcc http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/gcc Robert Yang (1): sanity.bbclass: Update required gcc version to v7.5 meta/classes/sanity.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157705): https://lists.openembedded.org/g/openembedded-core/message/157705 Mute This Topic: https://lists.openembedded.org/mt/86742640/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/1] sanity.bbclass: Update required gcc version to v7.5
qemu-native 6.1.0 requires at least gcc v7.5: ERROR: You need at least GCC v7.5 or Clang v6.0 (or XCode Clang v10.0) Signed-off-by: Robert Yang --- meta/classes/sanity.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index ddba1e6e1e..9fbc9c18e7 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -530,7 +530,7 @@ def check_wsl(d): bb.warn("You are running bitbake under WSLv2, this works properly but you should optimize your VHDX file eventually to avoid running out of storage space") return None -# Require at least gcc version 6.0. +# Require at least gcc version 7.5. # # This can be fixed on CentOS-7 with devtoolset-6+ # https://www.softwarecollections.org/en/scls/rhscl/devtoolset-6/ @@ -544,8 +544,8 @@ def check_gcc_version(sanity_data): build_cc, version = oe.utils.get_host_compiler_version(sanity_data) if build_cc.strip() == "gcc": -if LooseVersion(version) < LooseVersion("6.0"): -return "Your version of gcc is older than 6.0 and will break builds. Please install a newer version of gcc (you could use the project's buildtools-extended-tarball or use scripts/install-buildtools).\n" +if LooseVersion(version) < LooseVersion("7.5"): +return "Your version of gcc is older than 7.5 and will break builds. Please install a newer version of gcc (you could use the project's buildtools-extended-tarball or use scripts/install-buildtools).\n" return None # Tar version 1.24 and onwards handle overwriting symlinks correctly -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157704): https://lists.openembedded.org/g/openembedded-core/message/157704 Mute This Topic: https://lists.openembedded.org/mt/86742639/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-