MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

oe-init-build-env: add quotes around variables to prevent word splitting

Browse Source 
Used shellcheck to add quotes to the variables. This is to make sure that
directories with names that have space between, such as
"Desktop/projects/test repo/poky" will not be considered as 2 separate
words. With this modification, running the command "source
oe-init-build-env" will not give the error "bash: oe-init-build-env: No
such file or directory"

(From OE-Core rev: b07a70fbf78f2beba639580e37dffbc0a73bc99f)

Signed-off-by: Abongwa Bonalais Amahnui <abongwabonalais@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Abongwa Amahnui Bonalais 2022-04-05 11:47:05 +01:00 committed by Richard Purdie
parent 601befb6c7
commit 13eda43533
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oe-init-build-env
View File

@ -42,8 +42,8 @@ fi
unset THIS_SCRIPT unset THIS_SCRIPT
export OEROOT export OEROOT
. $OEROOT/scripts/oe-buildenv-internal && . "$OEROOT"/scripts/oe-buildenv-internal &&
TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir || { TEMPLATECONF="$TEMPLATECONF" "$OEROOT"/scripts/oe-setup-builddir || {
unset OEROOT unset OEROOT
return 1 return 1
} }

8
scripts/oe-setup-builddir
View File

@ -42,7 +42,7 @@ if [ -f "$BUILDDIR/conf/templateconf.cfg" ]; then
TEMPLATECONF=$(cat "$BUILDDIR/conf/templateconf.cfg") TEMPLATECONF=$(cat "$BUILDDIR/conf/templateconf.cfg")
fi fi
. $OEROOT/.templateconf . "$OEROOT"/.templateconf
if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then
echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg"
@ -79,7 +79,7 @@ example, select a different MACHINE (target hardware). See conf/local.conf
for more information as common configuration options are commented. for more information as common configuration options are commented.
EOM EOM
cp -f $OECORELOCALCONF "$BUILDDIR/conf/local.conf" cp -f "$OECORELOCALCONF" "$BUILDDIR/conf/local.conf"
SHOWYPDOC=yes SHOWYPDOC=yes
fi fi
@ -100,7 +100,7 @@ EOM
# to replace it for compatibility. # to replace it for compatibility.
sed -e "s|##OEROOT##|$OEROOT|g" \ sed -e "s|##OEROOT##|$OEROOT|g" \
-e "s|##COREBASE##|$OEROOT|g" \ -e "s|##COREBASE##|$OEROOT|g" \
$OECORELAYERCONF > "$BUILDDIR/conf/bblayers.conf" "$OECORELAYERCONF" > "$BUILDDIR/conf/bblayers.conf"
SHOWYPDOC=yes SHOWYPDOC=yes
fi fi
@ -125,5 +125,5 @@ fi
if [ -z "$OECORENOTESCONF" ]; then if [ -z "$OECORENOTESCONF" ]; then
OECORENOTESCONF="$OEROOT/meta/conf/conf-notes.txt" OECORENOTESCONF="$OEROOT/meta/conf/conf-notes.txt"
fi fi
[ ! -r "$OECORENOTESCONF" ] || cat $OECORENOTESCONF [ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF"
unset OECORENOTESCONF unset OECORENOTESCONF