summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2014-11-15 20:15:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-25 13:03:27 +0000
commit0ee83d781c40bc343092ace705d9bc1c010572bf (patch)
tree8fd949a6d6dbdd69280b913029005e609e64d50c /meta
parent11d9f02cc6b793162001b4a1ffd53ef2eeb436d8 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/opkg/opkg/add-exclude.patch22
-rw-r--r--meta/recipes-devtools/opkg/opkg/no-install-recommends.patch24
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.2.4.bb (renamed from meta/recipes-devtools/opkg/opkg_0.2.2.bb)4
3 files changed, 25 insertions, 25 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/add-exclude.patch b/meta/recipes-devtools/opkg/opkg/add-exclude.patch
index c684534efb..a10014dee9 100644
--- a/meta/recipes-devtools/opkg/opkg/add-exclude.patch
+++ b/meta/recipes-devtools/opkg/opkg/add-exclude.patch
@@ -1,4 +1,4 @@
1From 5d707bbfcafd88b8b5b5821972c8c958fc3b2039 Mon Sep 17 00:00:00 2001 1From 60c3f93e95a3ca54ef0a7eebc5ef29a5d92d3110 Mon Sep 17 00:00:00 2001
2From: Paul Barker <paul@paulbarker.me.uk> 2From: Paul Barker <paul@paulbarker.me.uk>
3Date: Fri, 28 Mar 2014 15:20:22 +0000 3Date: Fri, 28 Mar 2014 15:20:22 +0000
4Subject: [PATCH 2/2] opkg-0.2.x: add-exclude 4Subject: [PATCH 2/2] opkg-0.2.x: add-exclude
@@ -28,10 +28,10 @@ Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
28 4 files changed, 34 insertions(+) 28 4 files changed, 34 insertions(+)
29 29
30diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c 30diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
31index 1e65bad..9c4c854 100644 31index 4eee37b..1ab63fb 100644
32--- a/libopkg/opkg_conf.c 32--- a/libopkg/opkg_conf.c
33+++ b/libopkg/opkg_conf.c 33+++ b/libopkg/opkg_conf.c
34@@ -442,6 +442,7 @@ opkg_conf_init(void) 34@@ -447,6 +447,7 @@ opkg_conf_init(void)
35 pkg_dest_list_init(&conf->pkg_dest_list); 35 pkg_dest_list_init(&conf->pkg_dest_list);
36 pkg_dest_list_init(&conf->tmp_dest_list); 36 pkg_dest_list_init(&conf->tmp_dest_list);
37 nv_pair_list_init(&conf->arch_list); 37 nv_pair_list_init(&conf->arch_list);
@@ -40,7 +40,7 @@ index 1e65bad..9c4c854 100644
40 return 0; 40 return 0;
41 } 41 }
42diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h 42diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
43index 6045a58..ad58849 100644 43index 2f189e0..6d6e613 100644
44--- a/libopkg/opkg_conf.h 44--- a/libopkg/opkg_conf.h
45+++ b/libopkg/opkg_conf.h 45+++ b/libopkg/opkg_conf.h
46@@ -51,6 +51,8 @@ struct opkg_conf 46@@ -51,6 +51,8 @@ struct opkg_conf
@@ -53,10 +53,10 @@ index 6045a58..ad58849 100644
53 int restrict_to_default_dest; 53 int restrict_to_default_dest;
54 pkg_dest_t *default_dest; 54 pkg_dest_t *default_dest;
55diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c 55diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
56index d2d279e..b572e18 100644 56index 41bf206..eb630d1 100644
57--- a/libopkg/pkg_depends.c 57--- a/libopkg/pkg_depends.c
58+++ b/libopkg/pkg_depends.c 58+++ b/libopkg/pkg_depends.c
59@@ -212,6 +212,22 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, 59@@ -204,6 +204,22 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied,
60 continue; 60 continue;
61 } 61 }
62 62
@@ -80,7 +80,7 @@ index d2d279e..b572e18 100644
80 if (satisfying_pkg != NULL) { 80 if (satisfying_pkg != NULL) {
81 satisfier_entry_pkg = satisfying_pkg; 81 satisfier_entry_pkg = satisfying_pkg;
82diff --git a/src/opkg-cl.c b/src/opkg-cl.c 82diff --git a/src/opkg-cl.c b/src/opkg-cl.c
83index 0315d41..67366b9 100644 83index 6378380..f10d10b 100644
84--- a/src/opkg-cl.c 84--- a/src/opkg-cl.c
85+++ b/src/opkg-cl.c 85+++ b/src/opkg-cl.c
86@@ -45,6 +45,7 @@ enum { 86@@ -45,6 +45,7 @@ enum {
@@ -91,7 +91,7 @@ index 0315d41..67366b9 100644
91 ARGS_OPT_NOACTION, 91 ARGS_OPT_NOACTION,
92 ARGS_OPT_DOWNLOAD_ONLY, 92 ARGS_OPT_DOWNLOAD_ONLY,
93 ARGS_OPT_NODEPS, 93 ARGS_OPT_NODEPS,
94@@ -95,6 +96,7 @@ static struct option long_options[] = { 94@@ -97,6 +98,7 @@ static struct option long_options[] = {
95 {"offline-root", 1, 0, 'o'}, 95 {"offline-root", 1, 0, 'o'},
96 {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH}, 96 {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH},
97 {"add-dest", 1, 0, ARGS_OPT_ADD_DEST}, 97 {"add-dest", 1, 0, ARGS_OPT_ADD_DEST},
@@ -99,7 +99,7 @@ index 0315d41..67366b9 100644
99 {"test", 0, 0, ARGS_OPT_NOACTION}, 99 {"test", 0, 0, ARGS_OPT_NOACTION},
100 {"tmp-dir", 1, 0, 't'}, 100 {"tmp-dir", 1, 0, 't'},
101 {"tmp_dir", 1, 0, 't'}, 101 {"tmp_dir", 1, 0, 't'},
102@@ -198,6 +200,18 @@ args_parse(int argc, char *argv[]) 102@@ -200,6 +202,18 @@ args_parse(int argc, char *argv[])
103 } 103 }
104 free(tuple); 104 free(tuple);
105 break; 105 break;
@@ -118,7 +118,7 @@ index 0315d41..67366b9 100644
118 case ARGS_OPT_NOACTION: 118 case ARGS_OPT_NOACTION:
119 conf->noaction = 1; 119 conf->noaction = 1;
120 break; 120 break;
121@@ -282,6 +296,7 @@ usage() 121@@ -287,6 +301,7 @@ usage()
122 printf("\t--offline-root <dir> offline installation of packages.\n"); 122 printf("\t--offline-root <dir> offline installation of packages.\n");
123 printf("\t--add-arch <arch>:<prio> Register architecture with given priority\n"); 123 printf("\t--add-arch <arch>:<prio> Register architecture with given priority\n");
124 printf("\t--add-dest <name>:<path> Register destination with given path\n"); 124 printf("\t--add-dest <name>:<path> Register destination with given path\n");
@@ -127,5 +127,5 @@ index 0315d41..67366b9 100644
127 printf("\t than the higher version one if more\n"); 127 printf("\t than the higher version one if more\n");
128 printf("\t than one candidate is found.\n"); 128 printf("\t than one candidate is found.\n");
129-- 129--
1302.0.4 1302.1.3
131 131
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 @@
1From 610207c9bc82f20c77d6f234465e36857c997ea0 Mon Sep 17 00:00:00 2001 1From 2e2ccc7e7fc81a7eee2d004d3644efbc1be1ad73 Mon Sep 17 00:00:00 2001
2From: Paul Barker <paul@paulbarker.me.uk> 2From: Paul Barker <paul@paulbarker.me.uk>
3Date: Fri, 28 Mar 2014 15:19:08 +0000 3Date: Fri, 28 Mar 2014 15:19:08 +0000
4Subject: [PATCH 1/2] opkg-0.2.x: no-install-recommends 4Subject: [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
17diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h 17diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
18index 38fa375..6045a58 100644 18index 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;
29diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c 29diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
30index a4df7de..d2d279e 100644 30index 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);
50diff --git a/src/opkg-cl.c b/src/opkg-cl.c 50diff --git a/src/opkg-cl.c b/src/opkg-cl.c
51index b711511..0315d41 100644 51index 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--
901.9.1 902.1.3
91 91
diff --git a/meta/recipes-devtools/opkg/opkg_0.2.2.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
index 867ff7a8ee..2cca63c560 100644
--- a/meta/recipes-devtools/opkg/opkg_0.2.2.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
@@ -9,5 +9,5 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
9 9
10S = "${WORKDIR}/${BPN}-${PV}" 10S = "${WORKDIR}/${BPN}-${PV}"
11 11
12SRC_URI[md5sum] = "b3ecef90d67d2aed2a14c2116a027482" 12SRC_URI[md5sum] = "40ed2aee15abc8d550539449630091bd"
13SRC_URI[sha256sum] = "aa554ce7538544aac4f69e8274a0f9b8b433b8c3b1d00704bd393f713303a12b" 13SRC_URI[sha256sum] = "0f40c7e457d81edf9aedc07c778f4697111ab163a38ef95999faece015453086"