| Message ID | 20251105023236.310076-1-hongxu.jia@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v4] libxml2: upgrade 2.14.6 -> 2.15.0 | expand |
On Wed Nov 5, 2025 at 3:32 AM CET, Hongxu Jia wrote: > Due to upstream [Remove LZMA support][1], drop option --without-lzma > > Due to upstream [disable python bindings by default][2] and are > planned to be removed in the 2.16 release[3][4]. If we still enable > python bindings by --with-python=yes, due to upstream [doc: Build docs > with Doxygen and xsltproc][5], build python binding requires doxygen > otherwise build will fail, and we do not provide doxygen in oe-core, > so remove python package directly. > > Refresh install-tests.patch and run-ptest to not install python test > cases > > Drop CVE-2025-6021.patch which is obsolete > > [1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/1763281cd65ded4067ddf123eb7358690c214b0b > [2] https://gitlab.gnome.org/GNOME/libxml2/-/commit/fa931566d2f541d3162c7b98c8a12e6b2a6ae542 > [3] https://download.gnome.org/sources/libxml2/2.15/libxml2-2.15.0.news > [4] https://gitlab.gnome.org/GNOME/libxml2/-/issues/891 > [5] https://gitlab.gnome.org/GNOME/libxml2/-/commit/bbe5827c94cc9b0e393ff3e6eef6dec2376317e2 > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- Hi Hongxu, Thanks for the new version. It's not clear to me how, but it looks like this update is breaking rust build: ERROR: rust-1.90.0-r0 do_test_compile: Execution of '/srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/work/cortexa57-poky-linux/rust/1.90.0/temp/run.do_test_compile.3947248' failed with exit code 1 ... alues("optimized-c"))' --check-cfg 'cfg(__aarch64_swp8_rel, values("optimized-c"))' --check-cfg 'cfg(__aarch64_swp8_acq_rel, values("optimized-c"))' --check-cfg 'cfg(target_feature, values("vis3"))' --check-cfg 'cfg(feature, values("checked"))' --check-cfg 'cfg(assert_no_panic)' --check-cfg 'cfg(thumb)' --check-cfg 'cfg(thumb_1)' --check-cfg 'cfg(f16_enabled)' --check-cfg 'cfg(f128_enabled)' --check-cfg 'cfg(intrinsics_enabled)' --check-cfg 'cfg(arch_enabled)' --check-cfg 'cfg(optimizations_enabled)' --check-cfg 'cfg(feature, values("unstable-public-internals"))' --check-cfg 'cfg(optimizations_enabled)' --check-cfg 'cfg(x86_no_sse)' --check-cfg 'cfg(kernel_user_helpers)' --check-cfg 'cfg(feature, values("mem-unaligned"))'` | error: rustc interrupted by SIGSEGV, printing backtrace | | /srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/work/cortexa57-poky-linux/rust/1.90.0/sources/rustc-1.90.0-src/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-d18035d17505fd2b.so(+0xd2ab55) [0x7f3ae2d2ab55] | /srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/sysroots-uninative/x86_64-linux/lib/libc.so.6(+0x3bba0) [0x7f3ae1e4aba0] | /srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/work/cortexa57-poky-linux/rust/1.90.0/sources/rustc-1.90.0-src/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-d18035d17505fd2b.so(+0x8527820) [0x7f3aea527820] | | note: we would appreciate a report at https://github.com/rust-lang/rust | help: you can increase rustc's stack size by setting RUST_MIN_STACK=16777216 | rustc exited with signal: 11 (SIGSEGV) https://autobuilder.yoctoproject.org/valkyrie/#/builders/5/builds/2610 https://autobuilder.yoctoproject.org/valkyrie/#/builders/58/builds/672 https://autobuilder.yoctoproject.org/valkyrie/#/builders/42/builds/2613 Can you have a look at these? Thanks, Mathieu
On 11/7/25 15:26, Mathieu Dubois-Briand wrote: > CAUTION: This email comes from a non Wind River email account! > Do not click links or open attachments unless you recognize the sender and know the content is safe. > > On Wed Nov 5, 2025 at 3:32 AM CET, Hongxu Jia wrote: >> Due to upstream [Remove LZMA support][1], drop option --without-lzma >> >> Due to upstream [disable python bindings by default][2] and are >> planned to be removed in the 2.16 release[3][4]. If we still enable >> python bindings by --with-python=yes, due to upstream [doc: Build docs >> with Doxygen and xsltproc][5], build python binding requires doxygen >> otherwise build will fail, and we do not provide doxygen in oe-core, >> so remove python package directly. >> >> Refresh install-tests.patch and run-ptest to not install python test >> cases >> >> Drop CVE-2025-6021.patch which is obsolete >> >> [1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/1763281cd65ded4067ddf123eb7358690c214b0b >> [2] https://gitlab.gnome.org/GNOME/libxml2/-/commit/fa931566d2f541d3162c7b98c8a12e6b2a6ae542 >> [3] https://download.gnome.org/sources/libxml2/2.15/libxml2-2.15.0.news >> [4] https://gitlab.gnome.org/GNOME/libxml2/-/issues/891 >> [5] https://gitlab.gnome.org/GNOME/libxml2/-/commit/bbe5827c94cc9b0e393ff3e6eef6dec2376317e2 >> >> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> >> --- > Hi Hongxu, > > Thanks for the new version. > > It's not clear to me how, but it looks like this update is breaking rust > build: > > ERROR: rust-1.90.0-r0 do_test_compile: Execution of '/srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/work/cortexa57-poky-linux/rust/1.90.0/temp/run.do_test_compile.3947248' failed with exit code 1 > ... > > alues("optimized-c"))' --check-cfg 'cfg(__aarch64_swp8_rel, values("optimized-c"))' --check-cfg 'cfg(__aarch64_swp8_acq_rel, values("optimized-c"))' --check-cfg 'cfg(target_feature, values("vis3"))' --check-cfg 'cfg(feature, values("checked"))' --check-cfg 'cfg(assert_no_panic)' --check-cfg 'cfg(thumb)' --check-cfg 'cfg(thumb_1)' --check-cfg 'cfg(f16_enabled)' --check-cfg 'cfg(f128_enabled)' --check-cfg 'cfg(intrinsics_enabled)' --check-cfg 'cfg(arch_enabled)' --check-cfg 'cfg(optimizations_enabled)' --check-cfg 'cfg(feature, values("unstable-public-internals"))' --check-cfg 'cfg(optimizations_enabled)' --check-cfg 'cfg(x86_no_sse)' --check-cfg 'cfg(kernel_user_helpers)' --check-cfg 'cfg(feature, values("mem-unaligned"))'` > | error: rustc interrupted by SIGSEGV, printing backtrace > | > | /srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/work/cortexa57-poky-linux/rust/1.90.0/sources/rustc-1.90.0-src/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-d18035d17505fd2b.so(+0xd2ab55) [0x7f3ae2d2ab55] > | /srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/sysroots-uninative/x86_64-linux/lib/libc.so.6(+0x3bba0) [0x7f3ae1e4aba0] > | /srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/work/cortexa57-poky-linux/rust/1.90.0/sources/rustc-1.90.0-src/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-d18035d17505fd2b.so(+0x8527820) [0x7f3aea527820] > | > | note: we would appreciate a report at https://github.com/rust-lang/rust > | help: you can increase rustc's stack size by setting RUST_MIN_STACK=16777216 > | rustc exited with signal: 11 (SIGSEGV) > > https://autobuilder.yoctoproject.org/valkyrie/#/builders/5/builds/2610 > https://autobuilder.yoctoproject.org/valkyrie/#/builders/58/builds/672 > https://autobuilder.yoctoproject.org/valkyrie/#/builders/42/builds/2613 > > Can you have a look at these? Seems no direct relationship with libxml2, but I will still have a look and try to reproduce the rust build failure //Hongxu > Thanks, > Mathieu > > -- > Mathieu Dubois-Briand, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com >
On Fri Nov 7, 2025 at 9:27 AM CET, Hongxu Jia wrote: > On 11/7/25 15:26, Mathieu Dubois-Briand wrote: >> CAUTION: This email comes from a non Wind River email account! >> Do not click links or open attachments unless you recognize the sender and know the content is safe. >> >> On Wed Nov 5, 2025 at 3:32 AM CET, Hongxu Jia wrote: >>> Due to upstream [Remove LZMA support][1], drop option --without-lzma >>> >>> Due to upstream [disable python bindings by default][2] and are >>> planned to be removed in the 2.16 release[3][4]. If we still enable >>> python bindings by --with-python=yes, due to upstream [doc: Build docs >>> with Doxygen and xsltproc][5], build python binding requires doxygen >>> otherwise build will fail, and we do not provide doxygen in oe-core, >>> so remove python package directly. >>> >>> Refresh install-tests.patch and run-ptest to not install python test >>> cases >>> >>> Drop CVE-2025-6021.patch which is obsolete >>> >>> [1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/1763281cd65ded4067ddf123eb7358690c214b0b >>> [2] https://gitlab.gnome.org/GNOME/libxml2/-/commit/fa931566d2f541d3162c7b98c8a12e6b2a6ae542 >>> [3] https://download.gnome.org/sources/libxml2/2.15/libxml2-2.15.0.news >>> [4] https://gitlab.gnome.org/GNOME/libxml2/-/issues/891 >>> [5] https://gitlab.gnome.org/GNOME/libxml2/-/commit/bbe5827c94cc9b0e393ff3e6eef6dec2376317e2 >>> >>> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> >>> --- >> Hi Hongxu, >> >> Thanks for the new version. >> >> It's not clear to me how, but it looks like this update is breaking rust >> build: >> >> ERROR: rust-1.90.0-r0 do_test_compile: Execution of '/srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/work/cortexa57-poky-linux/rust/1.90.0/temp/run.do_test_compile.3947248' failed with exit code 1 >> ... >> >> alues("optimized-c"))' --check-cfg 'cfg(__aarch64_swp8_rel, values("optimized-c"))' --check-cfg 'cfg(__aarch64_swp8_acq_rel, values("optimized-c"))' --check-cfg 'cfg(target_feature, values("vis3"))' --check-cfg 'cfg(feature, values("checked"))' --check-cfg 'cfg(assert_no_panic)' --check-cfg 'cfg(thumb)' --check-cfg 'cfg(thumb_1)' --check-cfg 'cfg(f16_enabled)' --check-cfg 'cfg(f128_enabled)' --check-cfg 'cfg(intrinsics_enabled)' --check-cfg 'cfg(arch_enabled)' --check-cfg 'cfg(optimizations_enabled)' --check-cfg 'cfg(feature, values("unstable-public-internals"))' --check-cfg 'cfg(optimizations_enabled)' --check-cfg 'cfg(x86_no_sse)' --check-cfg 'cfg(kernel_user_helpers)' --check-cfg 'cfg(feature, values("mem-unaligned"))'` >> | error: rustc interrupted by SIGSEGV, printing backtrace >> | >> | /srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/work/cortexa57-poky-linux/rust/1.90.0/sources/rustc-1.90.0-src/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-d18035d17505fd2b.so(+0xd2ab55) [0x7f3ae2d2ab55] >> | /srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/sysroots-uninative/x86_64-linux/lib/libc.so.6(+0x3bba0) [0x7f3ae1e4aba0] >> | /srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/work/cortexa57-poky-linux/rust/1.90.0/sources/rustc-1.90.0-src/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-d18035d17505fd2b.so(+0x8527820) [0x7f3aea527820] >> | >> | note: we would appreciate a report at https://github.com/rust-lang/rust >> | help: you can increase rustc's stack size by setting RUST_MIN_STACK=16777216 >> | rustc exited with signal: 11 (SIGSEGV) >> >> https://autobuilder.yoctoproject.org/valkyrie/#/builders/5/builds/2610 >> https://autobuilder.yoctoproject.org/valkyrie/#/builders/58/builds/672 >> https://autobuilder.yoctoproject.org/valkyrie/#/builders/42/builds/2613 >> >> Can you have a look at these? > > Seems no direct relationship with libxml2, but I will still have a look > and try to reproduce the rust build failure > > //Hongxu I tried to pick again your patches, and I'm not seeing the same issue this time. Some tests are still pending, but I'm highly confident they will succeed. In addition, the same error also appeared while testing other patches, completely unrelated with your. So it's more likely that we have some bad intermittent issue with rust. Thanks for your time, Mathieu
On 11/9/25 03:41, Mathieu Dubois-Briand wrote: > CAUTION: This email comes from a non Wind River email account! > Do not click links or open attachments unless you recognize the sender and know the content is safe. > > On Fri Nov 7, 2025 at 9:27 AM CET, Hongxu Jia wrote: >> On 11/7/25 15:26, Mathieu Dubois-Briand wrote: >>> CAUTION: This email comes from a non Wind River email account! >>> Do not click links or open attachments unless you recognize the sender and know the content is safe. >>> >>> On Wed Nov 5, 2025 at 3:32 AM CET, Hongxu Jia wrote: >>>> Due to upstream [Remove LZMA support][1], drop option --without-lzma >>>> >>>> Due to upstream [disable python bindings by default][2] and are >>>> planned to be removed in the 2.16 release[3][4]. If we still enable >>>> python bindings by --with-python=yes, due to upstream [doc: Build docs >>>> with Doxygen and xsltproc][5], build python binding requires doxygen >>>> otherwise build will fail, and we do not provide doxygen in oe-core, >>>> so remove python package directly. >>>> >>>> Refresh install-tests.patch and run-ptest to not install python test >>>> cases >>>> >>>> Drop CVE-2025-6021.patch which is obsolete >>>> >>>> [1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/1763281cd65ded4067ddf123eb7358690c214b0b >>>> [2] https://gitlab.gnome.org/GNOME/libxml2/-/commit/fa931566d2f541d3162c7b98c8a12e6b2a6ae542 >>>> [3] https://download.gnome.org/sources/libxml2/2.15/libxml2-2.15.0.news >>>> [4] https://gitlab.gnome.org/GNOME/libxml2/-/issues/891 >>>> [5] https://gitlab.gnome.org/GNOME/libxml2/-/commit/bbe5827c94cc9b0e393ff3e6eef6dec2376317e2 >>>> >>>> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> >>>> --- >>> Hi Hongxu, >>> >>> Thanks for the new version. >>> >>> It's not clear to me how, but it looks like this update is breaking rust >>> build: >>> >>> ERROR: rust-1.90.0-r0 do_test_compile: Execution of '/srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/work/cortexa57-poky-linux/rust/1.90.0/temp/run.do_test_compile.3947248' failed with exit code 1 >>> ... >>> >>> alues("optimized-c"))' --check-cfg 'cfg(__aarch64_swp8_rel, values("optimized-c"))' --check-cfg 'cfg(__aarch64_swp8_acq_rel, values("optimized-c"))' --check-cfg 'cfg(target_feature, values("vis3"))' --check-cfg 'cfg(feature, values("checked"))' --check-cfg 'cfg(assert_no_panic)' --check-cfg 'cfg(thumb)' --check-cfg 'cfg(thumb_1)' --check-cfg 'cfg(f16_enabled)' --check-cfg 'cfg(f128_enabled)' --check-cfg 'cfg(intrinsics_enabled)' --check-cfg 'cfg(arch_enabled)' --check-cfg 'cfg(optimizations_enabled)' --check-cfg 'cfg(feature, values("unstable-public-internals"))' --check-cfg 'cfg(optimizations_enabled)' --check-cfg 'cfg(x86_no_sse)' --check-cfg 'cfg(kernel_user_helpers)' --check-cfg 'cfg(feature, values("mem-unaligned"))'` >>> | error: rustc interrupted by SIGSEGV, printing backtrace >>> | >>> | /srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/work/cortexa57-poky-linux/rust/1.90.0/sources/rustc-1.90.0-src/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-d18035d17505fd2b.so(+0xd2ab55) [0x7f3ae2d2ab55] >>> | /srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/sysroots-uninative/x86_64-linux/lib/libc.so.6(+0x3bba0) [0x7f3ae1e4aba0] >>> | /srv/pokybuild/yocto-worker/qemuarm64-tc/build/build-st-3876356/tmp/work/cortexa57-poky-linux/rust/1.90.0/sources/rustc-1.90.0-src/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-d18035d17505fd2b.so(+0x8527820) [0x7f3aea527820] >>> | >>> | note: we would appreciate a report at https://github.com/rust-lang/rust >>> | help: you can increase rustc's stack size by setting RUST_MIN_STACK=16777216 >>> | rustc exited with signal: 11 (SIGSEGV) >>> >>> https://autobuilder.yoctoproject.org/valkyrie/#/builders/5/builds/2610 >>> https://autobuilder.yoctoproject.org/valkyrie/#/builders/58/builds/672 >>> https://autobuilder.yoctoproject.org/valkyrie/#/builders/42/builds/2613 >>> >>> Can you have a look at these? >> Seems no direct relationship with libxml2, but I will still have a look >> and try to reproduce the rust build failure >> >> //Hongxu > I tried to pick again your patches, and I'm not seeing the same issue > this time. Some tests are still pending, but I'm highly confident they > will succeed. > > In addition, the same error also appeared while testing other patches, > completely unrelated with your. So it's more likely that we have some > bad intermittent issue with rust. Got, I will try to fix the issue //Hongxu > Thanks for your time, > Mathieu > > -- > Mathieu Dubois-Briand, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com >
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2025-6021.patch b/meta/recipes-core/libxml/libxml2/CVE-2025-6021.patch deleted file mode 100644 index 0b73bceb24..0000000000 --- a/meta/recipes-core/libxml/libxml2/CVE-2025-6021.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e546e423d69ec9b3c71167d3c3140fa1b9af93c7 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer <wellnhofer@aevum.de> -Date: Tue, 27 May 2025 12:53:17 +0200 -Subject: [PATCH] tree: Fix integer overflow in xmlBuildQName - -This issue affects memory safety and might receive a CVE ID later. - -Fixes #926. - -Signed-off-by: Nick Wellnhofer <wellnhofer@aevum.de> - -Add '#include <stdint.h>' to assure the definition of SIZE_MAX -CVE: CVE-2025-6021 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/acbbeef9f5dcdcc901c5f3fa14d583ef8cfd22f0] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - tree.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tree.c b/tree.c -index e14bc62..22ec11c 100644 ---- a/tree.c -+++ b/tree.c -@@ -23,6 +23,7 @@ - #include <limits.h> - #include <ctype.h> - #include <stdlib.h> -+#include <stdint.h> - - #ifdef LIBXML_ZLIB_ENABLED - #include <zlib.h> diff --git a/meta/recipes-core/libxml/libxml2/install-tests.patch b/meta/recipes-core/libxml/libxml2/install-tests.patch index 4c1faa83cb..9269536af0 100644 --- a/meta/recipes-core/libxml/libxml2/install-tests.patch +++ b/meta/recipes-core/libxml/libxml2/install-tests.patch @@ -1,34 +1,38 @@ -From 7e99fef6eae0642a3f1e511e4d24abf7d6d28f50 Mon Sep 17 00:00:00 2001 +From 3381232bab7217b9cb47e7cc765c8380192069b0 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@arm.com> -Date: Mon, 5 Dec 2022 17:02:32 +0000 +Date: Fri, 17 Oct 2025 14:15:36 +0800 Subject: [PATCH] add yocto-specific install-ptest target Add a target to install the test suite. Upstream-Status: Inappropriate Signed-off-by: Ross Burton <ross.burton@arm.com> + +Do not install python test cases +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - Makefile.am | 10 ++++++++++ - 1 file changed, 10 insertions(+) + Makefile.am | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/Makefile.am b/Makefile.am -index 6f98144..ecb3b54 100644 +index 19ec305..64bf28a 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -26,6 +26,16 @@ check_PROGRAMS = \ +@@ -29,6 +29,14 @@ check_PROGRAMS = \ testparser \ testrecurse +ptestdir=$(libexecdir) +install-test-data: $(check_PROGRAMS) -+ install -d $(DESTDIR)$(ptestdir) $(DESTDIR)$(ptestdir)/python/ + for T in $(check_PROGRAMS); do \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$T $(DESTDIR)$(ptestdir) ;\ + done + cp -r $(srcdir)/test $(DESTDIR)$(ptestdir) + cp -r $(srcdir)/result $(DESTDIR)$(ptestdir) -+ cp -r $(srcdir)/python/tests $(DESTDIR)$(ptestdir)/python + bin_PROGRAMS = xmllint bin_SCRIPTS = xml2-config +-- +2.34.1 + diff --git a/meta/recipes-core/libxml/libxml2/run-ptest b/meta/recipes-core/libxml/libxml2/run-ptest index cbbdd5592f..868649240b 100755 --- a/meta/recipes-core/libxml/libxml2/run-ptest +++ b/meta/recipes-core/libxml/libxml2/run-ptest @@ -11,10 +11,3 @@ for T in $TESTS; do echo Running $T ./$T && echo PASS: $T || echo FAIL: $T done - -if test -d python/tests; then - cd python/tests - for T in *.py; do - python3 ./$T && echo PASS: $T || echo FAIL: $T - done -fi diff --git a/meta/recipes-core/libxml/libxml2_2.14.6.bb b/meta/recipes-core/libxml/libxml2_2.15.0.bb similarity index 77% rename from meta/recipes-core/libxml/libxml2_2.14.6.bb rename to meta/recipes-core/libxml/libxml2_2.15.0.bb index 6ed8760f4c..b1fbc32bfa 100644 --- a/meta/recipes-core/libxml/libxml2_2.14.6.bb +++ b/meta/recipes-core/libxml/libxml2_2.15.0.bb @@ -18,29 +18,20 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt file://run-ptest \ file://install-tests.patch \ file://0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch \ - file://CVE-2025-6021.patch \ " -SRC_URI[archive.sha256sum] = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a" +SRC_URI[archive.sha256sum] = "5abc766497c5b1d6d99231f662e30c99402a90d03b06c67b62d6c1179dedd561" SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" CVE_STATUS[CVE-2025-6170] = "fixed-version: fixed in version 2.14.5" BINCONFIG = "${bindir}/xml2-config" -PACKAGECONFIG ??= "python" -PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3" - inherit autotools pkgconfig binconfig-disabled ptest -inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3targetconfig', '', d)} - LDFLAGS:append:riscv64 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', ' -fuse-ld=bfd', '', d)}" -RDEPENDS:${PN}-ptest += "bash make locale-base-en-us ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" - -RDEPENDS:${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" - +RDEPENDS:${PN}-ptest += "bash make locale-base-en-us" RDEPENDS:${PN}-ptest:append:libc-musl = " musl-locales" RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-ebcdic-us \ glibc-gconv-ibm1141 \ @@ -49,10 +40,10 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-ebcdic-us \ " # WARNING: zlib is required for RPM use -EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --with-c14n --without-lzma" -EXTRA_OECONF:class-native = "--without-legacy --with-c14n --without-lzma --with-zlib" -EXTRA_OECONF:class-nativesdk = "--without-legacy --with-c14n --without-lzma --with-zlib" -EXTRA_OECONF:linuxstdbase = "--with-debug --with-legacy --with-c14n --without-lzma --with-zlib" +EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --with-c14n" +EXTRA_OECONF:class-native = "--without-legacy --with-c14n --with-zlib" +EXTRA_OECONF:class-nativesdk = "--without-legacy --with-c14n --with-zlib" +EXTRA_OECONF:linuxstdbase = "--with-debug --with-legacy --with-c14n --with-zlib" python populate_packages:prepend () { # autonamer would call this libxml2-2, but we don't want that @@ -61,11 +52,9 @@ python populate_packages:prepend () { } PACKAGE_BEFORE_PN += "${PN}-utils" -PACKAGES += "${PN}-python" FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" FILES:${PN}-utils = "${bindir}/*" -FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" do_configure:prepend () { # executables take longer to package: these should not be executable @@ -76,10 +65,6 @@ do_install_ptest () { oe_runmake DESTDIR=${D} ptestdir=${PTEST_PATH} install-test-data cp -r ${S}/xmlconf ${D}${PTEST_PATH} - - if ! ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then - rm -rf ${D}${PTEST_DIR}/python - fi } # with musl we need to enable icu support explicitly for these tests
Due to upstream [Remove LZMA support][1], drop option --without-lzma Due to upstream [disable python bindings by default][2] and are planned to be removed in the 2.16 release[3][4]. If we still enable python bindings by --with-python=yes, due to upstream [doc: Build docs with Doxygen and xsltproc][5], build python binding requires doxygen otherwise build will fail, and we do not provide doxygen in oe-core, so remove python package directly. Refresh install-tests.patch and run-ptest to not install python test cases Drop CVE-2025-6021.patch which is obsolete [1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/1763281cd65ded4067ddf123eb7358690c214b0b [2] https://gitlab.gnome.org/GNOME/libxml2/-/commit/fa931566d2f541d3162c7b98c8a12e6b2a6ae542 [3] https://download.gnome.org/sources/libxml2/2.15/libxml2-2.15.0.news [4] https://gitlab.gnome.org/GNOME/libxml2/-/issues/891 [5] https://gitlab.gnome.org/GNOME/libxml2/-/commit/bbe5827c94cc9b0e393ff3e6eef6dec2376317e2 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- .../libxml/libxml2/CVE-2025-6021.patch | 31 ------------------- .../libxml/libxml2/install-tests.patch | 20 +++++++----- meta/recipes-core/libxml/libxml2/run-ptest | 7 ----- .../{libxml2_2.14.6.bb => libxml2_2.15.0.bb} | 27 ++++------------ 4 files changed, 18 insertions(+), 67 deletions(-) delete mode 100644 meta/recipes-core/libxml/libxml2/CVE-2025-6021.patch rename meta/recipes-core/libxml/{libxml2_2.14.6.bb => libxml2_2.15.0.bb} (77%)