diff options
| author | cajun-rat <phil@advancedtelematic.com> | 2018-01-10 16:36:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 16:36:44 +0100 |
| commit | e3b7ea2133d0705b7e4e3ec1bb681df069fdd59e (patch) | |
| tree | 049a24ed694de184c9593ab094ef620e120bbcca | |
| parent | 8a47cb9cb7b28e8c532592baded6d56dcb3ed818 (diff) | |
| parent | 5b5fb2fb7b6b47535c8dedcaa43ef255c1118900 (diff) | |
| download | meta-updater-e3b7ea2133d0705b7e4e3ec1bb681df069fdd59e.tar.gz | |
Merge pull request #220 from advancedtelematic/bugfix/PRO-4632/morty-pseudo-bugs
Bugfix/pro 4632/morty pseudo bugs
| -rw-r--r-- | recipes-support/sqlite/sqlite3_3.14.1.bbappend | 1 | ||||
| -rwxr-xr-x | scripts/envsetup.sh | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/recipes-support/sqlite/sqlite3_3.14.1.bbappend b/recipes-support/sqlite/sqlite3_3.14.1.bbappend new file mode 100644 index 0000000..dcc662c --- /dev/null +++ b/recipes-support/sqlite/sqlite3_3.14.1.bbappend | |||
| @@ -0,0 +1 @@ | |||
| CFLAGS_append = " -fPIC" | |||
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 |