diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-06-22 15:26:27 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-06-22 15:26:27 +0000 |
commit | c3f5712a34e2459a45561ab3f188edc773b9e18b (patch) | |
tree | c30c3b9e59e832b21d054370fcb521e6ff6f30a9 | |
parent | 16ae5bb1507a162d7b1b0c855d664e859cb2461b (diff) | |
download | definitions-c3f5712a34e2459a45561ab3f188edc773b9e18b.tar.gz |
Revert "Replace the Freedesktop SDK with a much smaller Alpine Linux toolchain"
This reverts commit 411bab2c870dff4b0f536c541d87a47be5e4c73c.
I still like the Alpine approach, but I want to see if we can stick with
the Freedesktop SDK approach publically for now. It will depend on how
well that works on GitLab CI, plus whether I can be bothered to host
binaries somewhere.
-rw-r--r-- | elements/gnu-toolchain/alpine-sysroot.bst | 9 | ||||
-rw-r--r-- | elements/gnu-toolchain/base-platform.bst | 23 | ||||
-rw-r--r-- | elements/gnu-toolchain/base-sdk.bst | 20 | ||||
-rw-r--r-- | elements/gnu-toolchain/stage1-binutils.bst | 3 | ||||
-rw-r--r-- | elements/gnu-toolchain/stage1-gcc.bst | 3 | ||||
-rw-r--r-- | elements/gnu-toolchain/stage1.bst | 3 |
6 files changed, 49 insertions, 12 deletions
diff --git a/elements/gnu-toolchain/alpine-sysroot.bst b/elements/gnu-toolchain/alpine-sysroot.bst deleted file mode 100644 index 8213c10a..00000000 --- a/elements/gnu-toolchain/alpine-sysroot.bst +++ /dev/null @@ -1,9 +0,0 @@ -kind: import -description: Import Alpine Linux toolchain binaries -host-arches: - x86_64: - sources: - - kind: tar - url: file:///home/shared/src/buildstream-bootstrap/alpine-host-tools-3.6.1-x86_64.tar.gz - base-dir: . - ref: e01d76ef2c7e3e105778e2aa849a42d38dc3163f8c15f5b2de8f64cd5543cf29 diff --git a/elements/gnu-toolchain/base-platform.bst b/elements/gnu-toolchain/base-platform.bst new file mode 100644 index 00000000..ce9cdc0a --- /dev/null +++ b/elements/gnu-toolchain/base-platform.bst @@ -0,0 +1,23 @@ +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 new file mode 100644 index 00000000..61c29f64 --- /dev/null +++ b/elements/gnu-toolchain/base-sdk.bst @@ -0,0 +1,20 @@ +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/stage1-binutils.bst b/elements/gnu-toolchain/stage1-binutils.bst index b88884e4..72d51bcb 100644 --- a/elements/gnu-toolchain/stage1-binutils.bst +++ b/elements/gnu-toolchain/stage1-binutils.bst @@ -7,7 +7,8 @@ sources: ref: 5500a97a2ad1735db5b35bc51cfb825c1f4c38df depends: -- gnu-toolchain/alpine-sysroot.bst +- gnu-toolchain/base-platform.bst +- gnu-toolchain/base-sdk.bst variables: prefix: /tools diff --git a/elements/gnu-toolchain/stage1-gcc.bst b/elements/gnu-toolchain/stage1-gcc.bst index 83ba3296..a3acfdd3 100644 --- a/elements/gnu-toolchain/stage1-gcc.bst +++ b/elements/gnu-toolchain/stage1-gcc.bst @@ -7,7 +7,8 @@ sources: ref: 3b0dbcfa2e5d12bd80cab1b35f08653d61fe7838 depends: -- gnu-toolchain/alpine-sysroot.bst +- gnu-toolchain/base-platform.bst +- gnu-toolchain/base-sdk.bst - gnu-toolchain/stage1-binutils.bst variables: diff --git a/elements/gnu-toolchain/stage1.bst b/elements/gnu-toolchain/stage1.bst index c1dc83e5..80d3aa43 100644 --- a/elements/gnu-toolchain/stage1.bst +++ b/elements/gnu-toolchain/stage1.bst @@ -1,6 +1,7 @@ kind: stack depends: -- gnu-toolchain/alpine-sysroot.bst +- gnu-toolchain/base-platform.bst +- gnu-toolchain/base-sdk.bst - gnu-toolchain/stage1-binutils.bst - gnu-toolchain/stage1-gcc.bst |