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 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch index bcca56c6ce..b4aed9cd6b 100644 --- a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch +++ b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch @@ -1,4 +1,4 @@ -From 610207c9bc82f20c77d6f234465e36857c997ea0 Mon Sep 17 00:00:00 2001 +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 @@ -15,7 +15,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h -index 38fa375..6045a58 100644 +index e0e045a..2f189e0 100644 --- a/libopkg/opkg_conf.h +++ b/libopkg/opkg_conf.h @@ -82,6 +82,7 @@ struct opkg_conf @@ -27,10 +27,10 @@ index 38fa375..6045a58 100644 char *overlay_root; int query_all; diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c -index a4df7de..d2d279e 100644 +index 8ab6508..41bf206 100644 --- a/libopkg/pkg_depends.c +++ b/libopkg/pkg_depends.c -@@ -19,6 +19,7 @@ +@@ -21,6 +21,7 @@ #include <ctype.h> #include "pkg.h" @@ -38,7 +38,7 @@ index a4df7de..d2d279e 100644 #include "opkg_utils.h" #include "pkg_hash.h" #include "opkg_message.h" -@@ -204,7 +205,7 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, +@@ -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) @@ -48,18 +48,18 @@ index a4df7de..d2d279e 100644 "%s at user request\n", pkg->name, satisfying_pkg->name); diff --git a/src/opkg-cl.c b/src/opkg-cl.c -index b711511..0315d41 100644 +index a1d121f..6378380 100644 --- a/src/opkg-cl.c +++ b/src/opkg-cl.c -@@ -50,6 +50,7 @@ enum { - ARGS_OPT_NODEPS, +@@ -51,6 +51,7 @@ enum { ARGS_OPT_AUTOREMOVE, ARGS_OPT_CACHE, + ARGS_OPT_COMBINE, + ARGS_OPT_NOINSTALL_RECOMMENDS, }; static struct option long_options[] = { -@@ -89,6 +90,7 @@ 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}, @@ -67,7 +67,7 @@ index b711511..0315d41 100644 {"offline", 1, 0, 'o'}, {"offline-root", 1, 0, 'o'}, {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH}, -@@ -199,6 +201,9 @@ args_parse(int argc, char *argv[]) +@@ -201,6 +203,9 @@ args_parse(int argc, char *argv[]) case ARGS_OPT_NOACTION: conf->noaction = 1; break; @@ -77,7 +77,7 @@ index b711511..0315d41 100644 case ARGS_OPT_DOWNLOAD_ONLY: conf->download_only = 1; break; -@@ -293,6 +298,8 @@ usage() +@@ -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"); @@ -87,5 +87,5 @@ index b711511..0315d41 100644 printf("\t Remove package and all dependencies\n"); printf("\t--autoremove Remove packages that were installed\n"); -- -1.9.1 +2.1.3 |