| Message ID | 20250519081000.2298461-1-hongxu.jia@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] libxml2: upgrade 2.13.8 -> 2.14.3 | expand |
I already tried this one and it will not work until lttng-tools is patched https://bugs.lttng.org/issues/1427 Peter > -----Original Message----- > From: openembedded-core@lists.openembedded.org <openembedded- > core@lists.openembedded.org> On Behalf Of hongxu via > lists.openembedded.org > Sent: Monday, May 19, 2025 10:10 > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH 1/4] libxml2: upgrade 2.13.8 -> 2.14.3 > > - Rebase install-tests.patch > - Remove --enable-ipv6, due to upstream [build: Remove check for IPv6 ][2] > > License-Update: Mention contributors in Copyright [1] > > [1] https://gitlab.gnome.org/GNOME/libxml2/- > /commit/4bd66d4549b2e8925a752e0daac3a189d2fec8f7 > [2] https://gitlab.gnome.org/GNOME/libxml2/- > /commit/dc6f55cf6e03ae63a40e3af9ad6879821558d6a7 > > Release notes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.3 > Regressions > > reader: Fix reading compressed data > parser: Make undeclared entities in XML content fatal > save: Fix XML escape table > save: Fix xmlSave with NULL encoding > Revert "valid: Remove duplicate error messages when streaming" > > Bug fixes > > save: Fix serialization of attribute defaults containing < > io: Fix linkage of __xml*BufferCreateFilename functions > > Build systems > > cmake: Fix installation directories in libxml2-config.cmake > meson: Install libxml2.py > > Improvements > > parser: Make xmlCtxtGetValidCtxt depend on VALID_ENABLED > html: Avoid HTML_PARSE_HTML5 clashing with XML_PARSE_NOENT > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- > .../libxml/libxml2/install-tests.patch | 16 +++++++++++----- > .../{libxml2_2.13.8.bb => libxml2_2.14.3.bb} | 6 ++---- > 2 files changed, 13 insertions(+), 9 deletions(-) > rename meta/recipes-core/libxml/{libxml2_2.13.8.bb => libxml2_2.14.3.bb} (93%) > > diff --git a/meta/recipes-core/libxml/libxml2/install-tests.patch b/meta/recipes- > core/libxml/libxml2/install-tests.patch > index 1c8c13ab5cc..2570efcdf50 100644 > --- a/meta/recipes-core/libxml/libxml2/install-tests.patch > +++ b/meta/recipes-core/libxml/libxml2/install-tests.patch > @@ -1,21 +1,24 @@ > -From 8c1054eacb430472068f21e4840749c384e8e866 Mon Sep 17 00:00:00 2001 > +From 5bebe007b3efd1a723bd45bb9b3303f8645e9810 Mon Sep 17 00:00:00 2001 > From: Ross Burton <ross.burton@arm.com> > -Date: Mon, 5 Dec 2022 17:02:32 +0000 > +Date: Mon, 19 May 2025 09:45:18 +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> > + > +Rebase to v2.14.3 > +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- > Makefile.am | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/Makefile.am b/Makefile.am > -index 4cb9a5c..8adcd7e 100644 > +index 6f98144..ecb3b54 100644 > --- a/Makefile.am > +++ b/Makefile.am > -@@ -27,6 +27,16 @@ check_PROGRAMS = \ > +@@ -26,6 +26,16 @@ check_PROGRAMS = \ > testparser \ > testrecurse > > @@ -29,6 +32,9 @@ index 4cb9a5c..8adcd7e 100644 > + cp -r $(srcdir)/result $(DESTDIR)$(ptestdir) > + cp -r $(srcdir)/python/tests $(DESTDIR)$(ptestdir)/python > + > - bin_PROGRAMS = xmllint xmlcatalog > + bin_PROGRAMS = xmllint > > bin_SCRIPTS = xml2-config > +-- > +2.34.1 > + > diff --git a/meta/recipes-core/libxml/libxml2_2.13.8.bb b/meta/recipes- > core/libxml/libxml2_2.14.3.bb > similarity index 93% > rename from meta/recipes-core/libxml/libxml2_2.13.8.bb > rename to meta/recipes-core/libxml/libxml2_2.14.3.bb > index e82e0e8ec36..1cdc80cbb76 100644 > --- a/meta/recipes-core/libxml/libxml2_2.13.8.bb > +++ b/meta/recipes-core/libxml/libxml2_2.14.3.bb > @@ -4,7 +4,7 @@ HOMEPAGE = "https://gitlab.gnome.org/GNOME/libxml2" > BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2" > SECTION = "libs" > LICENSE = "MIT" > -LIC_FILES_CHKSUM = > "file://Copyright;md5=f437ed9058e8e5135e47c01e973376ba \ > +LIC_FILES_CHKSUM = > "file://Copyright;md5=5873615e8a9ecbf5c8857c4312ee05d6 \ > > file://dict.c;beginline=6;endline=15;md5=2b4b7b827d2d8b080372433c4c9c85b6 \ > > file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7 \ > " > @@ -19,7 +19,7 @@ SRC_URI += > "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt > file://install-tests.patch \ > " > > -SRC_URI[archive.sha256sum] = > "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a" > +SRC_URI[archive.sha256sum] = > "6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833" > SRC_URI[testtar.sha256sum] = > "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" > > # Disputed as a security issue, but fixed in d39f780 > @@ -28,10 +28,8 @@ CVE_STATUS[CVE-2023-45322] = "disputed: issue requires > memory allocation to fail > BINCONFIG = "${bindir}/xml2-config" > > PACKAGECONFIG ??= "python \ > - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ > " > PACKAGECONFIG[python] = "--with-python=${PYTHON},--without- > python,python3" > -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," > > inherit autotools pkgconfig binconfig-disabled ptest > > -- > 2.34.1
On Mon May 19, 2025 at 10:09 AM CEST, hongxu via lists.openembedded.org wrote: > - Rebase install-tests.patch > - Remove --enable-ipv6, due to upstream [build: Remove check for IPv6 ][2] > > License-Update: Mention contributors in Copyright [1] > > [1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/4bd66d4549b2e8925a752e0daac3a189d2fec8f7 > [2] https://gitlab.gnome.org/GNOME/libxml2/-/commit/dc6f55cf6e03ae63a40e3af9ad6879821558d6a7 > > Release notes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.3 > Regressions > > reader: Fix reading compressed data > parser: Make undeclared entities in XML content fatal > save: Fix XML escape table > save: Fix xmlSave with NULL encoding > Revert "valid: Remove duplicate error messages when streaming" > > Bug fixes > > save: Fix serialization of attribute defaults containing < > io: Fix linkage of __xml*BufferCreateFilename functions > > Build systems > > cmake: Fix installation directories in libxml2-config.cmake > meson: Install libxml2.py > > Improvements > > parser: Make xmlCtxtGetValidCtxt depend on VALID_ENABLED > html: Avoid HTML_PARSE_HTML5 clashing with XML_PARSE_NOENT > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- Hi, Thanks for your patches. It looks like the libxml2 upgrade is breaking the build of lttng-tools: ERROR: lttng-tools-2.13.15-r0 do_compile: oe_runmake failed ERROR: lttng-tools-2.13.15-r0 do_compile: Execution of '/srv/pokybuild/yocto-worker/qemuarm-alt/build/build/tmp/work/cortexa15t2hf-neon-poky-linux-gnueabi/lttng-tools/2.13.15/temp/run.do_compile.60377' failed with exit code 1 ... | In file included from /srv/pokybuild/yocto-worker/qemuarm-alt/build/build/tmp/work/cortexa15t2hf-neon-poky-linux-gnueabi/lttng-tools/2.13.15/recipe-sysroot/usr/include/libxml2/libxml/parser.h:25, | from ../../../../lttng-tools-2.13.15/src/common/config/session-config.c:29: | /srv/pokybuild/yocto-worker/qemuarm-alt/build/build/tmp/work/cortexa15t2hf-neon-poky-linux-gnueabi/lttng-tools/2.13.15/recipe-sysroot/usr/include/libxml2/libxml/encoding.h:173:7: note: declared here | 173 | } input XML_DEPRECATED_MEMBER; | | ^~~~~ | ../../../../lttng-tools-2.13.15/src/common/config/session-config.c:432:15: error: called object is not a function or function pointer | 432 | ret = handler->input(out_str, &out_len, (const xmlChar *) in_str, &in_len); | | ^~~~~~~ https://autobuilder.yoctoproject.org/valkyrie/#/builders/74/builds/1633 Can you look at this failure please?
diff --git a/meta/recipes-core/libxml/libxml2/install-tests.patch b/meta/recipes-core/libxml/libxml2/install-tests.patch index 1c8c13ab5cc..2570efcdf50 100644 --- a/meta/recipes-core/libxml/libxml2/install-tests.patch +++ b/meta/recipes-core/libxml/libxml2/install-tests.patch @@ -1,21 +1,24 @@ -From 8c1054eacb430472068f21e4840749c384e8e866 Mon Sep 17 00:00:00 2001 +From 5bebe007b3efd1a723bd45bb9b3303f8645e9810 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@arm.com> -Date: Mon, 5 Dec 2022 17:02:32 +0000 +Date: Mon, 19 May 2025 09:45:18 +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> + +Rebase to v2.14.3 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- Makefile.am | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile.am b/Makefile.am -index 4cb9a5c..8adcd7e 100644 +index 6f98144..ecb3b54 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -27,6 +27,16 @@ check_PROGRAMS = \ +@@ -26,6 +26,16 @@ check_PROGRAMS = \ testparser \ testrecurse @@ -29,6 +32,9 @@ index 4cb9a5c..8adcd7e 100644 + cp -r $(srcdir)/result $(DESTDIR)$(ptestdir) + cp -r $(srcdir)/python/tests $(DESTDIR)$(ptestdir)/python + - bin_PROGRAMS = xmllint xmlcatalog + bin_PROGRAMS = xmllint bin_SCRIPTS = xml2-config +-- +2.34.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.13.8.bb b/meta/recipes-core/libxml/libxml2_2.14.3.bb similarity index 93% rename from meta/recipes-core/libxml/libxml2_2.13.8.bb rename to meta/recipes-core/libxml/libxml2_2.14.3.bb index e82e0e8ec36..1cdc80cbb76 100644 --- a/meta/recipes-core/libxml/libxml2_2.13.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.14.3.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://gitlab.gnome.org/GNOME/libxml2" BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://Copyright;md5=f437ed9058e8e5135e47c01e973376ba \ +LIC_FILES_CHKSUM = "file://Copyright;md5=5873615e8a9ecbf5c8857c4312ee05d6 \ file://dict.c;beginline=6;endline=15;md5=2b4b7b827d2d8b080372433c4c9c85b6 \ file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7 \ " @@ -19,7 +19,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt file://install-tests.patch \ " -SRC_URI[archive.sha256sum] = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a" +SRC_URI[archive.sha256sum] = "6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833" SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" # Disputed as a security issue, but fixed in d39f780 @@ -28,10 +28,8 @@ CVE_STATUS[CVE-2023-45322] = "disputed: issue requires memory allocation to fail BINCONFIG = "${bindir}/xml2-config" PACKAGECONFIG ??= "python \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," inherit autotools pkgconfig binconfig-disabled ptest
- Rebase install-tests.patch - Remove --enable-ipv6, due to upstream [build: Remove check for IPv6 ][2] License-Update: Mention contributors in Copyright [1] [1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/4bd66d4549b2e8925a752e0daac3a189d2fec8f7 [2] https://gitlab.gnome.org/GNOME/libxml2/-/commit/dc6f55cf6e03ae63a40e3af9ad6879821558d6a7 Release notes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.3 Regressions reader: Fix reading compressed data parser: Make undeclared entities in XML content fatal save: Fix XML escape table save: Fix xmlSave with NULL encoding Revert "valid: Remove duplicate error messages when streaming" Bug fixes save: Fix serialization of attribute defaults containing < io: Fix linkage of __xml*BufferCreateFilename functions Build systems cmake: Fix installation directories in libxml2-config.cmake meson: Install libxml2.py Improvements parser: Make xmlCtxtGetValidCtxt depend on VALID_ENABLED html: Avoid HTML_PARSE_HTML5 clashing with XML_PARSE_NOENT Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- .../libxml/libxml2/install-tests.patch | 16 +++++++++++----- .../{libxml2_2.13.8.bb => libxml2_2.14.3.bb} | 6 ++---- 2 files changed, 13 insertions(+), 9 deletions(-) rename meta/recipes-core/libxml/{libxml2_2.13.8.bb => libxml2_2.14.3.bb} (93%)