diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/envsetup.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh index 6c01d5b..5adf319 100755 --- a/scripts/envsetup.sh +++ b/scripts/envsetup.sh | |||
| @@ -35,11 +35,6 @@ fi | |||
| 35 | SCRIPTDIR=$(cd $(dirname $BASH_SOURCE) && pwd -P) | 35 | SCRIPTDIR=$(cd $(dirname $BASH_SOURCE) && pwd -P) |
| 36 | METADIR=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P) | 36 | METADIR=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P) |
| 37 | 37 | ||
| 38 | if ! [[ -e ${SCRIPTDIR}/../conf/include/local/sota_${MACHINE}.inc && -e ${SCRIPTDIR}/../conf/include/bblayers/sota_${MACHINE}.inc ]]; then | ||
| 39 | echo "Error: invalid machine: ${MACHINE}" >&2 | ||
| 40 | return -1 | ||
| 41 | fi | ||
| 42 | |||
| 43 | if [ -e ${BUILDDIR}/conf/local.conf ]; then | 38 | if [ -e ${BUILDDIR}/conf/local.conf ]; then |
| 44 | source $METADIR/poky/oe-init-build-env ${BUILDDIR} | 39 | source $METADIR/poky/oe-init-build-env ${BUILDDIR} |
| 45 | else | 40 | else |
| @@ -47,8 +42,7 @@ else | |||
| 47 | echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf | 42 | echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf |
| 48 | cat ${METADIR}/meta-updater/conf/include/bblayers/sota.inc >> conf/bblayers.conf | 43 | cat ${METADIR}/meta-updater/conf/include/bblayers/sota.inc >> conf/bblayers.conf |
| 49 | cat ${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc >> conf/bblayers.conf | 44 | cat ${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc >> conf/bblayers.conf |
| 50 | echo "include conf/include/local/sota_${MACHINE}.inc" >> conf/local.conf | 45 | echo "MACHINE = \"${MACHINE}\"" >> conf/local.conf |
| 51 | echo "include conf/distro/sota.conf.inc" >> conf/local.conf | ||
| 52 | echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf | 46 | echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf |
| 53 | fi | 47 | fi |
| 54 | 48 | ||
