summaryrefslogtreecommitdiff
path: root/elements/gnu-toolchain
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-09-20 10:54:31 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-10-26 16:50:33 +0000
commit995a5b3effc82c39f929d0290e74b84ee25d773b (patch)
treed185e58dfc09989fc77ec6fa560e4d9890b548cf /elements/gnu-toolchain
parent8e880181f2cb365c80f0b05ac452710ece8a9d0c (diff)
downloaddefinitions-995a5b3effc82c39f929d0290e74b84ee25d773b.tar.gz
gnu-toolchain: Use binaries from Baserock releases repo to bootstrap
This replaces the previous approach of using the Freedesktop SDK binaries. We need to support more architectures than just x86_32 and x86_64, and in general it's better to bootstrap from a minimal sysroot that we build and control. The binaries are hosted at https://ostree.baserock.org/releases and are produced by a manual (but automatable) process that I will document in subsequent commits from the `bootstrap/stage3-sysroot.bst` element.
Diffstat (limited to 'elements/gnu-toolchain')
-rw-r--r--elements/gnu-toolchain/base-platform.bst23
-rw-r--r--elements/gnu-toolchain/base-sdk.bst20
-rw-r--r--elements/gnu-toolchain/base.bst15
-rw-r--r--elements/gnu-toolchain/stage1-binutils.bst5
-rw-r--r--elements/gnu-toolchain/stage1-gcc.bst5
-rw-r--r--elements/gnu-toolchain/stage1.bst3
6 files changed, 20 insertions, 51 deletions
diff --git a/elements/gnu-toolchain/base-platform.bst b/elements/gnu-toolchain/base-platform.bst
deleted file mode 100644
index ce9cdc0a..00000000
--- a/elements/gnu-toolchain/base-platform.bst
+++ /dev/null
@@ -1,23 +0,0 @@
-kind: import
-description: Import the base freedesktop platform
-config:
- source: files
-public:
- bst:
- integration-commands:
- - ldconfig
-host-arches:
- x86_64:
- sources:
- - kind: ostree
- url: gnomesdk:repo/
- track: runtime/org.freedesktop.BasePlatform/x86_64/1.4
- gpg-key: keys/gnome-sdk.gpg
- ref: c9d09b7250a12ef09d95952fc4f49a35e5f8c2c1dd7141b7eeada4069e6f6576
- i386:
- sources:
- - kind: ostree
- url: gnomesdk:repo/
- track: runtime/org.freedesktop.BasePlatform/i386/1.4
- gpg-key: keys/gnome-sdk.gpg
- ref: 27ebae91839a454596a273391b0e53063eaa8aca4fc9cb64654582bfbc338c96
diff --git a/elements/gnu-toolchain/base-sdk.bst b/elements/gnu-toolchain/base-sdk.bst
deleted file mode 100644
index 61c29f64..00000000
--- a/elements/gnu-toolchain/base-sdk.bst
+++ /dev/null
@@ -1,20 +0,0 @@
-kind: import
-description: Import the base freedesktop SDK
-config:
- source: files
- target: usr
-host-arches:
- x86_64:
- sources:
- - kind: ostree
- url: gnomesdk:repo/
- track: runtime/org.freedesktop.BaseSdk/x86_64/1.4
- gpg-key: keys/gnome-sdk.gpg
- ref: 0d9d255d56b08aeaaffb1c820eef85266eb730cb5667e50681185ccf5cd7c882
- i386:
- sources:
- - kind: ostree
- url: gnomesdk:repo/
- track: runtime/org.freedesktop.BaseSdk/i386/1.4
- gpg-key: keys/gnome-sdk.gpg
- ref: 16036b747c1ec8e7fe291f5b1f667cb942f0267d08fcad962e9b7627d6cf1981
diff --git a/elements/gnu-toolchain/base.bst b/elements/gnu-toolchain/base.bst
new file mode 100644
index 00000000..52b8994f
--- /dev/null
+++ b/elements/gnu-toolchain/base.bst
@@ -0,0 +1,15 @@
+kind: import
+description: Import the base freedesktop platform
+environment:
+ PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin
+public:
+ bst:
+ integration-commands:
+ - ldconfig
+host-arches:
+ x86_64:
+ sources:
+ - kind: ostree
+ url: https://ostree.baserock.org/releases/
+ track: stage3-sysroot/x86_64
+ ref: 176e4ce55460e5c99232681a0ffa7f2425fbf8d1573f7f4dcb9daf2bca737311
diff --git a/elements/gnu-toolchain/stage1-binutils.bst b/elements/gnu-toolchain/stage1-binutils.bst
index a1a27326..d36fa6c0 100644
--- a/elements/gnu-toolchain/stage1-binutils.bst
+++ b/elements/gnu-toolchain/stage1-binutils.bst
@@ -7,14 +7,13 @@ sources:
ref: 5500a97a2ad1735db5b35bc51cfb825c1f4c38df
depends:
-- gnu-toolchain/base-platform.bst
-- gnu-toolchain/base-sdk.bst
+- gnu-toolchain/base.bst
variables:
prefix: /tools
environment:
- PATH: /tools/bin:/usr/bin:/bin:/usr/sbin:/sbin
+ PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin
config:
configure-commands:
diff --git a/elements/gnu-toolchain/stage1-gcc.bst b/elements/gnu-toolchain/stage1-gcc.bst
index bcf30bc3..4df5fde7 100644
--- a/elements/gnu-toolchain/stage1-gcc.bst
+++ b/elements/gnu-toolchain/stage1-gcc.bst
@@ -7,15 +7,14 @@ sources:
ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838
depends:
-- gnu-toolchain/base-platform.bst
-- gnu-toolchain/base-sdk.bst
+- gnu-toolchain/base.bst
- gnu-toolchain/stage1-binutils.bst
variables:
prefix: /tools
environment:
- PATH: /tools/bin:/usr/bin:/bin:/usr/sbin:/sbin
+ PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin
config:
configure-commands:
diff --git a/elements/gnu-toolchain/stage1.bst b/elements/gnu-toolchain/stage1.bst
index 80d3aa43..54465610 100644
--- a/elements/gnu-toolchain/stage1.bst
+++ b/elements/gnu-toolchain/stage1.bst
@@ -1,7 +1,6 @@
kind: stack
depends:
-- gnu-toolchain/base-platform.bst
-- gnu-toolchain/base-sdk.bst
+- gnu-toolchain/base.bst
- gnu-toolchain/stage1-binutils.bst
- gnu-toolchain/stage1-gcc.bst