diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2013-07-05 10:29:29 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:44:13 +0100 |
commit | 131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0 (patch) | |
tree | cde6580df91d24345c12bac7b171e2d0d35d8d17 /meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch | |
parent | 0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 (diff) | |
download | poky-131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0.tar.gz |
busybox: upgrade to stable 1.21.1
Merged or backported patches are dropped.
The wget_dl_dir_fix.patch was submitted more than 1 year ago, it's
about the -P option behavior, and it's not accepted, so I dropped
this patch too.
(From OE-Core rev: a2f31a6a6accb8eee2084cb39edb8e9af4b4189f)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch')
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch b/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch deleted file mode 100644 index 3003965d8c..0000000000 --- a/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | In cases where busybox wget is invoked with -P <...> and the url ends | ||
2 | in "/", the download directory is ignored (ie the file index.html is | ||
3 | implied), this change enables the -P option for those urls. | ||
4 | |||
5 | Signed-off-by: Amy Fong <amy.fong@windriver.com> | ||
6 | Upstream-Status: Submitted | ||
7 | --- | ||
8 | networking/wget.c | 10 +++++++--- | ||
9 | 1 file changed, 7 insertions(+), 3 deletions(-) | ||
10 | |||
11 | --- a/networking/wget.c | ||
12 | +++ b/networking/wget.c | ||
13 | @@ -589,10 +589,14 @@ | ||
14 | if (!(option_mask32 & WGET_OPT_OUTNAME)) { | ||
15 | G.fname_out = bb_get_last_path_component_nostrip(target.path); | ||
16 | /* handle "wget http://kernel.org//" */ | ||
17 | - if (G.fname_out[0] == '/' || !G.fname_out[0]) | ||
18 | - G.fname_out = (char*)"index.html"; | ||
19 | + if (G.fname_out[0] == '/' || !G.fname_out[0]) { | ||
20 | + /* bug: if we provide a default name, we should still look at -P option */ | ||
21 | + if (G.dir_prefix) | ||
22 | + G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, "index.html"); | ||
23 | + else | ||
24 | + G.fname_out = (char*)"index.html"; | ||
25 | /* -P DIR is considered only if there was no -O FILE */ | ||
26 | - else { | ||
27 | + } else { | ||
28 | if (G.dir_prefix) | ||
29 | G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out); | ||
30 | else { | ||