diff options
Diffstat (limited to 'meta/recipes-devtools/opkg/opkg/add-exclude.patch')
-rw-r--r-- | meta/recipes-devtools/opkg/opkg/add-exclude.patch | 131 |
1 files changed, 0 insertions, 131 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/add-exclude.patch b/meta/recipes-devtools/opkg/opkg/add-exclude.patch deleted file mode 100644 index 48de923590..0000000000 --- a/meta/recipes-devtools/opkg/opkg/add-exclude.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 60c3f93e95a3ca54ef0a7eebc5ef29a5d92d3110 Mon Sep 17 00:00:00 2001 -From: Paul Barker <paul@paulbarker.me.uk> -Date: Fri, 28 Mar 2014 15:20:22 +0000 -Subject: [PATCH 2/2] opkg-0.2.x: add-exclude - -Add a way to exclude specific packages from the install - -When an excluded package is required by another package an error -will be generated. If the excluded package is only recommended, -no error will be generated. - -The lifespan of the exclude_list covers the execution of the process, -so there is no need to free the data. - -v2: Use xmalloc instead of malloc and xrealloc instead of realloc. In opkg, -these functions are guaranteed not to return NULL. - -Upstream-Status: Accepted for v0.3.0 release with modifications - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Signed-off-by: Jonathan Liu <net147@gmail.com> -Signed-off-by: Paul Barker <paul@paulbarker.me.uk> ---- - libopkg/opkg_conf.c | 1 + - libopkg/opkg_conf.h | 2 ++ - libopkg/pkg_depends.c | 16 ++++++++++++++++ - src/opkg-cl.c | 15 +++++++++++++++ - 4 files changed, 34 insertions(+) - -diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c -index 4eee37b..1ab63fb 100644 ---- a/libopkg/opkg_conf.c -+++ b/libopkg/opkg_conf.c -@@ -447,6 +447,7 @@ opkg_conf_init(void) - pkg_dest_list_init(&conf->pkg_dest_list); - pkg_dest_list_init(&conf->tmp_dest_list); - nv_pair_list_init(&conf->arch_list); -+ conf->exclude_list = NULL; - - return 0; - } -diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h -index 2f189e0..6d6e613 100644 ---- a/libopkg/opkg_conf.h -+++ b/libopkg/opkg_conf.h -@@ -51,6 +51,8 @@ struct opkg_conf - pkg_dest_list_t pkg_dest_list; - pkg_dest_list_t tmp_dest_list; - nv_pair_list_t arch_list; -+ size_t exclude_count; -+ char ** exclude_list; - - int restrict_to_default_dest; - pkg_dest_t *default_dest; -diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c -index 41bf206..eb630d1 100644 ---- a/libopkg/pkg_depends.c -+++ b/libopkg/pkg_depends.c -@@ -204,6 +204,22 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, - continue; - } - -+ /* Check for excluded packages */ -+ if (satisfying_pkg != NULL && conf->exclude_list) { -+ int i, exclude = 0; -+ for (i = 0; i < conf->exclude_count; i++) { -+ if (!strcmp(satisfying_pkg->name, conf->exclude_list[i])) { -+ opkg_msg(NOTICE, "%s: exclude required package %s" -+ "at users request\n", -+ pkg->name, satisfying_pkg->name); -+ exclude = 1; -+ break; -+ } -+ } -+ if (exclude) -+ continue; -+ } -+ - opkg_msg(DEBUG, "satisfying_pkg=%p\n", satisfying_pkg); - if (satisfying_pkg != NULL) { - satisfier_entry_pkg = satisfying_pkg; -diff --git a/src/opkg-cl.c b/src/opkg-cl.c -index 6378380..f10d10b 100644 ---- a/src/opkg-cl.c -+++ b/src/opkg-cl.c -@@ -45,6 +45,7 @@ enum { - ARGS_OPT_PREFER_ARCH_TO_VERSION, - ARGS_OPT_ADD_ARCH, - ARGS_OPT_ADD_DEST, -+ ARGS_OPT_ADD_EXCLUDE, - ARGS_OPT_NOACTION, - ARGS_OPT_DOWNLOAD_ONLY, - ARGS_OPT_NODEPS, -@@ -97,6 +98,7 @@ static struct option long_options[] = { - {"offline-root", 1, 0, 'o'}, - {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH}, - {"add-dest", 1, 0, ARGS_OPT_ADD_DEST}, -+ {"add-exclude", 1, 0, ARGS_OPT_ADD_EXCLUDE}, - {"test", 0, 0, ARGS_OPT_NOACTION}, - {"tmp-dir", 1, 0, 't'}, - {"tmp_dir", 1, 0, 't'}, -@@ -200,6 +202,18 @@ args_parse(int argc, char *argv[]) - } - free(tuple); - break; -+ case ARGS_OPT_ADD_EXCLUDE: -+ tuple = xstrdup(optarg); -+ if (!conf->exclude_list) { -+ conf->exclude_count = 1; -+ conf->exclude_list = xmalloc(sizeof(char *) * conf->exclude_count); -+ conf->exclude_list[conf->exclude_count - 1] = tuple; -+ } else { -+ conf->exclude_count++; -+ conf->exclude_list = xrealloc(conf->exclude_list, sizeof(char *) * conf->exclude_count); -+ conf->exclude_list[conf->exclude_count - 1] = tuple; -+ } -+ break; - case ARGS_OPT_NOACTION: - conf->noaction = 1; - break; -@@ -287,6 +301,7 @@ usage() - printf("\t--offline-root <dir> offline installation of packages.\n"); - printf("\t--add-arch <arch>:<prio> Register architecture with given priority\n"); - printf("\t--add-dest <name>:<path> Register destination with given path\n"); -+ printf("\t--add-exclude <name> Register package to be excluded from install\n"); - printf("\t--prefer-arch-to-version Use the architecture priority package rather\n"); - printf("\t than the higher version one if more\n"); - printf("\t than one candidate is found.\n"); --- -2.1.3 - |