Patch review
cover Patch review
Please review this set of changes for scarthgap and have comments back by end of day Tuesday, March 25
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/1237
The following changes since commit 1be6d83466e3a0da4222ba502c2a86c25c835a35:
Revert "gcc-cross-canadian.inc: Fix buildpaths error for pthread.h" (2025-03-20 07:31:40 -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
Denys Dmytriyenko (2):
gcc: unify cleanup of include-fixed, apply to cross-canadian
nativesdk-libtool: sanitize the script, remove buildpaths
Makarios Christakis (1):
icu: Adjust ICU_DATA_DIR path on big endian targets
Peter Marko (1):
xserver-xorg: mark CVEs fixed in 21.1.16 as fixed
Vijay Anusuri (1):
libxslt: upgrade 1.1.39 -> 1.1.43
meta/recipes-devtools/gcc/gcc-common.inc | 4 +++
.../gcc/gcc-cross-canadian.inc | 2 ++
meta/recipes-devtools/gcc/gcc-cross.inc | 2 +-
meta/recipes-devtools/gcc/gcc-target.inc | 31 +------------------
.../recipes-devtools/libtool/libtool_2.4.7.bb | 15 +--------
.../libtool/nativesdk-libtool_2.4.7.bb | 1 +
.../libtool/remove-buildpaths.inc | 13 ++++++++
.../xorg-xserver/xserver-xorg.inc | 4 +++
meta/recipes-support/icu/icu_74-2.bb | 2 +-
.../{libxslt_1.1.39.bb => libxslt_1.1.43.bb} | 4 +--
10 files changed, 30 insertions(+), 48 deletions(-)
create mode 100644 meta/recipes-devtools/libtool/remove-buildpaths.inc
rename meta/recipes-support/libxslt/{libxslt_1.1.39.bb => libxslt_1.1.43.bb} (91%)Signature · 1 line
2.43.0
PATCH 1/5 xserver-xorg: mark CVEs fixed in 21.1.16 as fixed
From: Peter Marko <[email protected]>
These are tracked as versionless redhat CVEs in NVD DB.
--- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +4 -0
@@ -177,3 +177,7 @@ python populate_packages:prepend() { } CVE_STATUS[CVE-2023-5574] = "${@bb.utils.contains('PACKAGECONFIG', 'xvfb', 'unpatched', 'not-applicable-config: specific to Xvfb', d)}" + +CVE_STATUS_GROUPS = "CVE_STATUS_REDHAT" +CVE_STATUS_REDHAT = "CVE-2025-26594 CVE-2025-26595 CVE-2025-26596 CVE-2025-26597 CVE-2025-26598 CVE-2025-26599 CVE-2025-26600 CVE-2025-26601" +CVE_STATUS_REDHAT[status] = "fixed-version: these are tracked as versionless redhat CVEs in NVD DB, fixed in 21.1.16"
Signature · 1 line
2.43.0
PATCH 2/5 libxslt: upgrade 1.1.39 -> 1.1.43
In reply to Steve SakomanFrom: Vijay Anusuri <[email protected]>
Include fixes for CVE-2024-24855 and CVE-2024-55549
Release Notes:
https://gitlab.gnome.org/GNOME/libxslt/-/releases/v1.1.43
Remove mem-debug option [1]
[1] https://gitlab.gnome.org/GNOME/libxslt/-/commit/c65a7c05f98ea4e9fae1247510b45db9dd3ec907
---
.../libxslt/{libxslt_1.1.39.bb => libxslt_1.1.43.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/libxslt/{libxslt_1.1.39.bb => libxslt_1.1.43.bb} (91%)meta/recipes-support/libxslt/libxslt_1.1.43.bb renamed from meta/recipes-support/libxslt/libxslt_1.1.39.bb +2 -2
@@ -15,7 +15,7 @@ DEPENDS = "libxml2" SRC_URI = "https://download.gnome.org/sources/libxslt/1.1/libxslt-${PV}.tar.xz" -SRC_URI[sha256sum] = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0" +SRC_URI[sha256sum] = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a" UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar"
@@ -37,7 +37,7 @@ do_configure:prepend () { touch ${S}/doc/xsltproc.1 } -EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" +EXTRA_OECONF = "--without-python --without-debug --without-crypto" # older versions of this recipe had ${PN}-utils RPROVIDES:${PN}-bin += "${PN}-utils" RCONFLICTS:${PN}-bin += "${PN}-utils"
Signature · 1 line
2.43.0
PATCH 3/5 icu: Adjust ICU_DATA_DIR path on big endian targets
In reply to Steve SakomanFrom: Makarios Christakis <[email protected]>
On big-endian systems the preprocessor define ICU_DATA_DIR is currently being set to a path ending with the ${PV} of the recipe.
The PV version string has changed to a '-' separator since oe-core commit cebe8439cdc656d53355506a31a3782312bf03c5 whereas the build system installs the data files into a path ending with the dot-separated version of ICU.
This causes the ICU data file to not be detected at runtime, consequently breaking any dependant applications.
We therefore substitute ${PV} with the dot-separated version string of ICU, as returned from the icu_install_folder function, on the ICU_DATA_DIR define on big-endian targets.
--- meta/recipes-support/icu/icu_74-2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/icu/icu_74-2.bb +1 -1
@@ -26,7 +26,7 @@ EXTRA_OECONF:class-native = "--disable-icu-config" EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config" EXTRA_OECONF:append:class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" +TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${@icu_install_folder(d)}\\""', '', d)}" ASNEEDED = ""
Signature · 1 line
2.43.0
PATCH 4/5 gcc: unify cleanup of include-fixed, apply to cross-canadian
In reply to Steve SakomanFrom: Denys Dmytriyenko <[email protected]>
Since target and cross variants were already doing similar cleanup of include-fixed headers, as those aren't used, unify the code and also apply the same to cross-canadian variant.
Some of those header files get processed with a tool that leaves absolute buildpaths inside the file's commented section, causing QA errors. Since those aren't used, let's remove them.
This may be a temporary solution until the tool itself gets fixed to not embed absolute buildpaths in the header files:
https://lists.openembedded.org/g/openembedded-core/topic/107268307
--- meta/recipes-devtools/gcc/gcc-common.inc | 4 +++ .../gcc/gcc-cross-canadian.inc | 2 ++ meta/recipes-devtools/gcc/gcc-cross.inc | 2 +- meta/recipes-devtools/gcc/gcc-target.inc | 31 +------------------ 4 files changed, 8 insertions(+), 31 deletions(-)
meta/recipes-devtools/gcc/gcc-common.inc +4 -0
@@ -138,3 +138,7 @@ remove_sysroot_paths_from_checksum_options () { sed -i "s@${DEBUG_PREFIX_MAP}@@g" ${B}/gcc/checksum-options sed -i "s@$stagingdir@$replacement@g" ${B}/gcc/checksum-options } + +cleanup_installed_include_fixed () { + find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f +}
meta/recipes-devtools/gcc/gcc-cross-canadian.inc +2 -0
@@ -174,6 +174,8 @@ do_install () { done done done + + cleanup_installed_include_fixed } ELFUTILS = "nativesdk-elfutils"
meta/recipes-devtools/gcc/gcc-cross.inc +1 -1
@@ -108,7 +108,7 @@ do_install () { cp ${S}/libquadmath/quadmath.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ cp ${S}/libquadmath/quadmath_weak.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ - find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f + cleanup_installed_include_fixed # install LTO linker plugins where binutils tools can find it install -d ${D}${libdir}/bfd-plugins
meta/recipes-devtools/gcc/gcc-target.inc +1 -30
@@ -206,37 +206,8 @@ do_install () { install -d ${D}${libdir}/bfd-plugins ln -sf ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto_plugin.so ${D}${libdir}/bfd-plugins/liblto_plugin.so chown -R root:root ${D} -} -do_install:append () { - # - # Thefixinc.sh script, run on the gcc's compile phase, looks into sysroot header - # files and places the modified files into - # {D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed folder. This makes the - # build not deterministic. The following code prunes all those headers - # except those under include-fixed/linux, *limits.h and README, yielding - # the same include-fixed folders no matter what sysroot - - include_fixed="${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed" - for f in $(find ${include_fixed} -type f); do - case $f in - */include-fixed/linux/*) - continue - ;; - */include-fixed/*limits.h) - continue - ;; - */include-fixed/README) - continue - ;; - *) - # remove file and directory if empty - bbdebug 2 "Pruning $f" - rm $f - find $(dirname $f) -maxdepth 0 -empty -exec rmdir {} \; - ;; - esac - done + cleanup_installed_include_fixed } # Installing /usr/lib/gcc/* means we'd have two copies, one from gcc-cross
Signature · 1 line
2.43.0
PATCH 5/5 nativesdk-libtool: sanitize the script, remove buildpaths
In reply to Steve SakomanFrom: Denys Dmytriyenko <[email protected]>
Use the same sed command to sanitize libtool script for target recipe and nativesdk one. Otherwise fails with buildpaths QA error:
ERROR: nativesdk-libtool-2.5.0-r0 do_package_qa: QA Issue: File /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/bin/libtool in package nativesdk-libtool contains reference to TMPDIR [buildpaths]
(From OE-Core rev: f08df9adf290fb6cbebff24df6bbbbe8e5ce95e0)
Upstream-Status: Backport[https://git.yoctoproject.org/poky/commit/?id=89e184da6c9d95a99fd34334df5ac6c5ae87f13a]
--- meta/recipes-devtools/libtool/libtool_2.4.7.bb | 15 +-------------- .../libtool/nativesdk-libtool_2.4.7.bb | 1 + .../libtool/remove-buildpaths.inc | 13 +++++++++++++ 3 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 meta/recipes-devtools/libtool/remove-buildpaths.inc
meta/recipes-devtools/libtool/libtool_2.4.7.bb +1 -14
@@ -1,4 +1,5 @@ require libtool-${PV}.inc +require remove-buildpaths.inc SRC_URI += "file://multilib.patch"
@@ -15,20 +16,6 @@ SYSROOT_DIRS_IGNORE += " \ ACLOCALEXTRAPATH:class-target = "" -do_install:append () { - sed -e 's@--sysroot=${STAGING_DIR_HOST}@@g' \ - -e "s@${DEBUG_PREFIX_MAP}@@g" \ - -e 's@${STAGING_DIR_HOST}@@g' \ - -e 's@${STAGING_DIR_NATIVE}@@g' \ - -e 's@^\(sys_lib_search_path_spec="\).*@\1${libdir} ${base_libdir}"@' \ - -e 's@^\(compiler_lib_search_dirs="\).*@\1${libdir} ${base_libdir}"@' \ - -e 's@^\(compiler_lib_search_path="\).*@\1${libdir} ${base_libdir}"@' \ - -e 's@^\(predep_objects="\).*@\1"@' \ - -e 's@^\(postdep_objects="\).*@\1"@' \ - -e "s@${HOSTTOOLS_DIR}/@@g" \ - -i ${D}${bindir}/libtool -} - inherit multilib_script MULTILIB_SCRIPTS = "${PN}:${bindir}/libtool"
meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb +1 -0
@@ -1,4 +1,5 @@ require libtool-${PV}.inc +require remove-buildpaths.inc FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:"
meta/recipes-devtools/libtool/remove-buildpaths.inc new file +13 -0
@@ -0,0 +1,13 @@ +do_install:append () { + sed -e 's@--sysroot=${STAGING_DIR_HOST}@@g' \ + -e "s@${DEBUG_PREFIX_MAP}@@g" \ + -e 's@${STAGING_DIR_HOST}@@g' \ + -e 's@${STAGING_DIR_NATIVE}@@g' \ + -e 's@^\(sys_lib_search_path_spec="\).*@\1${libdir} ${base_libdir}"@' \ + -e 's@^\(compiler_lib_search_dirs="\).*@\1${libdir} ${base_libdir}"@' \ + -e 's@^\(compiler_lib_search_path="\).*@\1${libdir} ${base_libdir}"@' \ + -e 's@^\(predep_objects="\).*@\1"@' \ + -e 's@^\(postdep_objects="\).*@\1"@' \ + -e "s@${HOSTTOOLS_DIR}/@@g" \ + -i ${D}${bindir}/libtool +}
Signature · 1 line
2.43.0