From 8c22ff0d8b70d9b12f0487ef696a7e915b9e3173 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 7 Nov 2025 13:31:53 +0000 Subject: The poky repository master branch is no longer being updated. You can either: a) switch to individual clones of bitbake, openembedded-core, meta-yocto and yocto-docs b) use the new bitbake-setup You can find information about either approach in our documentation: https://docs.yoctoproject.org/ Note that "poky" the distro setting is still available in meta-yocto as before and we continue to use and maintain that. Long live Poky! Some further information on the background of this change can be found in: https://lists.openembedded.org/g/openembedded-architecture/message/2179 Signed-off-by: Richard Purdie --- ...e-Fix-installation-directories-in-libxml2.patch | 81 ------------------ .../libxml/libxml2/CVE-2025-6021.patch | 31 ------- .../libxml/libxml2/install-tests.patch | 34 -------- meta/recipes-core/libxml/libxml2/run-ptest | 20 ----- meta/recipes-core/libxml/libxml2_2.14.6.bb | 98 ---------------------- 5 files changed, 264 deletions(-) delete mode 100644 meta/recipes-core/libxml/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch delete mode 100644 meta/recipes-core/libxml/libxml2/CVE-2025-6021.patch delete mode 100644 meta/recipes-core/libxml/libxml2/install-tests.patch delete mode 100755 meta/recipes-core/libxml/libxml2/run-ptest delete mode 100644 meta/recipes-core/libxml/libxml2_2.14.6.bb (limited to 'meta/recipes-core/libxml') diff --git a/meta/recipes-core/libxml/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch b/meta/recipes-core/libxml/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch deleted file mode 100644 index 627f8472c3..0000000000 --- a/meta/recipes-core/libxml/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 1a7e177a7315c856a2f0e3c2a17ee0fd9e297bc9 Mon Sep 17 00:00:00 2001 -From: Peter Marko -Date: Mon, 26 May 2025 21:11:14 +0200 -Subject: [PATCH] Revert "cmake: Fix installation directories in - libxml2-config.cmake" - -This reverts commit 75dde50b20215a2a3a445b62f36a67c8ed337cab. - -Upstream-Status: Inappropriate [upstream ticket https://gitlab.gnome.org/GNOME/libxml2/-/issues/898#note_2452864] -Signed-off-by: Peter Marko ---- - configure.ac | 11 ----------- - libxml2-config.cmake.in | 11 +++++++---- - meson.build | 3 --- - 3 files changed, 7 insertions(+), 18 deletions(-) - -diff --git a/configure.ac b/configure.ac -index aaa02e3..fb241bb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1065,17 +1065,6 @@ AC_SUBST(XML_PRIVATE_LIBS) - AC_SUBST(XML_PRIVATE_CFLAGS) - AC_SUBST(XML_INCLUDEDIR) - --# for libxml2-config.cmake.in --AX_RECURSIVE_EVAL(["$bindir"], [INSTALL_BINDIR]) --AX_RECURSIVE_EVAL(["$includedir"], [INSTALL_INCLUDEDIR]) --AX_RECURSIVE_EVAL(["$libdir"], [INSTALL_LIBDIR]) --AC_SUBST(INSTALL_BINDIR) --AC_SUBST(INSTALL_INCLUDEDIR) --AC_SUBST(INSTALL_LIBDIR) --AM_SUBST_NOTMAKE(INSTALL_BINDIR) --AM_SUBST_NOTMAKE(INSTALL_INCLUDEDIR) --AM_SUBST_NOTMAKE(INSTALL_LIBDIR) -- - AX_RECURSIVE_EVAL(["$sysconfdir"], [XML_SYSCONFDIR]) - AC_DEFINE_UNQUOTED([XML_SYSCONFDIR], ["$XML_SYSCONFDIR"], - [System configuration directory (/etc)]) -diff --git a/libxml2-config.cmake.in b/libxml2-config.cmake.in -index e040a75..dc0d6b8 100644 ---- a/libxml2-config.cmake.in -+++ b/libxml2-config.cmake.in -@@ -24,17 +24,20 @@ - # LibXml2::LibXml2 - the LibXml2 library - # LibXml2::xmllint - the xmllint command-line executable - -+get_filename_component(_libxml2_rootdir ${CMAKE_CURRENT_LIST_DIR}/../../../ ABSOLUTE) -+ - set(LIBXML2_VERSION_MAJOR @LIBXML_MAJOR_VERSION@) - set(LIBXML2_VERSION_MINOR @LIBXML_MINOR_VERSION@) - set(LIBXML2_VERSION_MICRO @LIBXML_MICRO_VERSION@) - set(LIBXML2_VERSION_STRING "@VERSION@") - set(LIBXML2_DEFINITIONS "@XML_CFLAGS@") --set(LIBXML2_INCLUDE_DIR @INSTALL_INCLUDEDIR@/libxml2) --set(LIBXML2_LIBRARY_DIR @INSTALL_LIBDIR@) -+set(LIBXML2_INSTALL_PREFIX ${_libxml2_rootdir}) -+set(LIBXML2_INCLUDE_DIR ${_libxml2_rootdir}/include/libxml2) -+set(LIBXML2_LIBRARY_DIR ${_libxml2_rootdir}/lib) - - find_library(LIBXML2_LIBRARY NAMES xml2 HINTS ${LIBXML2_LIBRARY_DIR} NO_DEFAULT_PATH) --find_program(LIBXML2_XMLCATALOG_EXECUTABLE NAMES xmlcatalog HINTS @INSTALL_BINDIR@ NO_DEFAULT_PATH) --find_program(LIBXML2_XMLLINT_EXECUTABLE NAMES xmllint HINTS @INSTALL_BINDIR@ NO_DEFAULT_PATH) -+find_program(LIBXML2_XMLCATALOG_EXECUTABLE NAMES xmlcatalog HINTS ${_libxml2_rootdir}/bin NO_DEFAULT_PATH) -+find_program(LIBXML2_XMLLINT_EXECUTABLE NAMES xmllint HINTS ${_libxml2_rootdir}/bin NO_DEFAULT_PATH) - - set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY}) - set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR}) -diff --git a/meson.build b/meson.build -index 98bc6e3..3ef0bd0 100644 ---- a/meson.build -+++ b/meson.build -@@ -599,9 +599,6 @@ config_cmake = configuration_data() - config_cmake.set('LIBXML_MAJOR_VERSION', v_maj) - config_cmake.set('LIBXML_MINOR_VERSION', v_min) - config_cmake.set('LIBXML_MICRO_VERSION', v_mic) --config_cmake.set('INSTALL_BINDIR', dir_bin) --config_cmake.set('INSTALL_INCLUDEDIR', dir_include) --config_cmake.set('INSTALL_LIBDIR', dir_lib) - config_cmake.set('VERSION', meson.project_version()) - config_cmake.set10('BUILD_SHARED_LIBS', - get_option('default_library') != 'static') 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 -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 - -Add '#include ' 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 ---- - 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 - #include - #include -+#include - - #ifdef LIBXML_ZLIB_ENABLED - #include diff --git a/meta/recipes-core/libxml/libxml2/install-tests.patch b/meta/recipes-core/libxml/libxml2/install-tests.patch deleted file mode 100644 index 4c1faa83cb..0000000000 --- a/meta/recipes-core/libxml/libxml2/install-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7e99fef6eae0642a3f1e511e4d24abf7d6d28f50 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Mon, 5 Dec 2022 17:02:32 +0000 -Subject: [PATCH] add yocto-specific install-ptest target - -Add a target to install the test suite. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton ---- - Makefile.am | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 6f98144..ecb3b54 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -26,6 +26,16 @@ 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 diff --git a/meta/recipes-core/libxml/libxml2/run-ptest b/meta/recipes-core/libxml/libxml2/run-ptest deleted file mode 100755 index cbbdd5592f..0000000000 --- a/meta/recipes-core/libxml/libxml2/run-ptest +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -export LC_ALL=en_US.UTF-8 - -# testModule isn't that useful and hard-codes buildtree, so we don't run that -TESTS="runtest runsuite testrecurse testchar testdict runxmlconf testapi testlimits testparser" - -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.14.6.bb deleted file mode 100644 index 6ed8760f4c..0000000000 --- a/meta/recipes-core/libxml/libxml2_2.14.6.bb +++ /dev/null @@ -1,98 +0,0 @@ -SUMMARY = "XML C Parser Library and Toolkit" -DESCRIPTION = "The XML Parser Library allows for manipulation of XML files. Libxml2 exports Push and Pull type parser interfaces for both XML and HTML. It can do DTD validation at parse time, on a parsed document instance or with an arbitrary DTD. Libxml2 includes complete XPath, XPointer and Xinclude implementations. It also has a SAX like interface, which is designed to be compatible with Expat." -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=5873615e8a9ecbf5c8857c4312ee05d6 \ - file://dict.c;beginline=6;endline=15;md5=2b4b7b827d2d8b080372433c4c9c85b6 \ - file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7 \ - " - -DEPENDS = "zlib virtual/libiconv" - -GNOMEBASEBUILDCLASS = "autotools" -inherit gnomebase - -SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testtar \ - 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[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:append:libc-musl = " musl-locales" -RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-ebcdic-us \ - glibc-gconv-ibm1141 \ - glibc-gconv-iso8859-5 \ - glibc-gconv-euc-jp \ - " - -# 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" - -python populate_packages:prepend () { - # autonamer would call this libxml2-2, but we don't want that - if d.getVar('DEBIAN_NAMES'): - d.setVar('PKG:libxml2', '${MLPREFIX}libxml2') -} - -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 - find ${S}/xmlconf/ -type f -exec chmod -x {} \+ -} - -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 -do_install_ptest:append:libc-musl () { - rm -rf ${D}/${PTEST_PATH}/test/icu_parse_test.xml -} - -do_install:append:class-native () { - # Docs are not needed in the native case - rm ${D}${datadir}/gtk-doc -rf - - create_wrapper ${D}${bindir}/xmllint 'XML_CATALOG_FILES=${XML_CATALOG_FILES:-${sysconfdir}/xml/catalog}' -} -do_install[vardepsexclude] += "XML_CATALOG_FILES:-${sysconfdir}/xml/catalog" - -BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf