From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../recipes-devtools/opkg/opkg/open_inner.patch | 46 ------------ .../recipes-devtools/opkg/opkg/opkg_archive.patch | 54 -------------- poky/meta/recipes-devtools/opkg/opkg_0.4.1.bb | 86 ---------------------- poky/meta/recipes-devtools/opkg/opkg_0.4.2.bb | 74 +++++++++++++++++++ 4 files changed, 74 insertions(+), 186 deletions(-) delete mode 100644 poky/meta/recipes-devtools/opkg/opkg/open_inner.patch delete mode 100644 poky/meta/recipes-devtools/opkg/opkg/opkg_archive.patch delete mode 100644 poky/meta/recipes-devtools/opkg/opkg_0.4.1.bb create mode 100644 poky/meta/recipes-devtools/opkg/opkg_0.4.2.bb (limited to 'poky/meta/recipes-devtools/opkg') diff --git a/poky/meta/recipes-devtools/opkg/opkg/open_inner.patch b/poky/meta/recipes-devtools/opkg/opkg/open_inner.patch deleted file mode 100644 index 278e099e3..000000000 --- a/poky/meta/recipes-devtools/opkg/opkg/open_inner.patch +++ /dev/null @@ -1,46 +0,0 @@ -From alejandro.delcastillo@ni.com Wed Nov 20 22:35:02 2019 -From: Alejandro del Castillo -To: , -CC: Alejandro del Castillo -Subject: [opkg][PATCH 2/2] open_inner: add support for empty payloads -Date: Wed, 20 Nov 2019 16:34:48 -0600 -Message-ID: <20191120223448.26522-3-alejandro.delcastillo@ni.com> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20191120223448.26522-1-alejandro.delcastillo@ni.com> -References: <20191120223448.26522-1-alejandro.delcastillo@ni.com> -MIME-Version: 1.0 -Content-Type: text/plain -Content-Transfer-Encoding: 8bit - -Support for empty compressed payloads need to be explicitly enabled on -libarchive. - -Signed-off-by: Alejandro del Castillo - -Upstream-Status: Backport ---- - libopkg/opkg_archive.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c -index 0e9ccea..f19cece 100644 ---- a/libopkg/opkg_archive.c -+++ b/libopkg/opkg_archive.c -@@ -618,6 +618,13 @@ static struct archive *open_inner(struct archive *outer) - goto err_cleanup; - } - -+ r = archive_read_support_format_empty(inner); -+ if (r != ARCHIVE_OK) { -+ opkg_msg(ERROR, "Empty format not supported: %s\n", -+ archive_error_string(inner)); -+ goto err_cleanup; -+ } -+ - r = archive_read_open(inner, data, NULL, inner_read, inner_close); - if (r != ARCHIVE_OK) { - opkg_msg(ERROR, "Failed to open inner archive: %s\n", --- -2.22.0 - - diff --git a/poky/meta/recipes-devtools/opkg/opkg/opkg_archive.patch b/poky/meta/recipes-devtools/opkg/opkg/opkg_archive.patch deleted file mode 100644 index 3e1ebae95..000000000 --- a/poky/meta/recipes-devtools/opkg/opkg/opkg_archive.patch +++ /dev/null @@ -1,54 +0,0 @@ -From alejandro.delcastillo@ni.com Wed Nov 20 22:35:01 2019 -Return-Path: -From: Alejandro del Castillo -To: , -CC: Alejandro del Castillo -Subject: [opkg][PATCH 1/2] opkg_archive.c: avoid double free on uncompress - error -Date: Wed, 20 Nov 2019 16:34:47 -0600 -Message-ID: <20191120223448.26522-2-alejandro.delcastillo@ni.com> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20191120223448.26522-1-alejandro.delcastillo@ni.com> -References: <20191120223448.26522-1-alejandro.delcastillo@ni.com> -MIME-Version: 1.0 -Content-Type: text/plain -Content-Transfer-Encoding: 8bit - -The open-inner function calls archive_read_open. On error, -archive_read_open calls inner_close, which also closes the outter -archive. On error, return NULL directly to avoid double free. - - -Upstream-Status: Backport - -Signed-off-by: Alejandro del Castillo ---- - libopkg/opkg_archive.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c -index 3d87db1..0e9ccea 100644 ---- a/libopkg/opkg_archive.c -+++ b/libopkg/opkg_archive.c -@@ -622,7 +622,7 @@ static struct archive *open_inner(struct archive *outer) - if (r != ARCHIVE_OK) { - opkg_msg(ERROR, "Failed to open inner archive: %s\n", - archive_error_string(inner)); -- goto err_cleanup; -+ return NULL; - } - - return inner; -@@ -683,7 +683,7 @@ static struct archive *extract_outer(const char *filename, const char *arname) - - inner = open_inner(outer); - if (!inner) -- goto err_cleanup; -+ return NULL; - - return inner; - --- -2.22.0 - - diff --git a/poky/meta/recipes-devtools/opkg/opkg_0.4.1.bb b/poky/meta/recipes-devtools/opkg/opkg_0.4.1.bb deleted file mode 100644 index f0ae8b36b..000000000 --- a/poky/meta/recipes-devtools/opkg/opkg_0.4.1.bb +++ /dev/null @@ -1,86 +0,0 @@ -SUMMARY = "Open Package Manager" -SUMMARY_libopkg = "Open Package Manager library" -SECTION = "base" -HOMEPAGE = "http://code.google.com/p/opkg/" -BUGTRACKER = "http://code.google.com/p/opkg/issues/list" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/opkg.c;beginline=2;endline=21;md5=90435a519c6ea69ef22e4a88bcc52fa0" - -DEPENDS = "libarchive" - -PE = "1" - -SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ - file://opkg.conf \ - file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ - file://opkg_archive.patch \ - file://open_inner.patch \ - file://run-ptest \ -" - -SRC_URI[md5sum] = "ba0c21305fc93b26e844981ef100dc85" -SRC_URI[sha256sum] = "45ac1e037d3877f635d883f8a555e172883a25d3eeb7986c75890fdd31250a43" - -# This needs to be before ptest inherit, otherwise all ptest files end packaged -# in libopkg package if OPKGLIBDIR == libdir, because default -# PTEST_PATH ?= "${libdir}/${BPN}/ptest" -PACKAGES =+ "libopkg" - -inherit autotools pkgconfig ptest - -target_localstatedir := "${localstatedir}" -OPKGLIBDIR ??= "${target_localstatedir}/lib" - -PACKAGECONFIG ??= "libsolv" - -PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,\ - gnupg gpgme libgpg-error,\ - ${@ "gnupg" if ("native" in d.getVar("PN")) else "gnupg-gpg"}\ - " -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" -PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl" -PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" -PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256" -PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv" - -EXTRA_OECONF += " --disable-pathfinder" -EXTRA_OECONF_class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}" - -# Release tarball has unused binaries on the tests folder, automatically created by automake. -# For now, delete them to avoid packaging errors (wrong architecture) -do_unpack_append () { - bb.build.exec_func('remove_test_binaries', d) -} - -remove_test_binaries () { - rm ${WORKDIR}/opkg-${PV}/tests/libopkg_test* -} - -do_install_append () { - install -d ${D}${sysconfdir}/opkg - install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf - echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf - - # We need to create the lock directory - install -d ${D}${OPKGLIBDIR}/opkg -} - -do_install_ptest () { - sed -i -e '/@echo $^/d' ${D}${PTEST_PATH}/tests/Makefile - sed -i -e '/@PYTHONPATH=. $(PYTHON) $^/a\\t@if [ "$$?" != "0" ];then echo "FAIL:"$^;else echo "PASS:"$^;fi' ${D}${PTEST_PATH}/tests/Makefile -} - -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN}_class-nativesdk = "" -RDEPENDS_${PN}-ptest += "make binutils python3-core python3-compression" -RREPLACES_${PN} = "opkg-nogpg opkg-collateral" -RCONFLICTS_${PN} = "opkg-collateral" -RPROVIDES_${PN} = "opkg-collateral" - -FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" - -BBCLASSEXTEND = "native nativesdk" - -CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf" diff --git a/poky/meta/recipes-devtools/opkg/opkg_0.4.2.bb b/poky/meta/recipes-devtools/opkg/opkg_0.4.2.bb new file mode 100644 index 000000000..66a74dc5e --- /dev/null +++ b/poky/meta/recipes-devtools/opkg/opkg_0.4.2.bb @@ -0,0 +1,74 @@ +SUMMARY = "Open Package Manager" +SUMMARY_libopkg = "Open Package Manager library" +SECTION = "base" +HOMEPAGE = "http://code.google.com/p/opkg/" +BUGTRACKER = "http://code.google.com/p/opkg/issues/list" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://src/opkg.c;beginline=4;endline=18;md5=d6200b0f2b41dee278aa5fad333eecae" + +DEPENDS = "libarchive" + +PE = "1" + +SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ + file://opkg.conf \ + file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ + file://run-ptest \ +" + +SRC_URI[md5sum] = "bd13e5dfc1c2536f0c7b2e15f795278e" +SRC_URI[sha256sum] = "86887852c43457edfff9d8b6d9520f3f1cdd55f25eb600a6eb31e1c4e151e106" + +# This needs to be before ptest inherit, otherwise all ptest files end packaged +# in libopkg package if OPKGLIBDIR == libdir, because default +# PTEST_PATH ?= "${libdir}/${BPN}/ptest" +PACKAGES =+ "libopkg" + +inherit autotools pkgconfig ptest + +target_localstatedir := "${localstatedir}" +OPKGLIBDIR ??= "${target_localstatedir}/lib" + +PACKAGECONFIG ??= "libsolv" + +PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,\ + gnupg gpgme libgpg-error,\ + ${@ "gnupg" if ("native" in d.getVar("PN")) else "gnupg-gpg"}\ + " +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" +PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" +PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256" +PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv" + +EXTRA_OECONF += " --disable-pathfinder" +EXTRA_OECONF_class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}" + +do_install_append () { + install -d ${D}${sysconfdir}/opkg + install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf + echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf + + # We need to create the lock directory + install -d ${D}${OPKGLIBDIR}/opkg +} + +do_install_ptest () { + sed -i -e '/@echo $^/d' ${D}${PTEST_PATH}/tests/Makefile + sed -i -e '/@PYTHONPATH=. $(PYTHON) $^/a\\t@if [ "$$?" != "0" ];then echo "FAIL:"$^;else echo "PASS:"$^;fi' ${D}${PTEST_PATH}/tests/Makefile +} + +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive" +RDEPENDS_${PN}_class-native = "" +RDEPENDS_${PN}_class-nativesdk = "" +RDEPENDS_${PN}-ptest += "make binutils python3-core python3-compression" +RREPLACES_${PN} = "opkg-nogpg opkg-collateral" +RCONFLICTS_${PN} = "opkg-collateral" +RPROVIDES_${PN} = "opkg-collateral" + +FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" + +BBCLASSEXTEND = "native nativesdk" + +CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf" -- cgit v1.2.3