Patch review
cover Patch review
Please review this set of changes for kirkstone and have comments back by end of day Tuesday, March 18
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/1193
The following changes since commit b00b0d744a1768843386cfd529b73cc17c88bec9:
babeltrace2: extend to nativesdk (2025-03-12 07:14:12 -0700)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/scarthgap-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/scarthgap-nut
Oleksandr Hnatiuk (1):
gcc: remove paths to sysroot from configargs.h and checksum-options
for gcc-cross-canadian
Peter Marko (1):
libarchive: patch CVE-2025-1632 and CVE-2025-25724
Sana Kazi (1):
gcc-cross-canadian.inc: Fix buildpaths error for pthread.h
Zhang Peng (1):
mpg123: upgrade 1.32.6 -> 1.32.10
meta/recipes-devtools/gcc/gcc-common.inc | 22 +++++
.../gcc/gcc-configure-common.inc | 1 -
.../gcc/gcc-cross-canadian.inc | 8 ++
meta/recipes-devtools/gcc/gcc-cross.inc | 15 +---
meta/recipes-devtools/gcc/gcc-target.inc | 16 +---
.../CVE-2025-1632_CVE-2025-25724.patch | 83 +++++++++++++++++++
.../libarchive/libarchive_3.7.4.bb | 1 +
.../{mpg123_1.32.6.bb => mpg123_1.32.10.bb} | 2 +-
8 files changed, 119 insertions(+), 29 deletions(-)
create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2025-1632_CVE-2025-25724.patch
rename meta/recipes-multimedia/mpg123/{mpg123_1.32.6.bb => mpg123_1.32.10.bb} (96%)Signature · 1 line
2.43.0
PATCH 1/4 libarchive: patch CVE-2025-1632 and CVE-2025-25724
From: Peter Marko <[email protected]>
Pick commit referencing this MR which was merged to master.
--- .../CVE-2025-1632_CVE-2025-25724.patch | 83 +++++++++++++++++++ .../libarchive/libarchive_3.7.4.bb | 1 + 2 files changed, 84 insertions(+) create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2025-1632_CVE-2025-25724.patch
meta/recipes-extended/libarchive/libarchive/CVE-2025-1632_CVE-2025-25724.patch new file +83 -0
@@ -0,0 +1,83 @@ +From c9bc934e7e91d302e0feca6e713ccc38d6d01532 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Peter=20K=C3=A4stle?= <[email protected]> +Date: Mon, 10 Mar 2025 16:43:04 +0100 +Subject: [PATCH] fix CVE-2025-1632 and CVE-2025-25724 (#2532) + +Hi, + +please find my approach to fix the CVE-2025-1632 and CVE-2025-25724 +vulnerabilities in this pr. +As both error cases did trigger a NULL pointer deref (and triggered +hopefully everywhere a coredump), we can safely replace the actual +information by a predefined invalid string without breaking any +functionality. + +CVE: CVE-2025-1632 +CVE: CVE-2025-25724 +Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/c9bc934e7e91d302e0feca6e713ccc38d6d01532] +Signed-off-by: Peter Marko <[email protected]> +--------- + +Signed-off-by: Peter Kaestle <[email protected]> +--- + tar/util.c | 5 ++++- + unzip/bsdunzip.c | 10 +++++++--- + 2 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/tar/util.c b/tar/util.c +index 3b099cb5..f3cbdf0b 100644 +--- a/tar/util.c ++++ b/tar/util.c +@@ -748,7 +748,10 @@ list_item_verbose(struct bsdtar *bsdtar, FILE *out, struct archive_entry *entry) + #else + ltime = localtime(&tim); + #endif +- strftime(tmp, sizeof(tmp), fmt, ltime); ++ if (ltime) ++ strftime(tmp, sizeof(tmp), fmt, ltime); ++ else ++ sprintf(tmp, "-- -- ----"); + fprintf(out, " %s ", tmp); + safe_fprintf(out, "%s", archive_entry_pathname(entry)); + +diff --git a/unzip/bsdunzip.c b/unzip/bsdunzip.c +index 7c8cafc3..4a9028b7 100644 +--- a/unzip/bsdunzip.c ++++ b/unzip/bsdunzip.c +@@ -904,6 +904,7 @@ list(struct archive *a, struct archive_entry *e) + char buf[20]; + time_t mtime; + struct tm *tm; ++ const char *pathname; + + mtime = archive_entry_mtime(e); + tm = localtime(&mtime); +@@ -912,22 +913,25 @@ list(struct archive *a, struct archive_entry *e) + else + strftime(buf, sizeof(buf), "%m-%d-%g %R", tm); + ++ pathname = archive_entry_pathname(e); ++ if (!pathname) ++ pathname = ""; + if (!zipinfo_mode) { + if (v_opt == 1) { + printf(" %8ju %s %s\n", + (uintmax_t)archive_entry_size(e), +- buf, archive_entry_pathname(e)); ++ buf, pathname); + } else if (v_opt == 2) { + printf("%8ju Stored %7ju 0%% %s %08x %s\n", + (uintmax_t)archive_entry_size(e), + (uintmax_t)archive_entry_size(e), + buf, + 0U, +- archive_entry_pathname(e)); ++ pathname); + } + } else { + if (Z1_opt) +- printf("%s\n",archive_entry_pathname(e)); ++ printf("%s\n", pathname); + } + ac(archive_read_data_skip(a)); + }
meta/recipes-extended/libarchive/libarchive_3.7.4.bb +1 -0
@@ -34,6 +34,7 @@ SRC_URI += "file://configurehack.patch \ file://CVE-2024-48957.patch \ file://CVE-2024-48958.patch \ file://CVE-2024-20696.patch \ + file://CVE-2025-1632_CVE-2025-25724.patch \ " UPSTREAM_CHECK_URI = "http://libarchive.org/"
Signature · 1 line
2.43.0
PATCH 2/4 mpg123: upgrade 1.32.6 -> 1.32.10
In reply to Steve SakomanFrom: Zhang Peng <[email protected]>
Changelog:
==========
1.32.10
- scripts/tag_lyrics.py: fix for python3
- libout123: Use strtok_r() to avoid conflicts multithreaded contexts
- libmpg123: Un-break DLL builds that need I/O functions defined in libmpg123.c
- ports/cmake: More fixup to also produce .pc files with Libs.private.
1.32.9
- libmpg123:
-- enable 64 bit offset path for MSVCRT and avoid warnings about
MS's game about POSIX API with and without underscores
-- Increase the library patchlevel, as was forgotten on previous
release.
1.32.8
Update: The buffer overflow got assigned the CVE ID CVE-2024-10573.
- libmpg123:
-- Add sections to assembly to support PAC/BTI code
for aarch64 (-mbranch-protection variants)
-- Prevent premature application of header info into decoding structure,
at worst having triggered out-of-bounds writes of decoded PCM data
- out123: Show --quiet in --longhelp.
1.32.7
- ports/cmake: Work around bug in CMake that does not detect FPU on Apple ARM CPUs.
- Fix some laziness (func() to func(void)) for standards conformance.
---
.../mpg123/{mpg123_1.32.6.bb => mpg123_1.32.10.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-multimedia/mpg123/{mpg123_1.32.6.bb => mpg123_1.32.10.bb} (96%)meta/recipes-multimedia/mpg123/mpg123_1.32.10.bb renamed from meta/recipes-multimedia/mpg123/mpg123_1.32.6.bb +1 -1
@@ -10,7 +10,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169" SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" -SRC_URI[sha256sum] = "ccdd1d0abc31d73d8b435fc658c79049d0a905b30669b6a42a03ad169dc609e6" +SRC_URI[sha256sum] = "87b2c17fe0c979d3ef38eeceff6362b35b28ac8589fbf1854b5be75c9ab6557c" UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.43.0
PATCH 3/4 gcc: remove paths to sysroot from configargs.h and checksum-options for gcc-cross-canadian
In reply to Steve SakomanFrom: Oleksandr Hnatiuk <[email protected]>
Apply fixes from gcc-cross (84a78f46d594 and 0ead8cbdfb96) to gcc-cross-canadian. This will improve (but not fix) reproducibility of gcc-cross-canadian. Also move this code to functions to avoid code duplication.
[RP: Tweak patch to make the function parameters clear and fix quoting issues ensuring the code exactly matches the original replacements with an additional parameter.]
(From OE-Core rev: 350ff7d53f7506de2bc01f0efc569b8294b9afea)
--- meta/recipes-devtools/gcc/gcc-common.inc | 22 +++++++++++++++++++ .../gcc/gcc-configure-common.inc | 1 - .../gcc/gcc-cross-canadian.inc | 3 +++ meta/recipes-devtools/gcc/gcc-cross.inc | 15 ++----------- meta/recipes-devtools/gcc/gcc-target.inc | 16 ++------------ 5 files changed, 29 insertions(+), 28 deletions(-)
meta/recipes-devtools/gcc/gcc-common.inc +22 -0
@@ -116,3 +116,25 @@ target_prefix ?= "${prefix}" # The real WORKDIR location isn't a dependency for the shared workdir. src_patches[vardepsexclude] = "WORKDIR" should_apply[vardepsexclude] += "PN" + +remove_sysroot_paths_from_configargs () { + replacement=${1} + # Prevent sysroot path from being used in configargs.h header, as it will + # be rewritten when used by other sysroots preventing support for gcc + # plugins. Additionally the path is embeddeded into the output binary, this + # prevents building a reproducible binary. + oe_runmake configure-gcc + sed -i "s@${STAGING_DIR_TARGET}@$replacement@g" ${B}/gcc/configargs.h + sed -i "s@${STAGING_DIR_HOST}@/$replacement@g" ${B}/gcc/configargs.h +} + +remove_sysroot_paths_from_checksum_options () { + stagingdir=${1} + replacement=${2} + # Prevent sysroot/workdir paths from being used in checksum-options. + # checksum-options is used to generate a checksum which is embedded into + # the output binary. + oe_runmake TARGET-gcc=checksum-options all-gcc + sed -i "s@${DEBUG_PREFIX_MAP}@@g" ${B}/gcc/checksum-options + sed -i "s@$stagingdir@$replacement@g" ${B}/gcc/checksum-options +}
meta/recipes-devtools/gcc/gcc-configure-common.inc +0 -1
@@ -119,4 +119,3 @@ do_configure () { oe_runconf } -
meta/recipes-devtools/gcc/gcc-cross-canadian.inc +3 -0
@@ -63,6 +63,9 @@ do_configure () { } do_compile () { + remove_sysroot_paths_from_configargs '/host' + remove_sysroot_paths_from_checksum_options '${STAGING_DIR_HOST}' '/host' + oe_runmake all-host configure-target-libgcc (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h) }
meta/recipes-devtools/gcc/gcc-cross.inc +2 -13
@@ -61,19 +61,8 @@ do_compile () { export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" - # Prevent native/host sysroot path from being used in configargs.h header, - # as it will be rewritten when used by other sysroots preventing support - # for gcc plugins - oe_runmake configure-gcc - sed -i 's@${STAGING_DIR_TARGET}@/host@g' ${B}/gcc/configargs.h - sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/configargs.h - - # Prevent sysroot/workdir paths from being used in checksum-options. - # checksum-options is used to generate a checksum which is embedded into - # the output binary. - oe_runmake TARGET-gcc=checksum-options all-gcc - sed -i 's@${DEBUG_PREFIX_MAP}@@g' ${B}/gcc/checksum-options - sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/checksum-options + remove_sysroot_paths_from_configargs '/host' + remove_sysroot_paths_from_checksum_options '${STAGING_DIR_HOST}' '/host' oe_runmake all-host configure-target-libgcc (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h)
meta/recipes-devtools/gcc/gcc-target.inc +2 -14
@@ -140,20 +140,8 @@ FILES:${PN}-doc = "\ " do_compile () { - # Prevent full target sysroot path from being used in configargs.h header, - # as it will be rewritten when used by other sysroots preventing support - # for gcc plugins. Additionally the path is embeddeded into the output - # binary, this prevents building a reproducible binary. - oe_runmake configure-gcc - sed -i 's@${STAGING_DIR_TARGET}@/@g' ${B}/gcc/configargs.h - sed -i 's@${STAGING_DIR_HOST}@/@g' ${B}/gcc/configargs.h - - # Prevent sysroot/workdir paths from being used in checksum-options. - # checksum-options is used to generate a checksum which is embedded into - # the output binary. - oe_runmake TARGET-gcc=checksum-options all-gcc - sed -i 's@${DEBUG_PREFIX_MAP}@@g' ${B}/gcc/checksum-options - sed -i 's@${STAGING_DIR_TARGET}@/@g' ${B}/gcc/checksum-options + remove_sysroot_paths_from_configargs '/' + remove_sysroot_paths_from_checksum_options '${STAGING_DIR_TARGET}' '/' oe_runmake all-host }
Signature · 1 line
2.43.0
PATCH 4/4 gcc-cross-canadian.inc: Fix buildpaths error for pthread.h
In reply to Steve SakomanFrom: Sana Kazi <[email protected]>
Replace the hardcoded path with /not/exist as used for other options[--with-sysroot] to ensure pthread.h does not contain hardocded references to TMPDIR:
ERROR: gcc-cross-canadian-x86-64-13.3.0-r0 do_package_qa: QA Issue:
File /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/ usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/13.3.0/include-fixed/ pthread.h in package gcc-cross-canadian-x86-64 contains reference to TMPDIR [buildpaths]
--- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 5 +++++ 1 file changed, 5 insertions(+)
meta/recipes-devtools/gcc/gcc-cross-canadian.inc +5 -0
@@ -118,6 +118,11 @@ do_install () { # We don't care about the gcc-<version> copies rm -f ${D}${bindir}/*gcc-${BINV}* + # Remove buildpaths from pthread.h + sed -i -e "s|${RECIPE_SYSROOT_NATIVE}|/not/exist|g" \ + -e "s|${RECIPE_SYSROOT}|/not/exist|g" \ + ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed/pthread.h + # Cleanup empty directories which are not shipped # we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted # ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686
Signature · 1 line
2.43.0
Re: [OE-core][scarthgap 4/4] gcc-cross-canadian.inc: Fix buildpaths error for pthread.h
I'm seeing build errors in our nightly builds due to this patch. The pthread.h file does not exist and the command is erroring out causing do_install to fail.
sed: can't read /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h: No such file or directory
WARNING: /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706:182 exit 2 from 'sed -i -e "s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot-native|/not/exist|g" -e "s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot|/not/exist|g" /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h'
WARNING: Backtrace (BB generated script):
#1: do_install, /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706, line 182 #2: main,
/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706, line 301
And line 182 is the sed line.
Should the sed call be wrapped in an if file exists check?
Quoted 45 lines · Steve Sakoman
From: Sana Kazi <[email protected]>
Replace the hardcoded path with /not/exist as used for other options[--with-sysroot] to ensure
pthread.hdoes not contain hardocded references to TMPDIR:ERROR: gcc-cross-canadian-x86-64-13.3.0-r0
do_package_qa: QA Issue:
File/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/13.3.0/include-fixed/pthread.hin package gcc-cross-canadian-x86-64 contains reference to TMPDIR [buildpaths]Signed-off-by Sana Kazi <[email protected]>Signed-off-by Steve Sakoman <[email protected]>--- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 5 +++++ 1 file changed, 5 insertions(+)meta/recipes-devtools/gcc/gcc-cross-canadian.inc +5
-1@@ -118,6 +118,11 @@ do_install () { # We don't care about the gcc-<version> copies rm -f ${D}${bindir}/*gcc-${BINV}* + # Remove buildpaths from pthread.h + sed -i -e "s|${RECIPE_SYSROOT_NATIVE}|/not/exist|g" \ + -e "s|${RECIPE_SYSROOT}|/not/exist|g" \ + ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed/pthread.h + # Cleanup empty directories which are not shipped # we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted # ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686 -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#212863): https://lists.openembedded.org/g/openembedded-core/message/212863
Mute This Topic: https://lists.openembedded.org/mt/111706016/6551054
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Re: [OE-core][scarthgap 4/4] gcc-cross-canadian.inc: Fix buildpaths error for pthread.h
Quoted 22 lines · Ryan Eatmon
I'm seeing build errors in our nightly builds due to this patch. The
pthread.hfile does not exist and the command is erroring out causingdo_installto fail.sed: can't read /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h:
No such file or directory
WARNING:
/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706:182
exit 2 from 'sed -i -e
"s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot-native|/not/exist|g"
-e
"s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot|/not/exist|g" /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h'
WARNING: Backtrace (BB generated script):#1: do_install, /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706, line 182 #2: main,
Quoted 7 lines
/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706, line 301
And line 182 is the sed line.
Should the sed call be wrapped in an if file exists check?
I'll revert this patch since it is causing build failures.
Steve
Quoted 51 lines · Steve Sakoman
Quoted 38 lines
From: Sana Kazi <[email protected]>
Replace the hardcoded path with /not/exist as used for other options[--with-sysroot] to ensure
pthread.hdoes not contain hardocded references to TMPDIR:ERROR: gcc-cross-canadian-x86-64-13.3.0-r0
do_package_qa: QA Issue:
File/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/13.3.0/include-fixed/pthread.hin package gcc-cross-canadian-x86-64 contains reference to TMPDIR [buildpaths]Signed-off-by Sana Kazi <[email protected]>Signed-off-by Steve Sakoman <[email protected]>--- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 5 +++++ 1 file changed, 5 insertions(+)meta/recipes-devtools/gcc/gcc-cross-canadian.inc +5
-1@@ -118,6 +118,11 @@ do_install () { # We don't care about the gcc-<version> copies rm -f ${D}${bindir}/*gcc-${BINV}* + # Remove buildpaths from pthread.h + sed -i -e "s|${RECIPE_SYSROOT_NATIVE}|/not/exist|g" \ + -e "s|${RECIPE_SYSROOT}|/not/exist|g" \ + ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed/pthread.h + # Cleanup empty directories which are not shipped # we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted # ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686 -=-=-=-=-=-=-=-=-=-=-=-Quoted 7 lines
Links: You receive all messages sent to this group.
View/Reply Online (#212863): https://lists.openembedded.org/g/openembedded-core/message/212863
Mute This Topic: https://lists.openembedded.org/mt/111706016/6551054
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=---
Ryan Eatmon [email protected]
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
Re: [OE-core][scarthgap 4/4] gcc-cross-canadian.inc: Fix buildpaths error for pthread.h
I think we should backport:
https://git.openembedded.org/openembedded-core/commit/?h=styhead&id=350ff7d53f7506de2bc01f0efc569b8294b9afea
https://git.openembedded.org/openembedded-core/commit/?h=styhead&id=9221e4ab8cca4c06dc3d5c1de2fd4ce46477578a
to fix this issue in scarthgap, that's what I did locally in gcc-cross-canadian bbappend.
Steve: should I send the backports?
Quoted 91 lines · Steve Sakoman via lists.openembedded.org
Quoted 22 lines · Ryan Eatmon
I'm seeing build errors in our nightly builds due to this patch. The
pthread.hfile does not exist and the command is erroring out causingdo_installto fail.sed: can't read /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h:
No such file or directory
WARNING:
/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706:182
exit 2 from 'sed -i -e
"s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot-native|/not/exist|g"
-e
"s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot|/not/exist|g" /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h'
WARNING: Backtrace (BB generated script):#1: do_install, /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706, line 182 #2: main,Quoted 7 lines
/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706, line 301
And line 182 is the sed line.
Should the sed call be wrapped in an if file exists check?
I'll revert this patch since it is causing build failures.
Steve
Quoted 37 lines · Steve Sakoman
Quoted 36 lines
From: Sana Kazi <[email protected]>
Replace the hardcoded path with /not/exist as used for other options[--with-sysroot] to ensure
pthread.hdoes not contain hardocded references to TMPDIR:ERROR: gcc-cross-canadian-x86-64-13.3.0-r0
do_package_qa: QA Issue:
File/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/13.3.0/include-fixed/pthread.hin package gcc-cross-canadian-x86-64 contains reference to TMPDIR [buildpaths]Signed-off-by Sana Kazi <[email protected]>Signed-off-by Steve Sakoman <[email protected]>--- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 5 +++++ 1 file changed, 5 insertions(+)meta/recipes-devtools/gcc/gcc-cross-canadian.inc +5
-0@@ -118,6 +118,11 @@ do_install () { # We don't care about the gcc-<version> copies rm -f ${D}${bindir}/*gcc-${BINV}* + # Remove buildpaths from pthread.h + sed -i -e "s|${RECIPE_SYSROOT_NATIVE}|/not/exist|g" \ + -e "s|${RECIPE_SYSROOT}|/not/exist|g" \ + ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed/pthread.h + # Cleanup empty directories which are not shipped # we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted # ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686Quoted 8 lines
Quoted 3 lines
--
Ryan Eatmon [email protected]
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#213404): https://lists.openembedded.org/g/openembedded-core/message/213404
Mute This Topic: https://lists.openembedded.org/mt/111706016/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][scarthgap 4/4] gcc-cross-canadian.inc: Fix buildpaths error for pthread.h
Quoted 10 lines · Martin Jansa
I think we should backport:
https://git.openembedded.org/openembedded-core/commit/?h=styhead&id=350ff7d53f7506de2bc01f0efc569b8294b9afea
https://git.openembedded.org/openembedded-core/commit/?h=styhead&id=9221e4ab8cca4c06dc3d5c1de2fd4ce46477578ato fix this issue in scarthgap, that's what I did locally in gcc-cross-canadian bbappend.
Steve: should I send the backports?
Yes, please do!
Steve
Quoted 95 lines
Quoted 91 lines · Steve Sakoman via lists.openembedded.org
Quoted 22 lines · Ryan Eatmon
I'm seeing build errors in our nightly builds due to this patch. The
pthread.hfile does not exist and the command is erroring out causingdo_installto fail.sed: can't read /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h:
No such file or directory
WARNING:
/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706:182
exit 2 from 'sed -i -e
"s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot-native|/not/exist|g"
-e
"s|/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/recipe-sysroot|/not/exist|g" /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/image/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-arago-linux/usr/lib/arm-oe-eabi/gcc/arm-oe-eabi/13.3.0/include-fixed/pthread.h'
WARNING: Backtrace (BB generated script):#1: do_install, /scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706, line 182 #2: main,Quoted 7 lines
/scratch/jenkins_builds/arago-scarthgap-wip/build/build/arago-tmp-default-baremetal-k3r5/work/x86_64-k3r5-nativesdk-arago-linux/gcc-cross-canadian-arm/13.3.0/temp/run.do_install.958706, line 301
And line 182 is the sed line.
Should the sed call be wrapped in an if file exists check?
I'll revert this patch since it is causing build failures.
Steve
Quoted 37 lines · Steve Sakoman
Quoted 36 lines
From: Sana Kazi <[email protected]>
Replace the hardcoded path with /not/exist as used for other options[--with-sysroot] to ensure
pthread.hdoes not contain hardocded references to TMPDIR:ERROR: gcc-cross-canadian-x86-64-13.3.0-r0
do_package_qa: QA Issue:
File/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/13.3.0/include-fixed/pthread.hin package gcc-cross-canadian-x86-64 contains reference to TMPDIR [buildpaths]Signed-off-by Sana Kazi <[email protected]>Signed-off-by Steve Sakoman <[email protected]>--- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 5 +++++ 1 file changed, 5 insertions(+)meta/recipes-devtools/gcc/gcc-cross-canadian.inc +5
-0@@ -118,6 +118,11 @@ do_install () { # We don't care about the gcc-<version> copies rm -f ${D}${bindir}/*gcc-${BINV}* + # Remove buildpaths from pthread.h + sed -i -e "s|${RECIPE_SYSROOT_NATIVE}|/not/exist|g" \ + -e "s|${RECIPE_SYSROOT}|/not/exist|g" \ + ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed/pthread.h + # Cleanup empty directories which are not shipped # we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted # ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686Quoted 8 lines
Quoted 3 lines
--
Ryan Eatmon [email protected]
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#213404): https://lists.openembedded.org/g/openembedded-core/message/213404
Mute This Topic: https://lists.openembedded.org/mt/111706016/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][scarthgap 4/4] gcc-cross-canadian.inc: Fix buildpaths error for pthread.h
Quoted 8 lines · Steve Sakoman
Quoted 6 lines · Martin Jansa
I think we should backport:
https://git.openembedded.org/openembedded-core/commit/?h=styhead&id=350ff7d53f7506de2bc01f0efc569b8294b9afea
https://git.openembedded.org/openembedded-core/commit/?h=styhead&id=9221e4ab8cca4c06dc3d5c1de2fd4ce46477578a
Quoted 6 lines
Quoted 4 lines
to fix this issue in scarthgap, that's what I did locally in gcc-cross-canadian bbappend.
Steve: should I send the backports?
Yes, please do!
Actually the first one was already applied in last scarthgap update, so I've sent the 2nd one.
Cheers,