diff options
-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, 12 insertions, 49 deletions
diff --git a/elements/gnu-toolchain/alpine-sysroot.bst b/elements/gnu-toolchain/alpine-sysroot.bst new file mode 100644 index 00000000..8213c10a --- /dev/null +++ b/elements/gnu-toolchain/alpine-sysroot.bst @@ -0,0 +1,9 @@ +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 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/stage1-binutils.bst b/elements/gnu-toolchain/stage1-binutils.bst index 72d51bcb..b88884e4 100644 --- a/elements/gnu-toolchain/stage1-binutils.bst +++ b/elements/gnu-toolchain/stage1-binutils.bst @@ -7,8 +7,7 @@ sources: ref: 5500a97a2ad1735db5b35bc51cfb825c1f4c38df depends: -- gnu-toolchain/base-platform.bst -- gnu-toolchain/base-sdk.bst +- gnu-toolchain/alpine-sysroot.bst variables: prefix: /tools diff --git a/elements/gnu-toolchain/stage1-gcc.bst b/elements/gnu-toolchain/stage1-gcc.bst index 17851848..4d201e33 100644 --- a/elements/gnu-toolchain/stage1-gcc.bst +++ b/elements/gnu-toolchain/stage1-gcc.bst @@ -7,8 +7,7 @@ sources: ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06 depends: -- gnu-toolchain/base-platform.bst -- gnu-toolchain/base-sdk.bst +- gnu-toolchain/alpine-sysroot.bst - gnu-toolchain/stage1-binutils.bst variables: diff --git a/elements/gnu-toolchain/stage1.bst b/elements/gnu-toolchain/stage1.bst index 80d3aa43..c1dc83e5 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/alpine-sysroot.bst - gnu-toolchain/stage1-binutils.bst - gnu-toolchain/stage1-gcc.bst |