diff options
| author |   Radu Moisan <radu.moisan@intel.com> | 2012-08-22 12:22:22 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-23 11:15:50 +0100 |
| commit | e5f2cc805509a23e160c6f05e6776d6d32e3ce98 (patch) | |
| tree | 44241dca42b4ae4fc5ff97be85c2fb22dc5ef926 /meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch | |
| parent | 88cd5d99918a896f515e8bb59b7238f3ad50adff (diff) | |
| download | openembedded-core-contrib-e5f2cc805509a23e160c6f05e6776d6d32e3ce98.tar.gz | |
busybox: Upgrade to upstream 1.20.2
Updated defconfig file from generated .config
Disabled CONFIG_LSOF,CONFIG_CROSS_COMPILER_PREFIX, and CONFIG_EXTRA_CFLAGS
for backwards compatibility.
Added busybox-1.20.2-kernel_ver.patch from upstream.
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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, 30 insertions, 0 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 new file mode 100644 index 0000000000..3003965d8c --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch @@ -0,0 +1,30 @@ +In cases where busybox wget is invoked with -P <...> and the url ends +in "/", the download directory is ignored (ie the file index.html is +implied), this change enables the -P option for those urls. + +Signed-off-by: Amy Fong <amy.fong@windriver.com> +Upstream-Status: Submitted +--- + networking/wget.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +--- a/networking/wget.c ++++ b/networking/wget.c +@@ -589,10 +589,14 @@ + if (!(option_mask32 & WGET_OPT_OUTNAME)) { + G.fname_out = bb_get_last_path_component_nostrip(target.path); + /* handle "wget http://kernel.org//" */ +- if (G.fname_out[0] == '/' || !G.fname_out[0]) +- G.fname_out = (char*)"index.html"; ++ if (G.fname_out[0] == '/' || !G.fname_out[0]) { ++ /* bug: if we provide a default name, we should still look at -P option */ ++ if (G.dir_prefix) ++ G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, "index.html"); ++ else ++ G.fname_out = (char*)"index.html"; + /* -P DIR is considered only if there was no -O FILE */ +- else { ++ } else { + if (G.dir_prefix) + G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out); + else { |