diff options
Diffstat (limited to 'external/poky/meta/recipes-devtools/opkg')
-rw-r--r-- | external/poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb | 5 | ||||
-rw-r--r-- | external/poky/meta/recipes-devtools/opkg/opkg/0001-libopkg-add-add-ignore-recommends-option.patch | 260 | ||||
-rw-r--r-- | external/poky/meta/recipes-devtools/opkg/opkg/0001-remove_maintainer_scripts-use-strict-matching.patch | 56 | ||||
-rw-r--r-- | external/poky/meta/recipes-devtools/opkg/opkg/run-ptest | 5 | ||||
-rw-r--r-- | external/poky/meta/recipes-devtools/opkg/opkg_0.4.2.bb (renamed from external/poky/meta/recipes-devtools/opkg/opkg_0.3.6.bb) | 33 |
5 files changed, 31 insertions, 328 deletions
diff --git a/external/poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb b/external/poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb index a20e316a..07e24025 100644 --- a/external/poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb +++ b/external/poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb @@ -36,5 +36,8 @@ FILES_${PN} = "${datadir}/opkg/keyrings" RDEPENDS_${PN} = "opkg" pkg_postinst_ontarget_${PN} () { -opkg-key populate + if test -x ${bindir}/opkg-key + then + ${bindir}/opkg-key populate + fi } diff --git a/external/poky/meta/recipes-devtools/opkg/opkg/0001-libopkg-add-add-ignore-recommends-option.patch b/external/poky/meta/recipes-devtools/opkg/opkg/0001-libopkg-add-add-ignore-recommends-option.patch deleted file mode 100644 index 11954e90..00000000 --- a/external/poky/meta/recipes-devtools/opkg/opkg/0001-libopkg-add-add-ignore-recommends-option.patch +++ /dev/null @@ -1,260 +0,0 @@ -From 2eca28b6a37be92e4e835c51872c7df34ec6dedd Mon Sep 17 00:00:00 2001 -From: Quentin Schulz <quentin.schulz@streamunlimited.com> -Date: Fri, 31 May 2019 17:30:40 +0200 -Subject: [PATCH] [PATCH] libopkg: add --add-ignore-recommends option - -Add option to ignore specific recommended packages. On the libsolv -backed, this feature will only work on libsolv version > 0.7.2 [1]. - -[1] https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_openSUSE_libsolv_issues_254&d=DwIBaQ&c=I_0YwoKy7z5LMTVdyO6YCiE2uzI1jjZZuIPelcSjixA&r=wNcrL2akRn6jfxhHaKavUrJB_C9JAMXtynjLd8ZzgXQ&m=GObNHzFJpWpf_PripIrf-K2RhsktYdAUEieAJexXOKw&s=3G-meChUqClFggFPqsrAxIZBfLnRKIHm62Uuy1X6nQQ&e= - -Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> -Signed-off-by: Quentin Schulz <quentin.schulz@streamunlimited.com> - -Upstream-Status: Backport ---- - libopkg/opkg_conf.c | 2 + - libopkg/opkg_conf.h | 1 + - .../solvers/internal/pkg_depends_internal.c | 3 +- - libopkg/solvers/libsolv/opkg_solver_libsolv.c | 21 ++++++- - man/opkg.1.in | 3 + - src/opkg.c | 6 ++ - tests/Makefile | 1 + - tests/core/43_add_ignore_recommends.py | 62 +++++++++++++++++++ - 8 files changed, 97 insertions(+), 2 deletions(-) - create mode 100644 tests/core/43_add_ignore_recommends.py - -diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c -index 06880a1..f2330cd 100644 ---- a/libopkg/opkg_conf.c -+++ b/libopkg/opkg_conf.c -@@ -597,6 +597,7 @@ int opkg_conf_init(void) - pkg_dest_list_init(&opkg_config->tmp_dest_list); - nv_pair_list_init(&opkg_config->arch_list); - str_list_init(&opkg_config->exclude_list); -+ str_list_init(&opkg_config->ignore_recommends_list); - - return 0; - } -@@ -938,6 +939,7 @@ void opkg_conf_deinit(void) - pkg_dest_list_deinit(&opkg_config->pkg_dest_list); - nv_pair_list_deinit(&opkg_config->arch_list); - str_list_deinit(&opkg_config->exclude_list); -+ str_list_deinit(&opkg_config->ignore_recommends_list); - - if (opkg_config->verbosity >= DEBUG) { - hash_print_stats(&opkg_config->pkg_hash); -diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h -index dc11516..fc42de3 100644 ---- a/libopkg/opkg_conf.h -+++ b/libopkg/opkg_conf.h -@@ -61,6 +61,7 @@ typedef struct opkg_conf { - pkg_dest_list_t tmp_dest_list; - nv_pair_list_t arch_list; - str_list_t exclude_list; -+ str_list_t ignore_recommends_list; - - int restrict_to_default_dest; - pkg_dest_t *default_dest; -diff --git a/libopkg/solvers/internal/pkg_depends_internal.c b/libopkg/solvers/internal/pkg_depends_internal.c -index cd56d84..5deee70 100644 ---- a/libopkg/solvers/internal/pkg_depends_internal.c -+++ b/libopkg/solvers/internal/pkg_depends_internal.c -@@ -228,7 +228,8 @@ int pkg_hash_fetch_unsatisfied_dependencies(pkg_t *pkg, - || compound_depend->type == SUGGEST) - && (satisfying_pkg->state_want == SW_DEINSTALL - || satisfying_pkg->state_want == SW_PURGE -- || opkg_config->no_install_recommends); -+ || opkg_config->no_install_recommends -+ || str_list_contains(&opkg_config->ignore_recommends_list, satisfying_pkg->name)); - if (ignore) { - opkg_msg(NOTICE, - "%s: ignoring recommendation for " -diff --git a/libopkg/solvers/libsolv/opkg_solver_libsolv.c b/libopkg/solvers/libsolv/opkg_solver_libsolv.c -index bf0b72c..ea00a37 100644 ---- a/libopkg/solvers/libsolv/opkg_solver_libsolv.c -+++ b/libopkg/solvers/libsolv/opkg_solver_libsolv.c -@@ -484,6 +484,7 @@ static void pkg2solvable(pkg_t *pkg, Solvable *solvable_out) - static void populate_installed_repo(libsolv_solver_t *libsolv_solver) - { - int i; -+ Id what; - - pkg_vec_t *installed_pkgs = pkg_vec_alloc(); - -@@ -507,6 +508,15 @@ static void populate_installed_repo(libsolv_solver_t *libsolv_solver) - /* set solvable attributes */ - pkg2solvable(pkg, solvable); - -+ /* if the package is in ignore-recommends-list, disfavor installation */ -+ if (str_list_contains(&opkg_config->ignore_recommends_list, pkg->name)) { -+ opkg_message(NOTICE, "Disfavor package: %s\n", -+ pkg->name); -+ what = pool_str2id(libsolv_solver->pool, pkg->name, 1); -+ queue_push2(&libsolv_solver->solver_jobs, SOLVER_SOLVABLE_NAME -+ | SOLVER_DISFAVOR, what); -+ } -+ - /* if the package is not autoinstalled, mark it as user installed */ - if (!pkg->auto_installed) - queue_push2(&libsolv_solver->solver_jobs, SOLVER_SOLVABLE -@@ -533,7 +543,7 @@ static void populate_available_repos(libsolv_solver_t *libsolv_solver) - { - int i; - Solvable *solvable; -- Id solvable_id; -+ Id solvable_id, what; - - pkg_vec_t *available_pkgs = pkg_vec_alloc(); - -@@ -602,6 +612,15 @@ static void populate_available_repos(libsolv_solver_t *libsolv_solver) - solvable = pool_id2solvable(libsolv_solver->pool, solvable_id); - pkg2solvable(pkg, solvable); - -+ /* if the package is in ignore-recommends-list, disfavor installation */ -+ if (str_list_contains(&opkg_config->ignore_recommends_list, pkg->name)) { -+ opkg_message(NOTICE, "Disfavor package: %s\n", -+ pkg->name); -+ what = pool_str2id(libsolv_solver->pool, pkg->name, 1); -+ queue_push2(&libsolv_solver->solver_jobs, SOLVER_SOLVABLE_NAME -+ | SOLVER_DISFAVOR, what); -+ } -+ - /* if the --force-depends option is specified make dependencies weak */ - if (opkg_config->force_depends) - queue_push2(&libsolv_solver->solver_jobs, SOLVER_SOLVABLE -diff --git a/man/opkg.1.in b/man/opkg.1.in -index 026fb15..c0d4bf3 100644 ---- a/man/opkg.1.in -+++ b/man/opkg.1.in -@@ -143,6 +143,9 @@ conjunction with \fB\--dest\fP - \fB\--add-arch <\fIarch\fP>:<\fIprio\fP>\fR - Register the package architecture \fIarch\fP with the numeric - priority \fIprio\fP. Lower priorities take precedence. -+.TP -+\fB\--add-ignore-recommends <\fIname\fP>\fR -+Register package to be ignored as a recomendee - .SS FORCE OPTIONS - .TP - \fB\--force-depends \fR -diff --git a/src/opkg.c b/src/opkg.c -index f23467d..5181065 100644 ---- a/src/opkg.c -+++ b/src/opkg.c -@@ -51,6 +51,7 @@ enum { - ARGS_OPT_ADD_DEST, - ARGS_OPT_SIZE, - ARGS_OPT_ADD_EXCLUDE, -+ ARGS_OPT_ADD_IGNORE_RECOMMENDS, - ARGS_OPT_NOACTION, - ARGS_OPT_DOWNLOAD_ONLY, - ARGS_OPT_NODEPS, -@@ -110,6 +111,7 @@ static struct option long_options[] = { - {"add-dest", 1, 0, ARGS_OPT_ADD_DEST}, - {"size", 0, 0, ARGS_OPT_SIZE}, - {"add-exclude", 1, 0, ARGS_OPT_ADD_EXCLUDE}, -+ {"add-ignore-recommends", 1, 0, ARGS_OPT_ADD_IGNORE_RECOMMENDS}, - {"test", 0, 0, ARGS_OPT_NOACTION}, - {"tmp-dir", 1, 0, 't'}, - {"tmp_dir", 1, 0, 't'}, -@@ -235,6 +237,9 @@ static int args_parse(int argc, char *argv[]) - case ARGS_OPT_ADD_EXCLUDE: - str_list_append(&opkg_config->exclude_list, optarg); - break; -+ case ARGS_OPT_ADD_IGNORE_RECOMMENDS: -+ str_list_append(&opkg_config->ignore_recommends_list, optarg); -+ break; - case ARGS_OPT_SIZE: - opkg_config->size = 1; - break; -@@ -335,6 +340,7 @@ static void usage() - printf("\t--add-arch <arch>:<prio> Register architecture with given priority\n"); - printf("\t--add-dest <name>:<path> Register destination with given path\n"); - printf("\t--add-exclude <name> Register package to be excluded from install\n"); -+ printf("\t--add-ignore-recommends <name> Register package to be ignored as a recomendee\n"); - printf("\t--prefer-arch-to-version Use the architecture priority package rather\n"); - printf("\t than the higher version one if more\n"); - printf("\t than one candidate is found.\n"); -diff --git a/tests/Makefile b/tests/Makefile -index 148c844..ddf027f 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -38,6 +38,7 @@ REGRESSION_TESTS := core/01_install.py \ - core/37_globs.py \ - core/38_install_constrained_version.py \ - core/39_distupgrade.py \ -+ core/43_add_ignore_recommends.py \ - regress/issue26.py \ - regress/issue31.py \ - regress/issue32.py \ -diff --git a/tests/core/43_add_ignore_recommends.py b/tests/core/43_add_ignore_recommends.py -new file mode 100644 -index 0000000..7da0096 ---- /dev/null -+++ b/tests/core/43_add_ignore_recommends.py -@@ -0,0 +1,62 @@ -+#! /usr/bin/env python3 -+# -+# Create package 'a' (1.0) which Recommends 'c'. -+# Install 'a' with --add-ignore-recommends 'c'. -+# Check that only 'a' (1.0) is installed. -+# Create package 'b' which Depends on 'c'. -+# Install 'a' & 'b', with --add-ignore-recommends 'c'. -+# Verify that 'a','b' & 'c' are installed. -+# Uninstall 'b' & 'c'. -+# Create package 'a' (2.0), which Recommends 'c'. -+# Upgrade 'a' with --add-ignore-recommends 'c' -+# Verify that only 'a' (2.0) is installed -+# -+ -+import os -+import opk, cfg, opkgcl -+ -+opk.regress_init() -+o = opk.OpkGroup() -+ -+o.add(Package='a', Recommends='c', Version='1.0') -+o.add(Package='b', Depends='c') -+o.add(Package='c') -+o.write_opk() -+o.write_list() -+ -+opkgcl.update() -+ -+opkgcl.install('a', '--add-ignore-recommends c') -+ -+if not opkgcl.is_installed('a'): -+ opk.fail("Package 'a' installed but reports as not installed.") -+ -+if opkgcl.is_installed('c'): -+ opk.xfail("[libsolv<0.7.3] Package 'c' should not have been installed since it was in --add-ignore-recommends.") -+ -+opkgcl.remove('a') -+opkgcl.install('a b', '--add-ignore-recommends c') -+ -+if not opkgcl.is_installed('a'): -+ opk.fail("Package 'a' installed but reports as not installed.") -+ -+if not opkgcl.is_installed('b'): -+ opk.fail("Package 'b' installed but reports as not installed.") -+ -+if not opkgcl.is_installed('c'): -+ opk.fail("Package 'c' should have been installed since 'b' depends on it.") -+ -+opkgcl.remove('b c', '--force-depends') -+o.add(Package='a', Recommends='c', Version='2.0') -+o.write_opk() -+o.write_list() -+ -+opkgcl.update() -+ -+opkgcl.upgrade('a', '--add-ignore-recommends c') -+ -+if not opkgcl.is_installed('a', '2.0'): -+ opk.fail("Package 'a (2.0)' installed but reports as not installed.") -+ -+if opkgcl.is_installed('c'): -+ opk.fail("Package 'c' should not have been installed since it was in --add-ignore-recommends.") --- -2.17.1 - diff --git a/external/poky/meta/recipes-devtools/opkg/opkg/0001-remove_maintainer_scripts-use-strict-matching.patch b/external/poky/meta/recipes-devtools/opkg/opkg/0001-remove_maintainer_scripts-use-strict-matching.patch deleted file mode 100644 index ec160290..00000000 --- a/external/poky/meta/recipes-devtools/opkg/opkg/0001-remove_maintainer_scripts-use-strict-matching.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 55c4ad666e76281bdd0db55fa6f4ab2744fea7e4 Mon Sep 17 00:00:00 2001 -From: Alejandro del Castillo <alejandro.delcastillo@ni.com> -Date: Tue, 4 Sep 2018 18:06:00 -0500 -Subject: [PATCH] remove_maintainer_scripts: use strict matching - -The function is using a glob to select which metadata files needs to be -deleted during package removal, on the info_dir. However, the glob may -match metadata files from packages with similar names. For example, -during removal of package glibc-binary-localedata-de-at, the current -logic was also removing the metadata for -glibc-binary-localedata-de-at.iso-8859-1. Add check for an exact match -before deletion. - -Fixes bugzilla: 12905 - -Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/opkg-devel/Fr40Yt0NBno] -Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> ---- - libopkg/opkg_remove.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c -index 82125fa..3936628 100644 ---- a/libopkg/opkg_remove.c -+++ b/libopkg/opkg_remove.c -@@ -137,7 +137,7 @@ void remove_maintainer_scripts(pkg_t * pkg) - { - unsigned int i; - int err; -- char *globpattern; -+ char *globpattern, *filename, *lastdot; - glob_t globbuf; - - if (opkg_config->noaction) -@@ -151,8 +151,16 @@ void remove_maintainer_scripts(pkg_t * pkg) - return; - - for (i = 0; i < globbuf.gl_pathc; i++) { -- opkg_msg(INFO, "Deleting %s.\n", globbuf.gl_pathv[i]); -- unlink(globbuf.gl_pathv[i]); -+ filename = xstrdup(basename(globbuf.gl_pathv[i])); -+ lastdot = strrchr(filename, '.'); -+ *lastdot = '\0'; -+ // Only delete files that match the package name (the glob may match files -+ // with similar names) -+ if (!strcmp(filename, pkg->name)) { -+ opkg_msg(INFO, "Deleting %s.\n", globbuf.gl_pathv[i]); -+ unlink(globbuf.gl_pathv[i]); -+ } -+ free(filename); - } - globfree(&globbuf); - } --- -2.18.0 - diff --git a/external/poky/meta/recipes-devtools/opkg/opkg/run-ptest b/external/poky/meta/recipes-devtools/opkg/opkg/run-ptest new file mode 100644 index 00000000..5fb7077e --- /dev/null +++ b/external/poky/meta/recipes-devtools/opkg/opkg/run-ptest @@ -0,0 +1,5 @@ +#!/bin/sh + +OPKG_PATH=$(which opkg) + +make OPKG_PATH=$OPKG_PATH run-tests diff --git a/external/poky/meta/recipes-devtools/opkg/opkg_0.3.6.bb b/external/poky/meta/recipes-devtools/opkg/opkg_0.4.2.bb index b26d30b5..66a74dc5 100644 --- a/external/poky/meta/recipes-devtools/opkg/opkg_0.3.6.bb +++ b/external/poky/meta/recipes-devtools/opkg/opkg_0.4.2.bb @@ -5,7 +5,7 @@ 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" + file://src/opkg.c;beginline=4;endline=18;md5=d6200b0f2b41dee278aa5fad333eecae" DEPENDS = "libarchive" @@ -14,28 +14,35 @@ 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://0001-remove_maintainer_scripts-use-strict-matching.patch \ - file://0001-libopkg-add-add-ignore-recommends-option.patch \ + file://run-ptest \ " -SRC_URI[md5sum] = "79e04307f6f54db431c251772d7d987c" -SRC_URI[sha256sum] = "f607f0e61be8cf8a3bbd0d2dccd9ec9e9b6c21dd4307b671c600d6eeaf84d30b" +SRC_URI[md5sum] = "bd13e5dfc1c2536f0c7b2e15f795278e" +SRC_URI[sha256sum] = "86887852c43457edfff9d8b6d9520f3f1cdd55f25eb600a6eb31e1c4e151e106" -inherit autotools pkgconfig systemd +# 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" +OPKGLIBDIR ??= "${target_localstatedir}/lib" PACKAGECONFIG ??= "libsolv" -PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error,gnupg" +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[pathfinder] = "--enable-pathfinder,--disable-pathfinder,pathfinder" 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 () { @@ -47,15 +54,19 @@ do_install_append () { 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" -PACKAGES =+ "libopkg" - FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" BBCLASSEXTEND = "native nativesdk" |