diff options
Diffstat (limited to 'meta/recipes-devtools/opkg/opkg/add-exclude.patch')
-rw-r--r-- | meta/recipes-devtools/opkg/opkg/add-exclude.patch | 64 |
1 files changed, 39 insertions, 25 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 @@ | |||
1 | From 45a1e33a048f479b15b99d09df3dd1b62fef0253 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Barker <paul@paulbarker.me.uk> | ||
3 | Date: Fri, 28 Mar 2014 15:20:22 +0000 | ||
4 | Subject: [PATCH 2/2] opkg-0.2.x: add-exclude | ||
5 | |||
1 | Add a way to exclude specific packages from the install | 6 | Add a way to exclude specific packages from the install |
2 | 7 | ||
3 | When an excluded package is required by another package an error | 8 | When an excluded package is required by another package an error |
@@ -11,11 +16,17 @@ Upstream-Status: Pending | |||
11 | 16 | ||
12 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 17 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
13 | Signed-off-by: Jonathan Liu <net147@gmail.com> | 18 | Signed-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 | ||
15 | Index: trunk/libopkg/opkg_conf.c | 26 | diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c |
16 | =================================================================== | 27 | index 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 | } |
27 | Index: trunk/libopkg/opkg_conf.h | 38 | diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h |
28 | =================================================================== | 39 | index 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; |
40 | Index: trunk/libopkg/pkg_depends.c | 51 | diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c |
41 | =================================================================== | 52 | index 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; |
67 | Index: trunk/src/opkg-cl.c | 78 | diff --git a/src/opkg-cl.c b/src/opkg-cl.c |
68 | =================================================================== | 79 | index 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 | -- | ||
126 | 1.9.1 | ||
127 | |||