summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2025-10-17 15:19:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-11-07 13:15:35 +0000
commitbbfa94828b3487523cd6dc8e3baea2e7f0fef99d (patch)
tree3c5ed80d5cf4e61819f64baa44de110dbfecc77c
parent0176acd45298fb4d18ff82d4da96ccf50880ee45 (diff)
downloadpoky-bbfa94828b3487523cd6dc8e3baea2e7f0fef99d.tar.gz
libxml2: upgrade 2.14.6 -> 2.15.0
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 [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 (From OE-Core rev: ee398b7c1d54caff2fda24efd913afac19065f3d) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/libxml/libxml2/install-tests.patch20
-rwxr-xr-xmeta/recipes-core/libxml/libxml2/run-ptest7
-rw-r--r--meta/recipes-core/libxml/libxml2_2.15.0.bb (renamed from meta/recipes-core/libxml/libxml2_2.14.6.bb)26
3 files changed, 18 insertions, 35 deletions
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 @@
1From 7e99fef6eae0642a3f1e511e4d24abf7d6d28f50 Mon Sep 17 00:00:00 2001 1From 3381232bab7217b9cb47e7cc765c8380192069b0 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com> 2From: Ross Burton <ross.burton@arm.com>
3Date: Mon, 5 Dec 2022 17:02:32 +0000 3Date: Fri, 17 Oct 2025 14:15:36 +0800
4Subject: [PATCH] add yocto-specific install-ptest target 4Subject: [PATCH] add yocto-specific install-ptest target
5 5
6Add a target to install the test suite. 6Add a target to install the test suite.
7 7
8Upstream-Status: Inappropriate 8Upstream-Status: Inappropriate
9Signed-off-by: Ross Burton <ross.burton@arm.com> 9Signed-off-by: Ross Burton <ross.burton@arm.com>
10
11Do not install python test cases
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10--- 13---
11 Makefile.am | 10 ++++++++++ 14 Makefile.am | 8 ++++++++
12 1 file changed, 10 insertions(+) 15 1 file changed, 8 insertions(+)
13 16
14diff --git a/Makefile.am b/Makefile.am 17diff --git a/Makefile.am b/Makefile.am
15index 6f98144..ecb3b54 100644 18index 19ec305..64bf28a 100644
16--- a/Makefile.am 19--- a/Makefile.am
17+++ b/Makefile.am 20+++ b/Makefile.am
18@@ -26,6 +26,16 @@ check_PROGRAMS = \ 21@@ -29,6 +29,14 @@ check_PROGRAMS = \
19 testparser \ 22 testparser \
20 testrecurse 23 testrecurse
21 24
22+ptestdir=$(libexecdir) 25+ptestdir=$(libexecdir)
23+install-test-data: $(check_PROGRAMS) 26+install-test-data: $(check_PROGRAMS)
24+ install -d $(DESTDIR)$(ptestdir) $(DESTDIR)$(ptestdir)/python/
25+ for T in $(check_PROGRAMS); do \ 27+ for T in $(check_PROGRAMS); do \
26+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$T $(DESTDIR)$(ptestdir) ;\ 28+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$T $(DESTDIR)$(ptestdir) ;\
27+ done 29+ done
28+ cp -r $(srcdir)/test $(DESTDIR)$(ptestdir) 30+ cp -r $(srcdir)/test $(DESTDIR)$(ptestdir)
29+ cp -r $(srcdir)/result $(DESTDIR)$(ptestdir) 31+ cp -r $(srcdir)/result $(DESTDIR)$(ptestdir)
30+ cp -r $(srcdir)/python/tests $(DESTDIR)$(ptestdir)/python
31+ 32+
32 bin_PROGRAMS = xmllint 33 bin_PROGRAMS = xmllint
33 34
34 bin_SCRIPTS = xml2-config 35 bin_SCRIPTS = xml2-config
36--
372.34.1
38
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
11 echo Running $T 11 echo Running $T
12 ./$T && echo PASS: $T || echo FAIL: $T 12 ./$T && echo PASS: $T || echo FAIL: $T
13done 13done
14
15if test -d python/tests; then
16 cd python/tests
17 for T in *.py; do
18 python3 ./$T && echo PASS: $T || echo FAIL: $T
19 done
20fi
diff --git a/meta/recipes-core/libxml/libxml2_2.14.6.bb b/meta/recipes-core/libxml/libxml2_2.15.0.bb
index 6ed8760f4c..6dbe1c16fc 100644
--- a/meta/recipes-core/libxml/libxml2_2.14.6.bb
+++ b/meta/recipes-core/libxml/libxml2_2.15.0.bb
@@ -21,26 +21,18 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt
21 file://CVE-2025-6021.patch \ 21 file://CVE-2025-6021.patch \
22 " 22 "
23 23
24SRC_URI[archive.sha256sum] = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a" 24SRC_URI[archive.sha256sum] = "5abc766497c5b1d6d99231f662e30c99402a90d03b06c67b62d6c1179dedd561"
25SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" 25SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273"
26 26
27CVE_STATUS[CVE-2025-6170] = "fixed-version: fixed in version 2.14.5" 27CVE_STATUS[CVE-2025-6170] = "fixed-version: fixed in version 2.14.5"
28 28
29BINCONFIG = "${bindir}/xml2-config" 29BINCONFIG = "${bindir}/xml2-config"
30 30
31PACKAGECONFIG ??= "python"
32PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3"
33
34inherit autotools pkgconfig binconfig-disabled ptest 31inherit autotools pkgconfig binconfig-disabled ptest
35 32
36inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3targetconfig', '', d)}
37
38LDFLAGS:append:riscv64 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', ' -fuse-ld=bfd', '', d)}" 33LDFLAGS:append:riscv64 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', ' -fuse-ld=bfd', '', d)}"
39 34
40RDEPENDS:${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)}" 35RDEPENDS:${PN}-ptest += "bash make locale-base-en-us"
41
42RDEPENDS:${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}"
43
44RDEPENDS:${PN}-ptest:append:libc-musl = " musl-locales" 36RDEPENDS:${PN}-ptest:append:libc-musl = " musl-locales"
45RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-ebcdic-us \ 37RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-ebcdic-us \
46 glibc-gconv-ibm1141 \ 38 glibc-gconv-ibm1141 \
@@ -49,10 +41,10 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-ebcdic-us \
49 " 41 "
50 42
51# WARNING: zlib is required for RPM use 43# WARNING: zlib is required for RPM use
52EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --with-c14n --without-lzma" 44EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --with-c14n"
53EXTRA_OECONF:class-native = "--without-legacy --with-c14n --without-lzma --with-zlib" 45EXTRA_OECONF:class-native = "--without-legacy --with-c14n --with-zlib"
54EXTRA_OECONF:class-nativesdk = "--without-legacy --with-c14n --without-lzma --with-zlib" 46EXTRA_OECONF:class-nativesdk = "--without-legacy --with-c14n --with-zlib"
55EXTRA_OECONF:linuxstdbase = "--with-debug --with-legacy --with-c14n --without-lzma --with-zlib" 47EXTRA_OECONF:linuxstdbase = "--with-debug --with-legacy --with-c14n --with-zlib"
56 48
57python populate_packages:prepend () { 49python populate_packages:prepend () {
58 # autonamer would call this libxml2-2, but we don't want that 50 # autonamer would call this libxml2-2, but we don't want that
@@ -61,11 +53,9 @@ python populate_packages:prepend () {
61} 53}
62 54
63PACKAGE_BEFORE_PN += "${PN}-utils" 55PACKAGE_BEFORE_PN += "${PN}-utils"
64PACKAGES += "${PN}-python"
65 56
66FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" 57FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a"
67FILES:${PN}-utils = "${bindir}/*" 58FILES:${PN}-utils = "${bindir}/*"
68FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
69 59
70do_configure:prepend () { 60do_configure:prepend () {
71 # executables take longer to package: these should not be executable 61 # executables take longer to package: these should not be executable
@@ -76,10 +66,6 @@ do_install_ptest () {
76 oe_runmake DESTDIR=${D} ptestdir=${PTEST_PATH} install-test-data 66 oe_runmake DESTDIR=${D} ptestdir=${PTEST_PATH} install-test-data
77 67
78 cp -r ${S}/xmlconf ${D}${PTEST_PATH} 68 cp -r ${S}/xmlconf ${D}${PTEST_PATH}
79
80 if ! ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then
81 rm -rf ${D}${PTEST_DIR}/python
82 fi
83} 69}
84 70
85# with musl we need to enable icu support explicitly for these tests 71# with musl we need to enable icu support explicitly for these tests