diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/oe-setup-builddir | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index d4ac074ad9..54048e62ec 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir | |||
| @@ -42,7 +42,7 @@ if [ -f "$BUILDDIR/conf/templateconf.cfg" ]; then | |||
| 42 | TEMPLATECONF=$(cat "$BUILDDIR/conf/templateconf.cfg") | 42 | TEMPLATECONF=$(cat "$BUILDDIR/conf/templateconf.cfg") |
| 43 | fi | 43 | fi |
| 44 | 44 | ||
| 45 | . $OEROOT/.templateconf | 45 | . "$OEROOT"/.templateconf |
| 46 | 46 | ||
| 47 | if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then | 47 | if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then |
| 48 | echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" | 48 | echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" |
| @@ -79,7 +79,7 @@ example, select a different MACHINE (target hardware). See conf/local.conf | |||
| 79 | for more information as common configuration options are commented. | 79 | for more information as common configuration options are commented. |
| 80 | 80 | ||
| 81 | EOM | 81 | EOM |
| 82 | cp -f $OECORELOCALCONF "$BUILDDIR/conf/local.conf" | 82 | cp -f "$OECORELOCALCONF" "$BUILDDIR/conf/local.conf" |
| 83 | SHOWYPDOC=yes | 83 | SHOWYPDOC=yes |
| 84 | fi | 84 | fi |
| 85 | 85 | ||
| @@ -100,7 +100,7 @@ EOM | |||
| 100 | # to replace it for compatibility. | 100 | # to replace it for compatibility. |
| 101 | sed -e "s|##OEROOT##|$OEROOT|g" \ | 101 | sed -e "s|##OEROOT##|$OEROOT|g" \ |
| 102 | -e "s|##COREBASE##|$OEROOT|g" \ | 102 | -e "s|##COREBASE##|$OEROOT|g" \ |
| 103 | $OECORELAYERCONF > "$BUILDDIR/conf/bblayers.conf" | 103 | "$OECORELAYERCONF" > "$BUILDDIR/conf/bblayers.conf" |
| 104 | SHOWYPDOC=yes | 104 | SHOWYPDOC=yes |
| 105 | fi | 105 | fi |
| 106 | 106 | ||
| @@ -125,5 +125,5 @@ fi | |||
| 125 | if [ -z "$OECORENOTESCONF" ]; then | 125 | if [ -z "$OECORENOTESCONF" ]; then |
| 126 | OECORENOTESCONF="$OEROOT/meta/conf/conf-notes.txt" | 126 | OECORENOTESCONF="$OEROOT/meta/conf/conf-notes.txt" |
| 127 | fi | 127 | fi |
| 128 | [ ! -r "$OECORENOTESCONF" ] || cat $OECORENOTESCONF | 128 | [ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF" |
| 129 | unset OECORENOTESCONF | 129 | unset OECORENOTESCONF |
