summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/opkg/opkg/add-exclude.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/opkg/opkg/add-exclude.patch')
-rw-r--r--meta/recipes-devtools/opkg/opkg/add-exclude.patch22
1 files changed, 11 insertions, 11 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