From f3fcad43f2fc7d305f11933d805c1400ea27042e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 15 Aug 2018 12:19:24 +0100
Subject: Use freedesktop-sdk instead baserock's bootstrap/stage3-sysroot

---
 elements/gnu-toolchain/base.bst | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/elements/gnu-toolchain/base.bst b/elements/gnu-toolchain/base.bst
index 70fd3c34..695a8b30 100644
--- a/elements/gnu-toolchain/base.bst
+++ b/elements/gnu-toolchain/base.bst
@@ -1,19 +1,21 @@
 kind: import
-description: |
-  Import base sysroot binaries that we use to bootstrap a compiler.
-
-  These binaries are built from the bootstrap/stage3-sysroot.bst element,
-  and released following the process documented in the README.md file.
-environment:
-  PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin
-public:
-  bst:
-    integration-commands:
-    - /usr/bin/ldconfig
-(?):
+description: Import the base freedesktop SDK
+sources:
+- kind: ostree
+  url: https://sdk.gnome.org/repo/
+  # Do not verify repo: Workaround for https://gitlab.com/BuildStream/buildstream/issues/524
+  #gpg-key: keys/gnome-sdk.gpg
+  (?):
   - build_arch == "x86_64":
-      sources:
-      - kind: ostree
-        url: https://ostree.baserock.org/releases/
-        track: stage3-sysroot/x86_64
-        ref: a9a66b162cb158078cb67e1ba94a8947d1076463f2e5e429caa416f311ac0a01
+      track: runtime/org.freedesktop.BaseSdk/x86_64/1.6
+      ref: cd99f96a45ff60feca0afbb64dfee6de51bd26a11d6cf2d861fecd1a7691080a
+  - build_arch == "x86_32":
+      track: runtime/org.freedesktop.BaseSdk/i386/1.6
+      ref: 024f351c3a426841059bc22c4d523ed49e90a24f0b0d39d85f653a10f77aaa5f
+  - build_arch == "armv8l64":
+      track: runtime/org.freedesktop.BaseSdk/aarch64/1.6
+      ref: 3333fee02b034e5cd1884ab55433c6b236a4d8648303a7d87be57de510a8f76a
+
+config:
+  source: files
+  target: usr
-- 
cgit v1.2.1