diff options
author | Anton Gerasimov <anton@advancedtelematic.com> | 2017-11-16 18:03:36 +0100 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-01-05 14:45:49 +0100 |
commit | 5b5fb2fb7b6b47535c8dedcaa43ef255c1118900 (patch) | |
tree | 049a24ed694de184c9593ab094ef620e120bbcca | |
parent | 995efb8d6edfb58864bdc243814c46cdf19f8c2e (diff) | |
download | meta-updater-5b5fb2fb7b6b47535c8dedcaa43ef255c1118900.tar.gz |
Ignore configuration templates to avoid duplicate inclusion of stuff
Cherry-picked (e31b5428a4dff2b5d68daf34f079c4789c0c5d4b) from pyro, but
leaving out the IMAGE_ROOTFS_EXTRA_SPACE part.
This fixes a bug that was rather tough to track down. The duplicated
layer meant that the same patch for pseudo was getting applied twice,
which caused a loud error instead of just getting skipped.
-rwxr-xr-x | scripts/envsetup.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh index 260b048..ff78681 100755 --- a/scripts/envsetup.sh +++ b/scripts/envsetup.sh | |||
@@ -24,15 +24,7 @@ fi | |||
24 | METADIR="${SOURCEDIR}/../.." | 24 | METADIR="${SOURCEDIR}/../.." |
25 | 25 | ||
26 | if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then | 26 | if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then |
27 | if [ -z "$TEMPLATECONF" ] && [ -d ${METADIR}/meta-updater-${MACHINE}/conf ]; then | 27 | source "$METADIR/poky/oe-init-build-env" "$BUILDDIR" |
28 | # Use the template configurations for the specified machine | ||
29 | TEMPLATECONF=${METADIR}/meta-updater-${MACHINE}/conf | ||
30 | source "$METADIR/poky/oe-init-build-env" "$BUILDDIR" | ||
31 | unset TEMPLATECONF | ||
32 | else | ||
33 | # Use the default configurations or TEMPLATECONF set by the user | ||
34 | source "$METADIR/poky/oe-init-build-env" "$BUILDDIR" | ||
35 | fi | ||
36 | echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf | 28 | echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf |
37 | cat "${METADIR}/meta-updater/conf/include/bblayers/sota.inc" >> conf/bblayers.conf | 29 | cat "${METADIR}/meta-updater/conf/include/bblayers/sota.inc" >> conf/bblayers.conf |
38 | cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf | 30 | cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf |