summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2014-04-24 21:56:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 17:19:19 +0100
commit9183987e6b6302a40bed83dc0bcf908d9a00b86b (patch)
tree8b854527beb7afd96f8fa43a30d64dace5c5a5a3 /meta/recipes-devtools
parent4c14b094985216c433d330fb3d9532d4b6c91fcf (diff)
downloadpoky-9183987e6b6302a40bed83dc0bcf908d9a00b86b.tar.gz
opkg: Upgrade to v0.2.2
The patches for opkg have been rebased using git so that they apply cleanly onto the new release. (From OE-Core rev: 354e25fe51a8e85122898d1849008ace5dbe9461) Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/opkg/opkg/add-exclude.patch64
-rw-r--r--meta/recipes-devtools/opkg/opkg/no-install-recommends.patch53
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.2.2.bb (renamed from meta/recipes-devtools/opkg/opkg_0.2.1.bb)4
3 files changed, 74 insertions, 47 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/add-exclude.patch b/meta/recipes-devtools/opkg/opkg/add-exclude.patch
index 8d328d5b86..cf95ee22c6 100644
--- a/meta/recipes-devtools/opkg/opkg/add-exclude.patch
+++ b/meta/recipes-devtools/opkg/opkg/add-exclude.patch
@@ -1,3 +1,8 @@
1From 45a1e33a048f479b15b99d09df3dd1b62fef0253 Mon Sep 17 00:00:00 2001
2From: Paul Barker <paul@paulbarker.me.uk>
3Date: Fri, 28 Mar 2014 15:20:22 +0000
4Subject: [PATCH 2/2] opkg-0.2.x: add-exclude
5
1Add a way to exclude specific packages from the install 6Add a way to exclude specific packages from the install
2 7
3When an excluded package is required by another package an error 8When an excluded package is required by another package an error
@@ -11,11 +16,17 @@ Upstream-Status: Pending
11 16
12Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 17Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
13Signed-off-by: Jonathan Liu <net147@gmail.com> 18Signed-off-by: Jonathan Liu <net147@gmail.com>
19---
20 libopkg/opkg_conf.c | 1 +
21 libopkg/opkg_conf.h | 2 ++
22 libopkg/pkg_depends.c | 16 ++++++++++++++++
23 src/opkg-cl.c | 15 +++++++++++++++
24 4 files changed, 34 insertions(+)
14 25
15Index: trunk/libopkg/opkg_conf.c 26diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
16=================================================================== 27index 1e65bad..9c4c854 100644
17--- trunk.orig/libopkg/opkg_conf.c 28--- a/libopkg/opkg_conf.c
18+++ trunk/libopkg/opkg_conf.c 29+++ b/libopkg/opkg_conf.c
19@@ -442,6 +442,7 @@ opkg_conf_init(void) 30@@ -442,6 +442,7 @@ opkg_conf_init(void)
20 pkg_dest_list_init(&conf->pkg_dest_list); 31 pkg_dest_list_init(&conf->pkg_dest_list);
21 pkg_dest_list_init(&conf->tmp_dest_list); 32 pkg_dest_list_init(&conf->tmp_dest_list);
@@ -24,11 +35,11 @@ Index: trunk/libopkg/opkg_conf.c
24 35
25 return 0; 36 return 0;
26 } 37 }
27Index: trunk/libopkg/opkg_conf.h 38diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
28=================================================================== 39index 6045a58..ad58849 100644
29--- trunk.orig/libopkg/opkg_conf.h 40--- a/libopkg/opkg_conf.h
30+++ trunk/libopkg/opkg_conf.h 41+++ b/libopkg/opkg_conf.h
31@@ -49,6 +49,8 @@ struct opkg_conf 42@@ -51,6 +51,8 @@ struct opkg_conf
32 pkg_dest_list_t pkg_dest_list; 43 pkg_dest_list_t pkg_dest_list;
33 pkg_dest_list_t tmp_dest_list; 44 pkg_dest_list_t tmp_dest_list;
34 nv_pair_list_t arch_list; 45 nv_pair_list_t arch_list;
@@ -37,11 +48,11 @@ Index: trunk/libopkg/opkg_conf.h
37 48
38 int restrict_to_default_dest; 49 int restrict_to_default_dest;
39 pkg_dest_t *default_dest; 50 pkg_dest_t *default_dest;
40Index: trunk/libopkg/pkg_depends.c 51diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
41=================================================================== 52index d2d279e..b572e18 100644
42--- trunk.orig/libopkg/pkg_depends.c 53--- a/libopkg/pkg_depends.c
43+++ trunk/libopkg/pkg_depends.c 54+++ b/libopkg/pkg_depends.c
44@@ -212,6 +212,22 @@ pkg_hash_fetch_unsatisfied_dependencies( 55@@ -212,6 +212,22 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied,
45 continue; 56 continue;
46 } 57 }
47 58
@@ -64,10 +75,10 @@ Index: trunk/libopkg/pkg_depends.c
64 opkg_msg(DEBUG, "satisfying_pkg=%p\n", satisfying_pkg); 75 opkg_msg(DEBUG, "satisfying_pkg=%p\n", satisfying_pkg);
65 if (satisfying_pkg != NULL) { 76 if (satisfying_pkg != NULL) {
66 satisfier_entry_pkg = satisfying_pkg; 77 satisfier_entry_pkg = satisfying_pkg;
67Index: trunk/src/opkg-cl.c 78diff --git a/src/opkg-cl.c b/src/opkg-cl.c
68=================================================================== 79index 0315d41..0db2794 100644
69--- trunk.orig/src/opkg-cl.c 80--- a/src/opkg-cl.c
70+++ trunk/src/opkg-cl.c 81+++ b/src/opkg-cl.c
71@@ -45,6 +45,7 @@ enum { 82@@ -45,6 +45,7 @@ enum {
72 ARGS_OPT_PREFER_ARCH_TO_VERSION, 83 ARGS_OPT_PREFER_ARCH_TO_VERSION,
73 ARGS_OPT_ADD_ARCH, 84 ARGS_OPT_ADD_ARCH,
@@ -104,10 +115,13 @@ Index: trunk/src/opkg-cl.c
104 conf->noaction = 1; 115 conf->noaction = 1;
105 break; 116 break;
106@@ -282,6 +296,7 @@ usage() 117@@ -282,6 +296,7 @@ usage()
107 printf("\t--offline-root <dir> offline installation of packages.\n"); 118 printf("\t--offline-root <dir> offline installation of packages.\n");
108 printf("\t--add-arch <arch>:<prio> Register architecture with given priority\n"); 119 printf("\t--add-arch <arch>:<prio> Register architecture with given priority\n");
109 printf("\t--add-dest <name>:<path> Register destination with given path\n"); 120 printf("\t--add-dest <name>:<path> Register destination with given path\n");
110+ printf("\t--add-exclude <name> Register package to be excluded from install\n"); 121+ printf("\t--add-exclude <name> Register package to be excluded from install\n");
111 printf("\t--prefer-arch-to-version\t Use the architecture priority package rather\n"); 122 printf("\t--prefer-arch-to-version Use the architecture priority package rather\n");
112 printf("\t than the higher version one if more\n"); 123 printf("\t than the higher version one if more\n");
113 printf("\t than one candidate is found.\n"); 124 printf("\t than one candidate is found.\n");
125--
1261.9.1
127
diff --git a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
index 6d1ccecbf4..bcca56c6ce 100644
--- a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
+++ b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
@@ -1,14 +1,24 @@
1From 610207c9bc82f20c77d6f234465e36857c997ea0 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
1Add the ability to not install ANY recommended packages. 6Add the ability to not install ANY recommended packages.
2 7
3Upstream-Status: Pending 8Upstream-Status: Pending
4 9
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 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(-)
6 16
7Index: trunk/libopkg/opkg_conf.h 17diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
8=================================================================== 18index 38fa375..6045a58 100644
9--- trunk.orig/libopkg/opkg_conf.h 19--- a/libopkg/opkg_conf.h
10+++ trunk/libopkg/opkg_conf.h 20+++ b/libopkg/opkg_conf.h
11@@ -80,6 +80,7 @@ struct opkg_conf 21@@ -82,6 +82,7 @@ struct opkg_conf
12 int prefer_arch_to_version; 22 int prefer_arch_to_version;
13 int check_signature; 23 int check_signature;
14 int nodeps; /* do not follow dependencies */ 24 int nodeps; /* do not follow dependencies */
@@ -16,10 +26,10 @@ Index: trunk/libopkg/opkg_conf.h
16 char *offline_root; 26 char *offline_root;
17 char *overlay_root; 27 char *overlay_root;
18 int query_all; 28 int query_all;
19Index: trunk/libopkg/pkg_depends.c 29diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
20=================================================================== 30index a4df7de..d2d279e 100644
21--- trunk.orig/libopkg/pkg_depends.c 31--- a/libopkg/pkg_depends.c
22+++ trunk/libopkg/pkg_depends.c 32+++ b/libopkg/pkg_depends.c
23@@ -19,6 +19,7 @@ 33@@ -19,6 +19,7 @@
24 #include <ctype.h> 34 #include <ctype.h>
25 35
@@ -28,7 +38,7 @@ Index: trunk/libopkg/pkg_depends.c
28 #include "opkg_utils.h" 38 #include "opkg_utils.h"
29 #include "pkg_hash.h" 39 #include "pkg_hash.h"
30 #include "opkg_message.h" 40 #include "opkg_message.h"
31@@ -204,7 +205,7 @@ pkg_hash_fetch_unsatisfied_dependencies( 41@@ -204,7 +205,7 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied,
32 /* user request overrides package recommendation */ 42 /* user request overrides package recommendation */
33 if (satisfying_pkg != NULL 43 if (satisfying_pkg != NULL
34 && (compound_depend->type == RECOMMEND || compound_depend->type == SUGGEST) 44 && (compound_depend->type == RECOMMEND || compound_depend->type == SUGGEST)
@@ -37,10 +47,10 @@ Index: trunk/libopkg/pkg_depends.c
37 opkg_msg(NOTICE, "%s: ignoring recommendation for " 47 opkg_msg(NOTICE, "%s: ignoring recommendation for "
38 "%s at user request\n", 48 "%s at user request\n",
39 pkg->name, satisfying_pkg->name); 49 pkg->name, satisfying_pkg->name);
40Index: trunk/src/opkg-cl.c 50diff --git a/src/opkg-cl.c b/src/opkg-cl.c
41=================================================================== 51index b711511..0315d41 100644
42--- trunk.orig/src/opkg-cl.c 52--- a/src/opkg-cl.c
43+++ trunk/src/opkg-cl.c 53+++ b/src/opkg-cl.c
44@@ -50,6 +50,7 @@ enum { 54@@ -50,6 +50,7 @@ enum {
45 ARGS_OPT_NODEPS, 55 ARGS_OPT_NODEPS,
46 ARGS_OPT_AUTOREMOVE, 56 ARGS_OPT_AUTOREMOVE,
@@ -68,11 +78,14 @@ Index: trunk/src/opkg-cl.c
68 conf->download_only = 1; 78 conf->download_only = 1;
69 break; 79 break;
70@@ -293,6 +298,8 @@ usage() 80@@ -293,6 +298,8 @@ usage()
71 printf("\t--noaction No action -- test only\n"); 81 printf("\t--noaction No action -- test only\n");
72 printf("\t--download-only No action -- download only\n"); 82 printf("\t--download-only No action -- download only\n");
73 printf("\t--nodeps Do not follow dependencies\n"); 83 printf("\t--nodeps Do not follow dependencies\n");
74+ printf("\t--no-install-recommends\n"); 84+ printf("\t--no-install-recommends\n");
75+ printf("\t Do not install any recommended packages\n"); 85+ printf("\t Do not install any recommended packages\n");
76 printf("\t--force-removal-of-dependent-packages\n"); 86 printf("\t--force-removal-of-dependent-packages\n");
77 printf("\t Remove package and all dependencies\n"); 87 printf("\t Remove package and all dependencies\n");
78 printf("\t--autoremove Remove packages that were installed\n"); 88 printf("\t--autoremove Remove packages that were installed\n");
89--
901.9.1
91
diff --git a/meta/recipes-devtools/opkg/opkg_0.2.1.bb b/meta/recipes-devtools/opkg/opkg_0.2.2.bb
index 09c0ccad4d..3dd74898b3 100644
--- a/meta/recipes-devtools/opkg/opkg_0.2.1.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.2.2.bb
@@ -8,5 +8,5 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
8 8
9S = "${WORKDIR}/${BPN}-${PV}" 9S = "${WORKDIR}/${BPN}-${PV}"
10 10
11SRC_URI[md5sum] = "1881d170b9dfbd7ecf0aa468cb9779c0" 11SRC_URI[md5sum] = "b3ecef90d67d2aed2a14c2116a027482"
12SRC_URI[sha256sum] = "43c2d95e4cd3ef5e341e233e63de78698ec7522bca446972963160bb0f1e62db" 12SRC_URI[sha256sum] = "aa554ce7538544aac4f69e8274a0f9b8b433b8c3b1d00704bd393f713303a12b"