summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-10-23 21:08:42 +0100
committerMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>2010-03-15 07:49:41 +0100
commit548aea3b52f68af8da7f8fbd8067fc4600c8526b (patch)
treeb145b5b1293dc0fc4248fbd65b8d3f4abb0be5b9
parentdceac37e28932a99894c7e5e1d061635da9be118 (diff)
base.bbclass/bitbake.conf: Fix some string quoting to handle more unusual URLs (from Poky)
-rw-r--r--classes/base.bbclass2
-rw-r--r--conf/bitbake.conf4
2 files changed, 3 insertions, 3 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index b191940038..a54e6992b6 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -813,7 +813,7 @@ def oe_unpack_file(file, data, url = None):
(type, host, path, user, pswd, parm) = bb.decodeurl(url)
if 'dos' in parm:
cmd = '%s -a' % cmd
- cmd = '%s %s' % (cmd, file)
+ cmd = "%s '%s'" % (cmd, file)
elif os.path.isdir(file):
destdir = "."
filespath = bb.data.getVar("FILESPATH", data, 1).split(":")
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 1151f4cc68..0886587edc 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -565,11 +565,11 @@ FETCHCMD_bzr = "/usr/bin/env bzr"
FETCHCMD_hg = "/usr/bin/env hg"
FETCHCOMMAND = "ERROR, this must be a BitBake bug"
-FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}"
+FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
FETCHCOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
RESUMECOMMAND = "ERROR, this must be a BitBake bug"
-RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}"
+RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
UPDATECOMMAND = "ERROR, this must be a BitBake bug"
UPDATECOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
ss='mode'>-rw-r--r--meta-selftest/recipes-test/aspell/aspell_0.60.6.1.bbappend2
-rw-r--r--meta-selftest/recipes-test/emptytest/emptytest.bb5
-rw-r--r--meta-selftest/recipes-test/images/oe-selftest-image.bb9
-rw-r--r--meta-selftest/recipes-test/m4/m4_1.4.17.bbappend2
-rw-r--r--meta-selftest/recipes-test/man/man/man-1.5h1-make.patch16
-rw-r--r--meta-selftest/recipes-test/man/man_1.6g.bbappend2
-rw-r--r--meta-selftest/recipes-test/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bbappend2
-rw-r--r--meta-skeleton/COPYING.MIT (renamed from meta-hob/COPYING.MIT)0
-rw-r--r--meta-skeleton/conf/layer.conf13
-rw-r--r--meta-skeleton/conf/multilib-example.conf13
-rw-r--r--meta-skeleton/conf/multilib-example2.conf13
-rw-r--r--meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg1
-rw-r--r--meta-skeleton/recipes-core/busybox/busybox_%.bbappend12
-rw-r--r--meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb5
-rw-r--r--meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb23
-rw-r--r--meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb13
-rw-r--r--meta-skeleton/recipes-skeleton/service/service_0.1.bb2
-rw-r--r--meta-skeleton/recipes-skeleton/useradd/useradd-example.bb5
-rw-r--r--meta/COPYING.GPLv2 (renamed from meta/recipes-bsp/qemu-config/qemu-config/COPYING.GPL)0
-rw-r--r--meta/classes/allarch.bbclass53
-rw-r--r--meta/classes/archive-configured-source.bbclass14
-rw-r--r--meta/classes/archive-original-source.bbclass14
-rw-r--r--meta/classes/archive-patched-source.bbclass14
-rw-r--r--meta/classes/archiver.bbclass868
-rw-r--r--meta/classes/autotools-brokensep.bbclass5
-rw-r--r--meta/classes/autotools.bbclass295
-rw-r--r--meta/classes/base.bbclass458
-rw-r--r--meta/classes/bin_package.bbclass36
-rw-r--r--meta/classes/binconfig-disabled.bbclass28
-rw-r--r--meta/classes/binconfig.bbclass49
-rw-r--r--meta/classes/blacklist.bbclass25
-rw-r--r--meta/classes/bluetooth.bbclass14
-rw-r--r--meta/classes/boot-directdisk.bbclass130
-rw-r--r--meta/classes/bootimg.bbclass225
-rw-r--r--meta/classes/bugzilla.bbclass5
-rw-r--r--meta/classes/buildhistory.bbclass525
-rw-r--r--meta/classes/buildstats-summary.bbclass39
-rw-r--r--meta/classes/buildstats.bbclass70
-rw-r--r--meta/classes/ccache.bbclass4
-rw-r--r--meta/classes/chrpath.bbclass127
-rw-r--r--meta/classes/clutter.bbclass22
-rw-r--r--meta/classes/cmake.bbclass63
-rw-r--r--meta/classes/cml1.bbclass67
-rw-r--r--meta/classes/compress_doc.bbclass260
-rw-r--r--meta/classes/copyleft_compliance.bbclass79
-rw-r--r--meta/classes/copyleft_filter.bbclass62
-rw-r--r--meta/classes/core-image.bbclass74
-rw-r--r--meta/classes/cpan-base.bbclass15
-rw-r--r--meta/classes/cpan.bbclass15
-rw-r--r--meta/classes/cpan_build.bbclass22
-rw-r--r--meta/classes/cross-canadian.bbclass89
-rw-r--r--meta/classes/cross.bbclass41
-rw-r--r--meta/classes/crosssdk.bbclass11
-rw-r--r--meta/classes/debian.bbclass46
-rw-r--r--meta/classes/deploy.bbclass1
-rw-r--r--meta/classes/devshell.bbclass150
-rw-r--r--meta/classes/distro_features_check.bbclass28
-rw-r--r--meta/classes/distrodata.bbclass889
-rw-r--r--meta/classes/distutils-base.bbclass5
-rw-r--r--meta/classes/distutils-common-base.bbclass7
-rw-r--r--meta/classes/distutils-native-base.bbclass4
-rw-r--r--meta/classes/distutils-tools.bbclass77
-rw-r--r--meta/classes/distutils.bbclass33
-rw-r--r--meta/classes/distutils3-base.bbclass8
-rw-r--r--meta/classes/distutils3-native-base.bbclass4
-rw-r--r--meta/classes/distutils3.bbclass96
-rw-r--r--meta/classes/dummy.bbclass2
-rw-r--r--meta/classes/externalsrc.bbclass105
-rw-r--r--meta/classes/extrausers.bbclass65
-rw-r--r--meta/classes/fontcache.bbclass56
-rw-r--r--meta/classes/gconf.bbclass19
-rw-r--r--meta/classes/gettext.bbclass10
-rw-r--r--meta/classes/gnome.bbclass2
-rw-r--r--meta/classes/gnomebase.bbclass26
-rw-r--r--meta/classes/grub-efi.bbclass73
-rw-r--r--meta/classes/gsettings.bbclass32
-rw-r--r--meta/classes/gtk-doc.bbclass8
-rw-r--r--meta/classes/gtk-icon-cache.bbclass50
-rw-r--r--meta/classes/gtk-immodules-cache.bbclass83
-rw-r--r--meta/classes/gummiboot.bbclass114
-rw-r--r--meta/classes/gzipnative.bbclass2
-rw-r--r--meta/classes/icecc.bbclass186
-rw-r--r--meta/classes/image-buildinfo.bbclass69
-rw-r--r--meta/classes/image-live.bbclass7
-rw-r--r--meta/classes/image-mklibs.bbclass8
-rw-r--r--meta/classes/image-prelink.bbclass2
-rw-r--r--meta/classes/image-swab.bbclass44
-rw-r--r--meta/classes/image-vmdk.bbclass17
-rw-r--r--meta/classes/image.bbclass530
-rw-r--r--meta/classes/image_types.bbclass236
-rw-r--r--meta/classes/imagetest-dummy.bbclass1
-rw-r--r--meta/classes/imagetest-qemu.bbclass223
-rw-r--r--meta/classes/insane.bbclass920
-rw-r--r--meta/classes/kernel-arch.bbclass17
-rw-r--r--meta/classes/kernel-grub.bbclass91
-rw-r--r--meta/classes/kernel-module-split.bbclass203
-rw-r--r--meta/classes/kernel-yocto.bbclass416
-rw-r--r--meta/classes/kernel.bbclass574
-rw-r--r--meta/classes/kernelsrc.bbclass10
-rw-r--r--meta/classes/lib_package.bbclass2
-rw-r--r--meta/classes/libc-common.bbclass24
-rw-r--r--meta/classes/libc-package.bbclass54
-rw-r--r--meta/classes/license.bbclass431
-rw-r--r--meta/classes/linux-kernel-base.bbclass13
-rw-r--r--meta/classes/meta.bbclass2
-rw-r--r--meta/classes/metadata_scm.bbclass29
-rw-r--r--meta/classes/migrate_localcount.bbclass46
-rw-r--r--meta/classes/mime.bbclass10
-rw-r--r--meta/classes/mirrors.bbclass5
-rw-r--r--meta/classes/module-base.bbclass36
-rw-r--r--meta/classes/module.bbclass38
-rw-r--r--meta/classes/multilib.bbclass79
-rw-r--r--meta/classes/multilib_global.bbclass122
-rw-r--r--meta/classes/multilib_header.bbclass45
-rw-r--r--meta/classes/native.bbclass77
-rw-r--r--meta/classes/nativesdk.bbclass80
-rw-r--r--meta/classes/oelint.bbclass252
-rw-r--r--meta/classes/own-mirrors.bbclass1
-rw-r--r--meta/classes/package.bbclass1436
-rw-r--r--meta/classes/package_deb.bbclass318