diff options
Diffstat (limited to 'meta/recipes-devtools/opkg/opkg/no-install-recommends.patch')
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg/no-install-recommends.patch | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch deleted file mode 100644 index c2d244d26e..0000000000 --- a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 2e2ccc7e7fc81a7eee2d004d3644efbc1be1ad73 Mon Sep 17 00:00:00 2001 -From: Paul Barker <paul@paulbarker.me.uk> -Date: Fri, 28 Mar 2014 15:19:08 +0000 -Subject: [PATCH 1/2] opkg-0.2.x: no-install-recommends - -Add the ability to not install ANY recommended packages. - -Upstream-Status: Accepted for v0.3.0 release with modifications - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> ---- - libopkg/opkg_conf.h | 1 + - libopkg/pkg_depends.c | 3 ++- - src/opkg-cl.c | 7 +++++++ - 3 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h -index e0e045a..2f189e0 100644 ---- a/libopkg/opkg_conf.h -+++ b/libopkg/opkg_conf.h -@@ -82,6 +82,7 @@ struct opkg_conf - int prefer_arch_to_version; - int check_signature; - int nodeps; /* do not follow dependencies */ -+ int noinstall_recommends; - char *offline_root; - char *overlay_root; - int query_all; -diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c -index 8ab6508..41bf206 100644 ---- a/libopkg/pkg_depends.c -+++ b/libopkg/pkg_depends.c -@@ -21,6 +21,7 @@ - #include <ctype.h> - - #include "pkg.h" -+#include "opkg_conf.h" - #include "opkg_utils.h" - #include "pkg_hash.h" - #include "opkg_message.h" -@@ -196,7 +197,7 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, - /* user request overrides package recommendation */ - if (satisfying_pkg != NULL - && (compound_depend->type == RECOMMEND || compound_depend->type == SUGGEST) -- && (satisfying_pkg->state_want == SW_DEINSTALL || satisfying_pkg->state_want == SW_PURGE)) { -+ && (satisfying_pkg->state_want == SW_DEINSTALL || satisfying_pkg->state_want == SW_PURGE || conf->noinstall_recommends)) { - opkg_msg(NOTICE, "%s: ignoring recommendation for " - "%s at user request\n", - pkg->name, satisfying_pkg->name); -diff --git a/src/opkg-cl.c b/src/opkg-cl.c -index a1d121f..6378380 100644 ---- a/src/opkg-cl.c -+++ b/src/opkg-cl.c -@@ -51,6 +51,7 @@ enum { - ARGS_OPT_AUTOREMOVE, - ARGS_OPT_CACHE, - ARGS_OPT_COMBINE, -+ ARGS_OPT_NOINSTALL_RECOMMENDS, - }; - - static struct option long_options[] = { -@@ -91,6 +92,7 @@ static struct option long_options[] = { - {"noaction", 0, 0, ARGS_OPT_NOACTION}, - {"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY}, - {"nodeps", 0, 0, ARGS_OPT_NODEPS}, -+ {"no-install-recommends", 0, 0, ARGS_OPT_NOINSTALL_RECOMMENDS}, - {"offline", 1, 0, 'o'}, - {"offline-root", 1, 0, 'o'}, - {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH}, -@@ -201,6 +203,9 @@ args_parse(int argc, char *argv[]) - case ARGS_OPT_NOACTION: - conf->noaction = 1; - break; -+ case ARGS_OPT_NOINSTALL_RECOMMENDS: -+ conf->noinstall_recommends = 1; -+ break; - case ARGS_OPT_DOWNLOAD_ONLY: - conf->download_only = 1; - break; -@@ -300,6 +305,8 @@ usage() - printf("\t--noaction No action -- test only\n"); - printf("\t--download-only No action -- download only\n"); - printf("\t--nodeps Do not follow dependencies\n"); -+ printf("\t--no-install-recommends\n"); -+ printf("\t Do not install any recommended packages\n"); - printf("\t--force-removal-of-dependent-packages\n"); - printf("\t Remove package and all dependencies\n"); - printf("\t--autoremove Remove packages that were installed\n"); --- -2.1.3 - |