<div dir="ltr"><div dir="ltr">This change looks like it impacts documentation (i.e. <a href="https://yoctoproject.org/docs/2.7/ref-manual/ref-manual.html#var-BAD_RECOMMENDATIONS">https://yoctoproject.org/docs/2.7/ref-manual/ref-manual.html#var-BAD_RECOMMENDATIONS</a>). When will this change go into effect?</div><div dir="ltr"><br></div><div>Scott<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Feb 7, 2019 at 7:58 AM Alejandro del Castillo <<a href="mailto:alejandro.delcastillo@ni.com">alejandro.delcastillo@ni.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">To be used for BAD_RECOMMENDATIONS feature.<br>
<br>
Signed-off-by: Alejandro del Castillo <<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>><br>
---<br>
...pkg-add-add-ignore-recommends-option.patch | 259 ++++++++++++++++++<br>
meta/recipes-devtools/opkg/<a href="http://opkg_0.4.0.bb" rel="noreferrer" target="_blank">opkg_0.4.0.bb</a> | 1 +<br>
2 files changed, 260 insertions(+)<br>
create mode 100644 meta/recipes-devtools/opkg/opkg/0001-libopkg-add-add-ignore-recommends-option.patch<br>
<br>
diff --git a/meta/recipes-devtools/opkg/opkg/0001-libopkg-add-add-ignore-recommends-option.patch b/meta/recipes-devtools/opkg/opkg/0001-libopkg-add-add-ignore-recommends-option.patch<br>
new file mode 100644<br>
index 0000000000..47d1b3c37e<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/opkg/opkg/0001-libopkg-add-add-ignore-recommends-option.patch<br>
@@ -0,0 +1,259 @@<br>
+From 64aa98646a17c299bf37af2975b98daf5d7d30b4 Mon Sep 17 00:00:00 2001<br>
+From: Alejandro del Castillo <<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>><br>
+Date: Thu, 31 Jan 2019 18:16:08 -0600<br>
+Subject: [PATCH] libopkg: add --add-ignore-recommends option<br>
+<br>
+Add option to ignore specific recommended packages. On the libsolv<br>
+backed, this feature will only work on libsolv version > 0.7.2 [1].<br>
+<br>
+[1] <a href="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=" rel="noreferrer" target="_blank">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=</a><br>
+<br>
+Signed-off-by: Alejandro del Castillo <<a href="mailto:alejandro.delcastillo@ni.com" target="_blank">alejandro.delcastillo@ni.com</a>><br>
+<br>
+Upstream-Status: Accepted<br>
+---<br>
+ libopkg/opkg_conf.c | 2 +<br>
+ libopkg/opkg_conf.h | 1 +<br>
+ .../solvers/internal/pkg_depends_internal.c | 3 +-<br>
+ libopkg/solvers/libsolv/opkg_solver_libsolv.c | 21 ++++++-<br>
+ man/<a href="http://opkg.1.in" rel="noreferrer" target="_blank">opkg.1.in</a> | 3 +<br>
+ src/opkg.c | 6 ++<br>
+ tests/Makefile | 1 +<br>
+ tests/core/43_add_ignore_recommends.py | 62 +++++++++++++++++++<br>
+ 8 files changed, 97 insertions(+), 2 deletions(-)<br>
+ create mode 100755 tests/core/43_add_ignore_recommends.py<br>
+<br>
+diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c<br>
+index 06880a1..f2330cd 100644<br>
+--- a/libopkg/opkg_conf.c<br>
++++ b/libopkg/opkg_conf.c<br>
+@@ -597,6 +597,7 @@ int opkg_conf_init(void)<br>
+ pkg_dest_list_init(&opkg_config->tmp_dest_list);<br>
+ nv_pair_list_init(&opkg_config->arch_list);<br>
+ str_list_init(&opkg_config->exclude_list);<br>
++ str_list_init(&opkg_config->ignore_recommends_list);<br>
+ <br>
+ return 0;<br>
+ }<br>
+@@ -938,6 +939,7 @@ void opkg_conf_deinit(void)<br>
+ pkg_dest_list_deinit(&opkg_config->pkg_dest_list);<br>
+ nv_pair_list_deinit(&opkg_config->arch_list);<br>
+ str_list_deinit(&opkg_config->exclude_list);<br>
++ str_list_deinit(&opkg_config->ignore_recommends_list);<br>
+ <br>
+ if (opkg_config->verbosity >= DEBUG) {<br>
+ hash_print_stats(&opkg_config->pkg_hash);<br>
+diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h<br>
+index eb56a29..316c500 100644<br>
+--- a/libopkg/opkg_conf.h<br>
++++ b/libopkg/opkg_conf.h<br>
+@@ -61,6 +61,7 @@ typedef struct opkg_conf {<br>
+ pkg_dest_list_t tmp_dest_list;<br>
+ nv_pair_list_t arch_list;<br>
+ str_list_t exclude_list;<br>
++ str_list_t ignore_recommends_list;<br>
+ <br>
+ int restrict_to_default_dest;<br>
+ pkg_dest_t *default_dest;<br>
+diff --git a/libopkg/solvers/internal/pkg_depends_internal.c b/libopkg/solvers/internal/pkg_depends_internal.c<br>
+index cd56d84..5deee70 100644<br>
+--- a/libopkg/solvers/internal/pkg_depends_internal.c<br>
++++ b/libopkg/solvers/internal/pkg_depends_internal.c<br>
+@@ -228,7 +228,8 @@ int pkg_hash_fetch_unsatisfied_dependencies(pkg_t *pkg,<br>
+ || compound_depend->type == SUGGEST)<br>
+ && (satisfying_pkg->state_want == SW_DEINSTALL<br>
+ || satisfying_pkg->state_want == SW_PURGE<br>
+- || opkg_config->no_install_recommends);<br>
++ || opkg_config->no_install_recommends<br>
++ || str_list_contains(&opkg_config->ignore_recommends_list, satisfying_pkg->name));<br>
+ if (ignore) {<br>
+ opkg_msg(NOTICE,<br>
+ "%s: ignoring recommendation for "<br>
+diff --git a/libopkg/solvers/libsolv/opkg_solver_libsolv.c b/libopkg/solvers/libsolv/opkg_solver_libsolv.c<br>
+index 2b27e3a..403e07b 100644<br>
+--- a/libopkg/solvers/libsolv/opkg_solver_libsolv.c<br>
++++ b/libopkg/solvers/libsolv/opkg_solver_libsolv.c<br>
+@@ -484,6 +484,7 @@ static void pkg2solvable(pkg_t *pkg, Solvable *solvable_out)<br>
+ static void populate_installed_repo(libsolv_solver_t *libsolv_solver)<br>
+ {<br>
+ int i;<br>
++ Id what;<br>
+ <br>
+ pkg_vec_t *installed_pkgs = pkg_vec_alloc();<br>
+ <br>
+@@ -507,6 +508,15 @@ static void populate_installed_repo(libsolv_solver_t *libsolv_solver)<br>
+ /* set solvable attributes */<br>
+ pkg2solvable(pkg, solvable);<br>
+ <br>
++ /* if the package is in ignore-recommends-list, disfavor installation */<br>
++ if (str_list_contains(&opkg_config->ignore_recommends_list, pkg->name)) {<br>
++ opkg_message(NOTICE, "Disfavor package: %s\n",<br>
++ pkg->name);<br>
++ what = pool_str2id(libsolv_solver->pool, pkg->name, 1);<br>
++ queue_push2(&libsolv_solver->solver_jobs, SOLVER_SOLVABLE_NAME<br>
++ | SOLVER_DISFAVOR, what);<br>
++ }<br>
++<br>
+ /* if the package is not autoinstalled, mark it as user installed */<br>
+ if (!pkg->auto_installed)<br>
+ queue_push2(&libsolv_solver->solver_jobs, SOLVER_SOLVABLE<br>
+@@ -539,7 +549,7 @@ static void populate_available_repos(libsolv_solver_t *libsolv_solver)<br>
+ {<br>
+ int i;<br>
+ Solvable *solvable;<br>
+- Id solvable_id;<br>
++ Id solvable_id, what;<br>
+ <br>
+ pkg_vec_t *available_pkgs = pkg_vec_alloc();<br>
+ <br>
+@@ -608,6 +618,15 @@ static void populate_available_repos(libsolv_solver_t *libsolv_solver)<br>
+ solvable = pool_id2solvable(libsolv_solver->pool, solvable_id);<br>
+ pkg2solvable(pkg, solvable);<br>
+ <br>
++ /* if the package is in ignore-recommends-list, disfavor installation */<br>
++ if (str_list_contains(&opkg_config->ignore_recommends_list, pkg->name)) {<br>
++ opkg_message(NOTICE, "Disfavor package: %s\n",<br>
++ pkg->name);<br>
++ what = pool_str2id(libsolv_solver->pool, pkg->name, 1);<br>
++ queue_push2(&libsolv_solver->solver_jobs, SOLVER_SOLVABLE_NAME<br>
++ | SOLVER_DISFAVOR, what);<br>
++ }<br>
++<br>
+ /* if the --force-depends option is specified make dependencies weak */<br>
+ if (opkg_config->force_depends)<br>
+ queue_push2(&libsolv_solver->solver_jobs, SOLVER_SOLVABLE<br>
+diff --git a/man/<a href="http://opkg.1.in" rel="noreferrer" target="_blank">opkg.1.in</a> b/man/<a href="http://opkg.1.in" rel="noreferrer" target="_blank">opkg.1.in</a><br>
+index 27fa9c1..f192c3b 100644<br>
+--- a/man/<a href="http://opkg.1.in" rel="noreferrer" target="_blank">opkg.1.in</a><br>
++++ b/man/<a href="http://opkg.1.in" rel="noreferrer" target="_blank">opkg.1.in</a><br>
+@@ -162,6 +162,9 @@ priority \fIprio\fP. Lower priorities take precedence.<br>
+ \fB\--add-exclude <\fIname\fP>\fR<br>
+ Register package to be excluded from install<br>
+ .TP<br>
++\fB\--add-ignore-recommends <\fIname\fP>\fR<br>
++Register package to be ignored as a recomendee<br>
++.TP<br>
+ \fB\--prefer-arch-to-version\fR<br>
+ Use the architecture priority package rather than the higher version<br>
+ one if more than one candidate is found.<br>
+diff --git a/src/opkg.c b/src/opkg.c<br>
+index 650e278..3c93a3b 100644<br>
+--- a/src/opkg.c<br>
++++ b/src/opkg.c<br>
+@@ -51,6 +51,7 @@ enum {<br>
+ ARGS_OPT_ADD_DEST,<br>
+ ARGS_OPT_SIZE,<br>
+ ARGS_OPT_ADD_EXCLUDE,<br>
++ ARGS_OPT_ADD_IGNORE_RECOMMENDS,<br>
+ ARGS_OPT_NOACTION,<br>
+ ARGS_OPT_DOWNLOAD_ONLY,<br>
+ ARGS_OPT_NODEPS,<br>
+@@ -112,6 +113,7 @@ static struct option long_options[] = {<br>
+ {"add-dest", 1, 0, ARGS_OPT_ADD_DEST},<br>
+ {"size", 0, 0, ARGS_OPT_SIZE},<br>
+ {"add-exclude", 1, 0, ARGS_OPT_ADD_EXCLUDE},<br>
++ {"add-ignore-recommends", 1, 0, ARGS_OPT_ADD_IGNORE_RECOMMENDS},<br>
+ {"test", 0, 0, ARGS_OPT_NOACTION},<br>
+ {"tmp-dir", 1, 0, 't'},<br>
+ {"tmp_dir", 1, 0, 't'},<br>
+@@ -234,6 +236,9 @@ static int args_parse(int argc, char *argv[])<br>
+ case ARGS_OPT_ADD_EXCLUDE:<br>
+ str_list_append(&opkg_config->exclude_list, optarg);<br>
+ break;<br>
++ case ARGS_OPT_ADD_IGNORE_RECOMMENDS:<br>
++ str_list_append(&opkg_config->ignore_recommends_list, optarg);<br>
++ break;<br>
+ case ARGS_OPT_SIZE:<br>
+ opkg_config->size = 1;<br>
+ break;<br>
+@@ -343,6 +348,7 @@ static void usage()<br>
+ printf("\t--add-dest <name>:<path> Register destination with given path\n");<br>
+ printf("\t--add-arch <arch>:<prio> Register architecture with given priority\n");<br>
+ printf("\t--add-exclude <name> Register package to be excluded from install\n");<br>
++ printf("\t--add-ignore-recommends <name> Register package to be ignored as a recomendee\n");<br>
+ printf("\t--prefer-arch-to-version Use the architecture priority package rather\n");<br>
+ printf("\t than the higher version one if more\n");<br>
+ printf("\t than one candidate is found.\n");<br>
+diff --git a/tests/Makefile b/tests/Makefile<br>
+index 8e5be08..799816d 100644<br>
+--- a/tests/Makefile<br>
++++ b/tests/Makefile<br>
+@@ -42,6 +42,7 @@ REGRESSION_TESTS := core/01_install.py \<br>
+ core/40_arch.py \<br>
+ core/41_info_fields.py \<br>
+ core/42_info_description.py \<br>
++ core/43_add_ignore_recommends.py \<br>
+ regress/issue26.py \<br>
+ regress/issue31.py \<br>
+ regress/issue32.py \<br>
+diff --git a/tests/core/43_add_ignore_recommends.py b/tests/core/43_add_ignore_recommends.py<br>
+new file mode 100755<br>
+index 0000000..7da0096<br>
+--- /dev/null<br>
++++ b/tests/core/43_add_ignore_recommends.py<br>
+@@ -0,0 +1,62 @@<br>
++#! /usr/bin/env python3<br>
++#<br>
++# Create package 'a' (1.0) which Recommends 'c'.<br>
++# Install 'a' with --add-ignore-recommends 'c'.<br>
++# Check that only 'a' (1.0) is installed.<br>
++# Create package 'b' which Depends on 'c'.<br>
++# Install 'a' & 'b', with --add-ignore-recommends 'c'.<br>
++# Verify that 'a','b' & 'c' are installed.<br>
++# Uninstall 'b' & 'c'.<br>
++# Create package 'a' (2.0), which Recommends 'c'.<br>
++# Upgrade 'a' with --add-ignore-recommends 'c'<br>
++# Verify that only 'a' (2.0) is installed<br>
++#<br>
++<br>
++import os<br>
++import opk, cfg, opkgcl<br>
++<br>
++opk.regress_init()<br>
++o = opk.OpkGroup()<br>
++<br>
++o.add(Package='a', Recommends='c', Version='1.0')<br>
++o.add(Package='b', Depends='c')<br>
++o.add(Package='c')<br>
++o.write_opk()<br>
++o.write_list()<br>
++<br>
++opkgcl.update()<br>
++<br>
++opkgcl.install('a', '--add-ignore-recommends c')<br>
++<br>
++if not opkgcl.is_installed('a'):<br>
++ opk.fail("Package 'a' installed but reports as not installed.")<br>
++<br>
++if opkgcl.is_installed('c'):<br>
++ opk.xfail("[libsolv<0.7.3] Package 'c' should not have been installed since it was in --add-ignore-recommends.")<br>
++<br>
++opkgcl.remove('a')<br>
++opkgcl.install('a b', '--add-ignore-recommends c')<br>
++<br>
++if not opkgcl.is_installed('a'):<br>
++ opk.fail("Package 'a' installed but reports as not installed.")<br>
++<br>
++if not opkgcl.is_installed('b'):<br>
++ opk.fail("Package 'b' installed but reports as not installed.")<br>
++<br>
++if not opkgcl.is_installed('c'):<br>
++ opk.fail("Package 'c' should have been installed since 'b' depends on it.")<br>
++<br>
++opkgcl.remove('b c', '--force-depends')<br>
++o.add(Package='a', Recommends='c', Version='2.0')<br>
++o.write_opk()<br>
++o.write_list()<br>
++<br>
++opkgcl.update()<br>
++<br>
++opkgcl.upgrade('a', '--add-ignore-recommends c')<br>
++<br>
++if not opkgcl.is_installed('a', '2.0'):<br>
++ opk.fail("Package 'a (2.0)' installed but reports as not installed.")<br>
++<br>
++if opkgcl.is_installed('c'):<br>
++ opk.fail("Package 'c' should not have been installed since it was in --add-ignore-recommends.")<br>
+-- <br>
+2.20.1<br>
+<br>
diff --git a/meta/recipes-devtools/opkg/<a href="http://opkg_0.4.0.bb" rel="noreferrer" target="_blank">opkg_0.4.0.bb</a> b/meta/recipes-devtools/opkg/<a href="http://opkg_0.4.0.bb" rel="noreferrer" target="_blank">opkg_0.4.0.bb</a><br>
index 9b7cf3f596..a2329d3e71 100644<br>
--- a/meta/recipes-devtools/opkg/<a href="http://opkg_0.4.0.bb" rel="noreferrer" target="_blank">opkg_0.4.0.bb</a><br>
+++ b/meta/recipes-devtools/opkg/<a href="http://opkg_0.4.0.bb" rel="noreferrer" target="_blank">opkg_0.4.0.bb</a><br>
@@ -14,6 +14,7 @@ PE = "1"<br>
SRC_URI = "<a href="http://downloads.yoctoproject.org/releases/$%7BBPN%7D/$%7BBPN%7D-$%7BPV%7D.tar.gz" rel="noreferrer" target="_blank">http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz</a> \<br>
file://opkg.conf \<br>
file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \<br>
+ file://0001-libopkg-add-add-ignore-recommends-option.patch \<br>
"<br>
<br>
SRC_URI[md5sum] = "ae51d95fee599bb4dce08453529158f5"<br>
-- <br>
2.20.1<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>