* [dylan][PATCH 00/14] Backports for the OE-Core dylan branch
@ 2013-07-29 8:34 Paul Eggleton
2013-07-29 8:34 ` [dylan][PATCH 01/14] populate_sdk_base, adt_installer: abort install if path contains spaces Paul Eggleton
0 siblings, 1 reply; 3+ messages in thread
From: Paul Eggleton @ 2013-07-29 8:34 UTC (permalink / raw)
To: openembedded-core
These are mostly backports from master with one patch for mesa which
derives from part of a change in master. These have been tested on the
Yocto Project autobuilder in conjunction with the two bitbake 1.18
patches I just sent.
Note: I would normally not backport PACKAGECONFIG additions, however
these are in aid of preventing floating dependencies so I have taken
these (and there may be a few more to come in the next series).
The following changes since commit 5b90fc7d36b468251f4f9371c5f7eb32a78a8f69:
qt4: disable qmeegographicssystemhelper (2013-07-08 16:28:30 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/dylan-next
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/dylan-next
Beth Flanagan (1):
adt_installer_internal: fix spelling error
Chen Qi (1):
tar: remove an erroneous patch
Jonathan Liu (1):
wget: backport fixes for documentation build errors
Laurentiu Palcu (2):
populate_sdk_base, adt_installer: abort install if path contains
spaces
populate_sdk_base: fix bashism
Martin Jansa (5):
gst-plugins-good: add PACKAGECONFIG for jack
gst-plugins-ugly: add PACKAGECONFIG for x264, cdio, dvdread
pulseaudio: add PACKAGECONFIG for jack
subversion: add PACKAGECONFIG for sasl
cups: add PACKAGECONFIG for avahi
Nicolas Dechesne (1):
mesa: fix EGL compilation without X11 headers
Petter Mabäcker (1):
remake: fix insufficient gettext dependency
Saul Wold (1):
pigz: Fix typo in ALTERNATIVES line
Stefan Stanacar (1):
populate_sdk_base.bbclass: use new perm option for find
meta/classes/populate_sdk_base.bbclass | 15 +-
.../installer/adt-installer/adt_installer | 13 +-
.../adt-installer/scripts/adt_installer_internal | 4 +-
meta/recipes-devtools/remake/remake_git.bb | 6 +-
.../subversion/subversion_1.6.15.bb | 2 +
.../subversion/subversion_1.7.8.bb | 2 +
meta/recipes-extended/cups/cups16.inc | 3 +
meta/recipes-extended/pigz/pigz.inc | 2 +-
.../tar-1.26/tar-1.26-fortifysourcessigabrt.patch | 36 --
meta/recipes-extended/tar/tar_1.26.bb | 1 -
meta/recipes-extended/wget/wget-1.14/fix_doc.patch | 71 ++++
meta/recipes-extended/wget/wget_1.14.bb | 1 +
meta/recipes-graphics/mesa/mesa-9.0.2.inc | 2 +-
...ate-NativeDisplayType-depending-on-config.patch | 361 +++++++++++++++++++++
.../fix-egl-compilation-without-x11-headers.patch | 32 --
.../gstreamer/gst-plugins-good_0.10.31.bb | 1 +
.../gstreamer/gst-plugins-ugly_0.10.19.bb | 5 +
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 1 +
18 files changed, 475 insertions(+), 83 deletions(-)
delete mode 100644 meta/recipes-extended/tar/tar-1.26/tar-1.26-fortifysourcessigabrt.patch
create mode 100644 meta/recipes-extended/wget/wget-1.14/fix_doc.patch
create mode 100644 meta/recipes-graphics/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch
--
1.8.1.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* [dylan][PATCH 01/14] populate_sdk_base, adt_installer: abort install if path contains spaces
2013-07-29 8:34 [dylan][PATCH 00/14] Backports for the OE-Core dylan branch Paul Eggleton
@ 2013-07-29 8:34 ` Paul Eggleton
2013-07-29 8:50 ` Paul Eggleton
0 siblings, 1 reply; 3+ messages in thread
From: Paul Eggleton @ 2013-07-29 8:34 UTC (permalink / raw)
To: openembedded-core
From: Laurentiu Palcu <laurentiu.palcu@intel.com>
Spaces are not handled properly in some parts of oe-core and it's safer
to abort toolchain installation if path contains spaces. Even though
we fix space handling in the toolchain installation script, there are
various other parts in the toolchain (perl scripts, sysroot path passed to
toolchain binaries, shebang lines) that would need special handling. So,
for now, just bail out if path contains spaces.
The checking for spaces in the path is done after expanding relative
paths to absolute and tilde conversion.
[YOCTO #4488]
(From OE-Core master rev: 8c35ba2d3048ce69f74f72cb2676e4bc162cfb63)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/populate_sdk_base.bbclass | 13 +++++++++----
meta/recipes-devtools/installer/adt-installer/adt_installer | 13 +++++++++----
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index e5bc0b4..31e848d 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -181,11 +181,16 @@ else
echo "$target_sdk_dir"
fi
-eval target_sdk_dir=$target_sdk_dir
-if [ -d $target_sdk_dir ]; then
- target_sdk_dir=$(cd $target_sdk_dir; pwd)
+eval target_sdk_dir=$(printf "%q" "$target_sdk_dir")
+if [ -d "$target_sdk_dir" ]; then
+ target_sdk_dir=$(cd "$target_sdk_dir"; pwd)
else
- target_sdk_dir=$(readlink -m $target_sdk_dir)
+ target_sdk_dir=$(readlink -m "$target_sdk_dir")
+fi
+
+if [ -n "$(echo $target_sdk_dir|grep ' ')" ]; then
+ echo "The target directory path ($target_sdk_dir) contains spaces. Abort!"
+ exit 1
fi
if [ -e "$target_sdk_dir/environment-setup-${REAL_MULTIMACH_TARGET_SYS}" ]; then
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index c012391..58728af 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -339,11 +339,16 @@ if [ "$INSTALL_FOLDER" = "" ]; then
INSTALL_FOLDER=$DEFAULT_INSTALL_FOLDER
fi
-eval INSTALL_FOLDER=$INSTALL_FOLDER
-if [ -d $INSTALL_FOLDER ]; then
- export INSTALL_FOLDER=$(cd $INSTALL_FOLDER; pwd)
+eval INSTALL_FOLDER=$(printf "%q" "$INSTALL_FOLDER")
+if [ -d "$INSTALL_FOLDER" ]; then
+ export INSTALL_FOLDER=$(cd "$INSTALL_FOLDER"; pwd)
else
- export INSTALL_FOLDER=$(readlink -m $INSTALL_FOLDER)
+ export INSTALL_FOLDER=$(readlink -m "$INSTALL_FOLDER")
+fi
+
+if [ -n "$(echo $INSTALL_FOLDER|grep ' ')" ]; then
+ echo "The target directory path ($INSTALL_FOLDER) contains spaces. Abort!"
+ exit 1
fi
clear
--
1.8.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [dylan][PATCH 01/14] populate_sdk_base, adt_installer: abort install if path contains spaces
2013-07-29 8:34 ` [dylan][PATCH 01/14] populate_sdk_base, adt_installer: abort install if path contains spaces Paul Eggleton
@ 2013-07-29 8:50 ` Paul Eggleton
0 siblings, 0 replies; 3+ messages in thread
From: Paul Eggleton @ 2013-07-29 8:50 UTC (permalink / raw)
To: openembedded-core
Hmm, this was meant to be sent as a cover letter only. Please ignore the 1/14
and treat it as if it was :)
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-29 8:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-29 8:34 [dylan][PATCH 00/14] Backports for the OE-Core dylan branch Paul Eggleton
2013-07-29 8:34 ` [dylan][PATCH 01/14] populate_sdk_base, adt_installer: abort install if path contains spaces Paul Eggleton
2013-07-29 8:50 ` Paul Eggleton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox