From 45bb922afeaae26ef5d4e0ee329c678485063c45 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Mon, 4 Jun 2018 13:40:13 +0100 Subject: Update buildstream to 1.1.3 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 --- .gitlab-ci.yml | 4 ++-- elements/gnu-toolchain/stage2-binutils.bst | 4 ++-- elements/gnu-toolchain/stage2-busybox.bst | 4 ++-- elements/gnu-toolchain/stage2-gawk.bst | 4 ++-- elements/gnu-toolchain/stage2-gcc.bst | 4 ++-- elements/gnu-toolchain/stage2-libstdcxx.bst | 2 +- elements/gnu-toolchain/stage2-make.bst | 4 ++-- elements/gnu-toolchain/stage2-reset-specs.bst | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50cca656..d6002ded 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,8 +13,8 @@ variables: .bst_before_script: &bst_before_script before_script: - | - export BST_SHA='b340f995455b997995fc55277a993d5f5a1656e5' # 1.0.1 - export BST_EXTERNAL_SHA='c4cc10467d116450471ca9f756617ede7572814c' + export BST_SHA='06ae434a7017edbf67bf46c3fe2e327466801787' # 1.1.3 + export BST_EXTERNAL_SHA='fcd1fc365d0250bffe02937c89dcc31d11c299cf' git clone https://gitlab.com/BuildStream/buildstream.git # Use specific version of BuildStream cd buildstream && git checkout $BST_SHA diff --git a/elements/gnu-toolchain/stage2-binutils.bst b/elements/gnu-toolchain/stage2-binutils.bst index 612b31b6..d3461301 100644 --- a/elements/gnu-toolchain/stage2-binutils.bst +++ b/elements/gnu-toolchain/stage2-binutils.bst @@ -23,7 +23,7 @@ environment: config: configure-commands: - | - export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" + export STAGE2_SYSROOT="/" export CXX="%{target-stage1}-g++ --sysroot=$STAGE2_SYSROOT" # binutils has its own embedded libtool, which is old and strips out # `--sysroot`. Work around by modifying the compiler command to @@ -36,7 +36,7 @@ config: build-commands: - | - export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" + export STAGE2_SYSROOT="/" make strip-commands: 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}" \ diff --git a/elements/gnu-toolchain/stage2-gawk.bst b/elements/gnu-toolchain/stage2-gawk.bst index aa80f829..baebf658 100644 --- a/elements/gnu-toolchain/stage2-gawk.bst +++ b/elements/gnu-toolchain/stage2-gawk.bst @@ -23,11 +23,11 @@ environment: config: configure-commands: - - STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false + - STAGE2_SYSROOT="/" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false LDFLAGS="--sysroot=$STAGE2_SYSROOT" ./configure --prefix="%{prefix}" --disable-nls --build=$(sh config.guess) --host=%{target-stage1} build-commands: - - STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" make + - STAGE2_SYSROOT="/" make strip-commands: - | diff --git a/elements/gnu-toolchain/stage2-gcc.bst b/elements/gnu-toolchain/stage2-gcc.bst index a7c879e3..5751631a 100644 --- a/elements/gnu-toolchain/stage2-gcc.bst +++ b/elements/gnu-toolchain/stage2-gcc.bst @@ -64,7 +64,7 @@ config: # 4. This flag causes the correct --sysroot flag to be passed when # calling stage 1 GCC. - | - export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" + export STAGE2_SYSROOT="/" export CC="%{target-stage1}-gcc --sysroot=$STAGE2_SYSROOT" export CXX="%{target-stage1}-g++ --sysroot=$STAGE2_SYSROOT" export AR="%{target-stage1}-ar" @@ -86,7 +86,7 @@ config: build-commands: - | - export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" + export STAGE2_SYSROOT="/" cd o && make install-commands: diff --git a/elements/gnu-toolchain/stage2-libstdcxx.bst b/elements/gnu-toolchain/stage2-libstdcxx.bst index 58055e8b..5d968bf3 100644 --- a/elements/gnu-toolchain/stage2-libstdcxx.bst +++ b/elements/gnu-toolchain/stage2-libstdcxx.bst @@ -31,7 +31,7 @@ config: # as we are running the configure script from the top-level # directory. - | - export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" + export STAGE2_SYSROOT="/" # -fPIC must be given, otherwise it will not be possible to create # shared libraries linked to libstdc++ export CPPFLAGS="--sysroot=$STAGE2_SYSROOT -fPIC" diff --git a/elements/gnu-toolchain/stage2-make.bst b/elements/gnu-toolchain/stage2-make.bst index 0cb4cdb4..418cc539 100644 --- a/elements/gnu-toolchain/stage2-make.bst +++ b/elements/gnu-toolchain/stage2-make.bst @@ -22,11 +22,11 @@ environment: config: configure-commands: - - STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false + - STAGE2_SYSROOT="/" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false LDFLAGS="--sysroot=$STAGE2_SYSROOT" ./configure --prefix="%{prefix}" --disable-nls --without-guile --build=$(sh config/config.guess) --host=%{target-stage1} build-commands: - - STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" make + - STAGE2_SYSROOT="/" make strip-commands: - | diff --git a/elements/gnu-toolchain/stage2-reset-specs.bst b/elements/gnu-toolchain/stage2-reset-specs.bst index 5910903e..3309c073 100644 --- a/elements/gnu-toolchain/stage2-reset-specs.bst +++ b/elements/gnu-toolchain/stage2-reset-specs.bst @@ -28,7 +28,7 @@ config: # points to a file that doesn't exist. install-commands: - | - STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" + STAGE2_SYSROOT="/" specs_dir="$(dirname $(%{target-stage1}-gcc -print-libgcc-file-name))" target_specs_dir="%{install-root}/${specs_dir#$STAGE2_SYSROOT}" mkdir -p "$target_specs_dir" -- cgit v1.2.1