summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2014-02-19 15:15:17 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-20 14:28:12 +0000
commitd32189a11e03335548f3e81c4b1cccf23e000a34 (patch)
tree7e363be105ccaf12681a24c76b73142ebb62783d /meta/recipes-devtools
parent00e503a54e7ce1c31a2e4751ebb2c47855ddebfa (diff)
downloadpoky-d32189a11e03335548f3e81c4b1cccf23e000a34.tar.gz
opkg: Fix add-exclude.patch
The case statement for ARGS_OPT_ADD_EXCLUDE added to the argument handling switch statement in opkg was missing a "break;" at the end, so it was falling through into the handler for ARGS_OPT_NOACTION. Thus when "--add-exclude" was specified on the command line it was as if "--noaction" was also being specified. This appears to be the root cause of YP bug 5311. Tested using the case described by Alexandru Georgescu in YP bug 5311: MACHINE ??= "qemux86" IMAGE_INSTALL_append = " man" PACKAGE_EXCLUDE = "man" PACKAGE_CLASSES ?= "package_ipk" Built image and boot tested on qemu, ensured that man was not installed but the rest of the system was installed correctly. (From OE-Core rev: c269cea3117d7fa120c02bdb47d1adf18a1bcba1) Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Cc: Mark Hatle <mark.hatle@windriver.com> Cc: Saul Wold <saul.wold@intel.com> Cc: Alexandru Georgescu <alexandru.c.georgescu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> 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.patch5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/add-exclude.patch b/meta/recipes-devtools/opkg/opkg/add-exclude.patch
index 8489058b9e..8d328d5b86 100644
--- a/meta/recipes-devtools/opkg/opkg/add-exclude.patch
+++ b/meta/recipes-devtools/opkg/opkg/add-exclude.patch
@@ -84,7 +84,7 @@ Index: trunk/src/opkg-cl.c
84 {"test", 0, 0, ARGS_OPT_NOACTION}, 84 {"test", 0, 0, ARGS_OPT_NOACTION},
85 {"tmp-dir", 1, 0, 't'}, 85 {"tmp-dir", 1, 0, 't'},
86 {"tmp_dir", 1, 0, 't'}, 86 {"tmp_dir", 1, 0, 't'},
87@@ -198,6 +200,17 @@ args_parse(int argc, char *argv[]) 87@@ -198,6 +200,18 @@ args_parse(int argc, char *argv[])
88 } 88 }
89 free(tuple); 89 free(tuple);
90 break; 90 break;
@@ -99,10 +99,11 @@ Index: trunk/src/opkg-cl.c
99+ conf->exclude_list = realloc(conf->exclude_list, sizeof(char *) * conf->exclude_count); 99+ conf->exclude_list = realloc(conf->exclude_list, sizeof(char *) * conf->exclude_count);
100+ conf->exclude_list[conf->exclude_count - 1] = tuple; 100+ conf->exclude_list[conf->exclude_count - 1] = tuple;
101+ } 101+ }
102+ break;
102 case ARGS_OPT_NOACTION: 103 case ARGS_OPT_NOACTION:
103 conf->noaction = 1; 104 conf->noaction = 1;
104 break; 105 break;
105@@ -282,6 +295,7 @@ usage() 106@@ -282,6 +296,7 @@ usage()
106 printf("\t--offline-root <dir> offline installation of packages.\n"); 107 printf("\t--offline-root <dir> offline installation of packages.\n");
107 printf("\t--add-arch <arch>:<prio> Register architecture with given priority\n"); 108 printf("\t--add-arch <arch>:<prio> Register architecture with given priority\n");
108 printf("\t--add-dest <name>:<path> Register destination with given path\n"); 109 printf("\t--add-dest <name>:<path> Register destination with given path\n");