diff options
author | Paul Barker <paul@paulbarker.me.uk> | 2014-11-15 20:15:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-25 13:03:27 +0000 |
commit | 0ee83d781c40bc343092ace705d9bc1c010572bf (patch) | |
tree | 8fd949a6d6dbdd69280b913029005e609e64d50c /meta/recipes-devtools/opkg/opkg/no-install-recommends.patch | |
parent | 11d9f02cc6b793162001b4a1ffd53ef2eeb436d8 (diff) | |
download | poky-0ee83d781c40bc343092ace705d9bc1c010572bf.tar.gz |
opkg: Upgrade to v0.2.4
The patches for opkg have been rebased using git so that they apply cleanly onto
the new release.
(From OE-Core rev: 514c349bac19608e65f566c989f1971ca58f6944)
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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.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 @@ | |||
1 | From 610207c9bc82f20c77d6f234465e36857c997ea0 Mon Sep 17 00:00:00 2001 | 1 | From 2e2ccc7e7fc81a7eee2d004d3644efbc1be1ad73 Mon Sep 17 00:00:00 2001 |
2 | From: Paul Barker <paul@paulbarker.me.uk> | 2 | From: Paul Barker <paul@paulbarker.me.uk> |
3 | Date: Fri, 28 Mar 2014 15:19:08 +0000 | 3 | Date: Fri, 28 Mar 2014 15:19:08 +0000 |
4 | Subject: [PATCH 1/2] opkg-0.2.x: no-install-recommends | 4 | Subject: [PATCH 1/2] opkg-0.2.x: no-install-recommends |
@@ -15,7 +15,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | |||
15 | 3 files changed, 10 insertions(+), 1 deletion(-) | 15 | 3 files changed, 10 insertions(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h | 17 | diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h |
18 | index 38fa375..6045a58 100644 | 18 | index e0e045a..2f189e0 100644 |
19 | --- a/libopkg/opkg_conf.h | 19 | --- a/libopkg/opkg_conf.h |
20 | +++ b/libopkg/opkg_conf.h | 20 | +++ b/libopkg/opkg_conf.h |
21 | @@ -82,6 +82,7 @@ struct opkg_conf | 21 | @@ -82,6 +82,7 @@ struct opkg_conf |
@@ -27,10 +27,10 @@ index 38fa375..6045a58 100644 | |||
27 | char *overlay_root; | 27 | char *overlay_root; |
28 | int query_all; | 28 | int query_all; |
29 | diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c | 29 | diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c |
30 | index a4df7de..d2d279e 100644 | 30 | index 8ab6508..41bf206 100644 |
31 | --- a/libopkg/pkg_depends.c | 31 | --- a/libopkg/pkg_depends.c |
32 | +++ b/libopkg/pkg_depends.c | 32 | +++ b/libopkg/pkg_depends.c |
33 | @@ -19,6 +19,7 @@ | 33 | @@ -21,6 +21,7 @@ |
34 | #include <ctype.h> | 34 | #include <ctype.h> |
35 | 35 | ||
36 | #include "pkg.h" | 36 | #include "pkg.h" |
@@ -38,7 +38,7 @@ index a4df7de..d2d279e 100644 | |||
38 | #include "opkg_utils.h" | 38 | #include "opkg_utils.h" |
39 | #include "pkg_hash.h" | 39 | #include "pkg_hash.h" |
40 | #include "opkg_message.h" | 40 | #include "opkg_message.h" |
41 | @@ -204,7 +205,7 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, | 41 | @@ -196,7 +197,7 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, |
42 | /* user request overrides package recommendation */ | 42 | /* user request overrides package recommendation */ |
43 | if (satisfying_pkg != NULL | 43 | if (satisfying_pkg != NULL |
44 | && (compound_depend->type == RECOMMEND || compound_depend->type == SUGGEST) | 44 | && (compound_depend->type == RECOMMEND || compound_depend->type == SUGGEST) |
@@ -48,18 +48,18 @@ index a4df7de..d2d279e 100644 | |||
48 | "%s at user request\n", | 48 | "%s at user request\n", |
49 | pkg->name, satisfying_pkg->name); | 49 | pkg->name, satisfying_pkg->name); |
50 | diff --git a/src/opkg-cl.c b/src/opkg-cl.c | 50 | diff --git a/src/opkg-cl.c b/src/opkg-cl.c |
51 | index b711511..0315d41 100644 | 51 | index a1d121f..6378380 100644 |
52 | --- a/src/opkg-cl.c | 52 | --- a/src/opkg-cl.c |
53 | +++ b/src/opkg-cl.c | 53 | +++ b/src/opkg-cl.c |
54 | @@ -50,6 +50,7 @@ enum { | 54 | @@ -51,6 +51,7 @@ enum { |
55 | ARGS_OPT_NODEPS, | ||
56 | ARGS_OPT_AUTOREMOVE, | 55 | ARGS_OPT_AUTOREMOVE, |
57 | ARGS_OPT_CACHE, | 56 | ARGS_OPT_CACHE, |
57 | ARGS_OPT_COMBINE, | ||
58 | + ARGS_OPT_NOINSTALL_RECOMMENDS, | 58 | + ARGS_OPT_NOINSTALL_RECOMMENDS, |
59 | }; | 59 | }; |
60 | 60 | ||
61 | static struct option long_options[] = { | 61 | static struct option long_options[] = { |
62 | @@ -89,6 +90,7 @@ static struct option long_options[] = { | 62 | @@ -91,6 +92,7 @@ static struct option long_options[] = { |
63 | {"noaction", 0, 0, ARGS_OPT_NOACTION}, | 63 | {"noaction", 0, 0, ARGS_OPT_NOACTION}, |
64 | {"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY}, | 64 | {"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY}, |
65 | {"nodeps", 0, 0, ARGS_OPT_NODEPS}, | 65 | {"nodeps", 0, 0, ARGS_OPT_NODEPS}, |
@@ -67,7 +67,7 @@ index b711511..0315d41 100644 | |||
67 | {"offline", 1, 0, 'o'}, | 67 | {"offline", 1, 0, 'o'}, |
68 | {"offline-root", 1, 0, 'o'}, | 68 | {"offline-root", 1, 0, 'o'}, |
69 | {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH}, | 69 | {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH}, |
70 | @@ -199,6 +201,9 @@ args_parse(int argc, char *argv[]) | 70 | @@ -201,6 +203,9 @@ args_parse(int argc, char *argv[]) |
71 | case ARGS_OPT_NOACTION: | 71 | case ARGS_OPT_NOACTION: |
72 | conf->noaction = 1; | 72 | conf->noaction = 1; |
73 | break; | 73 | break; |
@@ -77,7 +77,7 @@ index b711511..0315d41 100644 | |||
77 | case ARGS_OPT_DOWNLOAD_ONLY: | 77 | case ARGS_OPT_DOWNLOAD_ONLY: |
78 | conf->download_only = 1; | 78 | conf->download_only = 1; |
79 | break; | 79 | break; |
80 | @@ -293,6 +298,8 @@ usage() | 80 | @@ -300,6 +305,8 @@ usage() |
81 | printf("\t--noaction No action -- test only\n"); | 81 | printf("\t--noaction No action -- test only\n"); |
82 | printf("\t--download-only No action -- download only\n"); | 82 | printf("\t--download-only No action -- download only\n"); |
83 | printf("\t--nodeps Do not follow dependencies\n"); | 83 | printf("\t--nodeps Do not follow dependencies\n"); |
@@ -87,5 +87,5 @@ index b711511..0315d41 100644 | |||
87 | printf("\t Remove package and all dependencies\n"); | 87 | printf("\t Remove package and all dependencies\n"); |
88 | printf("\t--autoremove Remove packages that were installed\n"); | 88 | printf("\t--autoremove Remove packages that were installed\n"); |
89 | -- | 89 | -- |
90 | 1.9.1 | 90 | 2.1.3 |
91 | 91 | ||