oe-setup-builddir: de-bash use . instead of source
PATCH 1/1 oe-setup-builddir: de-bash use . instead of source
Signed-off-by Saul Wold <[email protected]>
--- scripts/oe-setup-builddir | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/oe-setup-builddir +1 -1
@@ -41,7 +41,7 @@ if (test -f "$BUILDDIR/conf/templateconf.cfg") then TEMPLATECONF=$(cat $BUILDDIR/conf/templateconf.cfg) fi -source $OEROOT/.templateconf +. $OEROOT/.templateconf if ! (test -f "$BUILDDIR/conf/templateconf.cfg") then echo "$TEMPLATECONF" >$BUILDDIR/conf/templateconf.cfg
Signature · 1 line
1.8.3.1
PATCH 1/1 oe-setup-builddir: small rework
Changes:
- drop useless subshell creation in test:
if ! (test -r "$BUILDDIR/conf/local.conf"); then$
- replace "source" builtin by "." (bashsism)
- fix indentation 4 spaces (drop some tabs too)
- fix return => exit (return is not allowed in main)
- drop "sed -i" (doesn't exist in BSD sed)
- for homogeneity, always use [ ] (instead of test)
- replace old [ "x" = "x$VAR" ] by [ -z "$VAR" ]
Signed-off-by Matthieu Crapet <[email protected]>
--- scripts/oe-setup-builddir | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-)
scripts/oe-setup-builddir +24 -23
@@ -25,51 +25,51 @@ fi mkdir -p $BUILDDIR/conf -if ! (test -d "$BUILDDIR"); then +if [ ! -d "$BUILDDIR" ]; then echo >&2 "Error: The builddir ($BUILDDIR) does not exist!" exit 1 fi -if ! (test -w "$BUILDDIR"); then +if [ ! -w "$BUILDDIR" ]; then echo >&2 "Error: Cannot write to $BUILDDIR, perhaps try sourcing with a writable path? i.e. . oe-init-build-env ~/my-build" exit 1 fi cd "$BUILDDIR" -if (test -f "$BUILDDIR/conf/templateconf.cfg") then +if [ -f "$BUILDDIR/conf/templateconf.cfg" ]; then TEMPLATECONF=$(cat $BUILDDIR/conf/templateconf.cfg) fi -source $OEROOT/.templateconf +. $OEROOT/.templateconf -if ! (test -f "$BUILDDIR/conf/templateconf.cfg") then +if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then echo "$TEMPLATECONF" >$BUILDDIR/conf/templateconf.cfg fi # # $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf # -if [ "x" != "x$TEMPLATECONF" ]; then - if ! (test -d "$TEMPLATECONF"); then - # Allow TEMPLATECONF=meta-xyz/conf as a shortcut - if [ -d "$OEROOT/$TEMPLATECONF" ]; then - TEMPLATECONF="$OEROOT/$TEMPLATECONF" - fi - if ! (test -d "$TEMPLATECONF"); then - echo >&2 "Error: '$TEMPLATECONF' must be a directory containing local.conf & bblayers.conf" - return - fi +if [ -n "$TEMPLATECONF" ]; then + if [ ! -d "$TEMPLATECONF" ]; then + # Allow TEMPLATECONF=meta-xyz/conf as a shortcut + if [ -d "$OEROOT/$TEMPLATECONF" ]; then + TEMPLATECONF="$OEROOT/$TEMPLATECONF" + fi + if [ ! -d "$TEMPLATECONF" ]; then + echo >&2 "Error: '$TEMPLATECONF' must be a directory containing local.conf & bblayers.conf" + exit 1 + fi fi OECORELAYERCONF="$TEMPLATECONF/bblayers.conf.sample" OECORELOCALCONF="$TEMPLATECONF/local.conf.sample" OECORENOTESCONF="$TEMPLATECONF/conf-notes.txt" fi -if [ "x" = "x$OECORELOCALCONF" ]; then +if [ -z "$OECORELOCALCONF" ]; then OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample" fi -if ! (test -r "$BUILDDIR/conf/local.conf"); then +if [ ! -r "$BUILDDIR/conf/local.conf" ]; then cat <<EOM You had no conf/local.conf file. This configuration file has therefore been created for you with some default values. You may wish to edit it to use a
@@ -88,11 +88,11 @@ EOM cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf fi -if [ "x" = "x$OECORELAYERCONF" ]; then +if [ -z "$OECORELAYERCONF" ]; then OECORELAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample" fi -if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then -cat <<EOM +if [ ! -r "$BUILDDIR/conf/bblayers.conf" ]; then + cat <<EOM You had no conf/bblayers.conf file. The configuration file has been created for you with some default values. To add additional metadata layers into your configuration please add entries to this file.
@@ -109,10 +109,11 @@ EOM # Put the abosolute path to the layers in bblayers.conf so we can run # bitbake without the init script after the first run - sed "s|##OEROOT##|$OEROOT|g" $OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf # ##COREBASE## is deprecated as it's meaning was inconsistent, but continue # to replace it for compatibility. - sed -i -e "s|##COREBASE##|$OEROOT|g" $BUILDDIR/conf/bblayers.conf + sed -e "s|##OEROOT##|$OEROOT|g" \ + -e "s|##COREBASE##|$OEROOT|g" \ + $OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf fi # Prevent disturbing a new GIT clone in same console
@@ -126,7 +127,7 @@ cat <<EOM You can now run 'bitbake <target>' EOM -if [ "x" = "x$OECORENOTESCONF" ]; then +if [ -z "$OECORENOTESCONF" ]; then OECORENOTESCONF="$OEROOT/meta/conf/conf-notes.txt" fi [ ! -r "$OECORENOTESCONF" ] || cat $OECORENOTESCONF
Signature · 1 line
1.8.5.4
Re: [PATCH] oe-setup-builddir: small rework
Hi,
Saul, I included your bashism fix in my patch.
I wanted to update copyright to something like:
# Copyright (C) 2012-2012 OpenEmbedded Team
but didn't know if this was appropriate.
Regards,
Matthieu