From 5791e0f2c278be1fc72a1ef7149acec4da21ffa7 Mon Sep 17 00:00:00 2001
From: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Date: Wed, 25 Jul 2018 15:05:24 +0100
Subject: Revert "Update buildstream to 1.1.3"

This reverts commit 45bb922afeaae26ef5d4e0ee329c678485063c45.
---
 .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 8778f772..8608ec22 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='06ae434a7017edbf67bf46c3fe2e327466801787'  # 1.1.3
-      export BST_EXTERNAL_SHA='fcd1fc365d0250bffe02937c89dcc31d11c299cf'
+      export BST_SHA='b340f995455b997995fc55277a993d5f5a1656e5'  # 1.0.1
+      export BST_EXTERNAL_SHA='c4cc10467d116450471ca9f756617ede7572814c'
       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 d3461301..612b31b6 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="/"
+    export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))"
     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="/"
+    export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))"
     make
 
   strip-commands:
diff --git a/elements/gnu-toolchain/stage2-busybox.bst b/elements/gnu-toolchain/stage2-busybox.bst
index 02345c7e..a1774abd 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="/"
+    export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))"
     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="/"
+    export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))"
     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 baebf658..aa80f829 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="/" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
+  - STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" 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="/" make
+  - STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" make
 
   strip-commands:
   - |
diff --git a/elements/gnu-toolchain/stage2-gcc.bst b/elements/gnu-toolchain/stage2-gcc.bst
index 5751631a..a7c879e3 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="/"
+    export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))"
     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="/"
+    export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))"
     cd o && make
 
   install-commands:
diff --git a/elements/gnu-toolchain/stage2-libstdcxx.bst b/elements/gnu-toolchain/stage2-libstdcxx.bst
index 5d968bf3..58055e8b 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="/"
+    export STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))"
     # -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 418cc539..0cb4cdb4 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="/" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
+  - STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" 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="/" make
+  - STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))" make
 
   strip-commands:
   - |
diff --git a/elements/gnu-toolchain/stage2-reset-specs.bst b/elements/gnu-toolchain/stage2-reset-specs.bst
index 3309c073..5910903e 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="/"
+    STAGE2_SYSROOT="$(dirname $(dirname $(pwd)))"
     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