summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
diff options
context:
space:
mode:
authorAlejandro del Castillo <alejandro.delcastillo@ni.com>2015-09-01 09:17:53 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-03 12:43:14 +0100
commitd6b1171131656907d6bdbb9ce3115c444f06817e (patch)
treed9764b40ac128da99f79c2e45cfd7c370f5179e2 /meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
parentab50b1d11c28394b20b49242cc3481582a055bc8 (diff)
downloadpoky-d6b1171131656907d6bdbb9ce3115c444f06817e.tar.gz
opkg: upgrade to v0.3.0
Changes required: - Rename opkg-cl to opkg - Add libarchive dependency - Drop backport patches - Drop obsolete directory options - Add patch to handle empty index files Based on initial work by Paul Barker. (From OE-Core rev: 1dd2a9ea54f5a5497e23814f144f35ff15430d71) Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> CC: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/opkg/opkg/no-install-recommends.patch')
-rw-r--r--meta/recipes-devtools/opkg/opkg/no-install-recommends.patch91
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 @@
1From 2e2ccc7e7fc81a7eee2d004d3644efbc1be1ad73 Mon Sep 17 00:00:00 2001
2From: Paul Barker <paul@paulbarker.me.uk>
3Date: Fri, 28 Mar 2014 15:19:08 +0000
4Subject: [PATCH 1/2] opkg-0.2.x: no-install-recommends
5
6Add the ability to not install ANY recommended packages.
7
8Upstream-Status: Accepted for v0.3.0 release with modifications
9
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11---
12 libopkg/opkg_conf.h | 1 +
13 libopkg/pkg_depends.c | 3 ++-
14 src/opkg-cl.c | 7 +++++++
15 3 files changed, 10 insertions(+), 1 deletion(-)
16
17diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
18index e0e045a..2f189e0 100644
19--- a/libopkg/opkg_conf.h
20+++ b/libopkg/opkg_conf.h
21@@ -82,6 +82,7 @@ struct opkg_conf
22 int prefer_arch_to_version;
23 int check_signature;
24 int nodeps; /* do not follow dependencies */
25+ int noinstall_recommends;
26 char *offline_root;
27 char *overlay_root;
28 int query_all;
29diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
30index 8ab6508..41bf206 100644
31--- a/libopkg/pkg_depends.c
32+++ b/libopkg/pkg_depends.c
33@@ -21,6 +21,7 @@
34 #include <ctype.h>
35
36 #include "pkg.h"
37+#include "opkg_conf.h"
38 #include "opkg_utils.h"
39 #include "pkg_hash.h"
40 #include "opkg_message.h"
41@@ -196,7 +197,7 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied,
42 /* user request overrides package recommendation */
43 if (satisfying_pkg != NULL
44 && (compound_depend->type == RECOMMEND || compound_depend->type == SUGGEST)
45- && (satisfying_pkg->state_want == SW_DEINSTALL || satisfying_pkg->state_want == SW_PURGE)) {
46+ && (satisfying_pkg->state_want == SW_DEINSTALL || satisfying_pkg->state_want == SW_PURGE || conf->noinstall_recommends)) {
47 opkg_msg(NOTICE, "%s: ignoring recommendation for "
48 "%s at user request\n",
49 pkg->name, satisfying_pkg->name);
50diff --git a/src/opkg-cl.c b/src/opkg-cl.c
51index a1d121f..6378380 100644
52--- a/src/opkg-cl.c
53+++ b/src/opkg-cl.c
54@@ -51,6 +51,7 @@ enum {
55 ARGS_OPT_AUTOREMOVE,
56 ARGS_OPT_CACHE,
57 ARGS_OPT_COMBINE,
58+ ARGS_OPT_NOINSTALL_RECOMMENDS,
59 };
60
61 static struct option long_options[] = {
62@@ -91,6 +92,7 @@ static struct option long_options[] = {
63 {"noaction", 0, 0, ARGS_OPT_NOACTION},
64 {"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
65 {"nodeps", 0, 0, ARGS_OPT_NODEPS},
66+ {"no-install-recommends", 0, 0, ARGS_OPT_NOINSTALL_RECOMMENDS},
67 {"offline", 1, 0, 'o'},
68 {"offline-root", 1, 0, 'o'},
69 {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH},
70@@ -201,6 +203,9 @@ args_parse(int argc, char *argv[])
71 case ARGS_OPT_NOACTION:
72 conf->noaction = 1;
73 break;
74+ case ARGS_OPT_NOINSTALL_RECOMMENDS:
75+ conf->noinstall_recommends = 1;
76+ break;
77 case ARGS_OPT_DOWNLOAD_ONLY:
78 conf->download_only = 1;
79 break;
80@@ -300,6 +305,8 @@ usage()
81 printf("\t--noaction No action -- test only\n");
82 printf("\t--download-only No action -- download only\n");
83 printf("\t--nodeps Do not follow dependencies\n");
84+ printf("\t--no-install-recommends\n");
85+ printf("\t Do not install any recommended packages\n");
86 printf("\t--force-removal-of-dependent-packages\n");
87 printf("\t Remove package and all dependencies\n");
88 printf("\t--autoremove Remove packages that were installed\n");
89--
902.1.3
91