| Message ID | 20251016074240.2464360-2-hongxu.jia@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] itstool: Switch from libxml2 to lxml | expand |
On Thu Oct 16, 2025 at 9:42 AM CEST, 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. > > [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 v2. It gets better, but now we do have some failing ptests: AssertionError: Failed ptests: {'libxml2': ['attribs.py', 'build.py', 'compareNodes.py', 'ctxterror.py', 'cutnpaste.py', 'dtdvalid.py', 'error.py', 'inbuf.py', 'indexes.py', 'input_callback.py', 'nsdel.py', 'outbuf.py', 'push.py', 'pushSAXhtml.py', 'pushSAX.py', 'reader2.py', 'reader3.py', 'reader4.py', 'reader5.py', 'reader6.py', 'reader7.py', 'reader8.py', 'readererr.py', 'readernext.py', 'reader.py', 'regexp.py', 'relaxng.py', 'resolver.py', 'schema.py', 'serialize.py', 'setup_test.py', 'sync.py', 'thread2.py', 'tstLastError.py', 'tstmem.py', 'tst.py', 'tstURI.py', 'tstxpath.py', 'unicode.py', 'validate.py', 'validDTD.py', 'validRNG.py', 'validSchemas.py', 'walker.py', 'xpathext.py', 'xpathleak.py', 'xpathns.py', 'xpath.py', 'xpathret.py']} https://autobuilder.yoctoproject.org/valkyrie/#/builders/56/builds/642 https://autobuilder.yoctoproject.org/valkyrie/#/builders/61/builds/2458 https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/2497 Can you have a look at these, please? Thanks, Mathieu
On 10/17/25 13: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 Thu Oct 16, 2025 at 9:42 AM CEST, 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. >> >> [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 v2. It gets better, but now we do have some failing > ptests: > > AssertionError: > Failed ptests: > {'libxml2': ['attribs.py', > 'build.py', > 'compareNodes.py', > 'ctxterror.py', > 'cutnpaste.py', > 'dtdvalid.py', > 'error.py', > 'inbuf.py', > 'indexes.py', > 'input_callback.py', > 'nsdel.py', > 'outbuf.py', > 'push.py', > 'pushSAXhtml.py', > 'pushSAX.py', > 'reader2.py', > 'reader3.py', > 'reader4.py', > 'reader5.py', > 'reader6.py', > 'reader7.py', > 'reader8.py', > 'readererr.py', > 'readernext.py', > 'reader.py', > 'regexp.py', > 'relaxng.py', > 'resolver.py', > 'schema.py', > 'serialize.py', > 'setup_test.py', > 'sync.py', > 'thread2.py', > 'tstLastError.py', > 'tstmem.py', > 'tst.py', > 'tstURI.py', > 'tstxpath.py', > 'unicode.py', > 'validate.py', > 'validDTD.py', > 'validRNG.py', > 'validSchemas.py', > 'walker.py', > 'xpathext.py', > 'xpathleak.py', > 'xpathns.py', > 'xpath.py', > 'xpathret.py']} > > https://autobuilder.yoctoproject.org/valkyrie/#/builders/56/builds/642 > https://autobuilder.yoctoproject.org/valkyrie/#/builders/61/builds/2458 > https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/2497 > > Can you have a look at these, please? Sure, it seems we should remove python ptest for libxml2, v3 incoming //Hongxu > Thanks, > Mathieu > > -- > Mathieu Dubois-Briand, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com >
diff --git a/meta/recipes-core/libxml/libxml2_2.14.6.bb b/meta/recipes-core/libxml/libxml2_2.15.0.bb similarity index 78% rename from meta/recipes-core/libxml/libxml2_2.14.6.bb rename to 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 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 +41,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 +53,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 +66,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. [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> --- .../{libxml2_2.14.6.bb => libxml2_2.15.0.bb} | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) rename meta/recipes-core/libxml/{libxml2_2.14.6.bb => libxml2_2.15.0.bb} (78%)