summaryrefslogtreecommitdiff
path: root/elements/gnu-toolchain/stage2-busybox.bst
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2018-06-04 13:40:13 +0100
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2018-06-04 13:51:31 +0100
commit45bb922afeaae26ef5d4e0ee329c678485063c45 (patch)
tree7abcdd995185e973b5e220f42b01aadaac8ea723 /elements/gnu-toolchain/stage2-busybox.bst
parenteea23f6a325956d17ae35eaeefc67a5f3e5f6a85 (diff)
downloaddefinitions-45bb922afeaae26ef5d4e0ee329c678485063c45.tar.gz
Set up/Hard code STAGE2_SYSROOT to the root directory instead of calculating it depending on the current directory because buildstream has changed the default value of "build-root" directory and this was causing issues in the stage2 packages. See https://gitlab.com/BuildStream/buildstream/issues/414 for more information. Bump also the SHA of bst-external to fcd1fc365d0250bffe02937c89dcc31d11c299cf
Diffstat (limited to 'elements/gnu-toolchain/stage2-busybox.bst')
-rw-r--r--elements/gnu-toolchain/stage2-busybox.bst4
1 files changed, 2 insertions, 2 deletions
diff --git a/elements/gnu-toolchain/stage2-busybox.bst b/elements/gnu-toolchain/stage2-busybox.bst
index a1774abd..02345c7e 100644
--- a/elements/gnu-toolchain/stage2-busybox.bst
+++ b/elements/gnu-toolchain/stage2-busybox.bst
@@ -82,7 +82,7 @@ config:
build-commands:
- |
- export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))"
+ export STAGE2_SYSROOT="/"
export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
export LDFLAGS="--sysroot=$STAGE2_SYSROOT"
make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=%{target-stage1}- KCONFIG_NOTIMESTAMP=1
@@ -91,7 +91,7 @@ config:
# We expect to be built with a non-standard prefix in stage 2 (i.e. not
# /usr). The install will break if prefix is set to /usr.
- |
- export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))"
+ export STAGE2_SYSROOT="/"
export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
export LDFLAGS="--sysroot=$STAGE2_SYSROOT"
make CONFIG_PREFIX="%{install-root}%{prefix}" \