From 4faa52372d4e9422346b15ef696fc8616196950d Mon Sep 17 00:00:00 2001
From: Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
Date: Tue, 11 Apr 2017 17:03:47 +0900
Subject: Reworking the gnu toolchain project

 o Use the org.freedesktop.BasePlaform and org.freedesktop.BaseSdk
   for building instead of the whole GNOME runtime.

 o Some minor renames
---
 elements/gnu-toolchain/base-platform.bst   | 23 +++++++++++++++++++++++
 elements/gnu-toolchain/base-sdk.bst        | 20 ++++++++++++++++++++
 elements/gnu-toolchain/gnome-platform.bst  | 27 ---------------------------
 elements/gnu-toolchain/gnome-sdk.bst       | 20 --------------------
 elements/gnu-toolchain/stage1-binutils.bst |  4 ++--
 elements/gnu-toolchain/stage1-gcc.bst      |  4 ++--
 elements/gnu-toolchain/stage1.bst          |  4 ++--
 7 files changed, 49 insertions(+), 53 deletions(-)
 create mode 100644 elements/gnu-toolchain/base-platform.bst
 create mode 100644 elements/gnu-toolchain/base-sdk.bst
 delete mode 100644 elements/gnu-toolchain/gnome-platform.bst
 delete mode 100644 elements/gnu-toolchain/gnome-sdk.bst

(limited to 'elements')

diff --git a/elements/gnu-toolchain/base-platform.bst b/elements/gnu-toolchain/base-platform.bst
new file mode 100644
index 00000000..09c95acb
--- /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
+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..cd191fd1
--- /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
+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/gnome-platform.bst b/elements/gnu-toolchain/gnome-platform.bst
deleted file mode 100644
index fd5efb6b..00000000
--- a/elements/gnu-toolchain/gnome-platform.bst
+++ /dev/null
@@ -1,27 +0,0 @@
-kind: import
-description: Import the GNOME Platform
-config:
-  source: files
-public:
-  bst:
-    integration-commands:
-    - ldconfig
-    - |
-      if [ -d "/app/share/glib-2.0/schemas" ]; then
-        glib-compile-schemas /app/share/glib-2.0/schemas
-      fi
-arches:
-  x86_64:
-    sources:
-    - kind: ostree
-      url: gnomesdk:repo/
-      track: runtime/org.gnome.Platform/x86_64/3.22
-      gpg-key: keys/gnome-sdk.gpg
-      ref: af7b50663d808bf5cc6eb7538a3481b29c34864d71b719562246071113a18327
-  i386:
-    sources:
-    - kind: ostree
-      url: gnomesdk:repo/
-      track: runtime/org.gnome.Platform/i386/3.22
-      gpg-key: keys/gnome-sdk.gpg
-      ref: 8c86378e95d305097e64a7b04e23595773ab894ed5d216b49777a22819bff08f
diff --git a/elements/gnu-toolchain/gnome-sdk.bst b/elements/gnu-toolchain/gnome-sdk.bst
deleted file mode 100644
index 6b0f158f..00000000
--- a/elements/gnu-toolchain/gnome-sdk.bst
+++ /dev/null
@@ -1,20 +0,0 @@
-kind: import
-description: Import the GNOME SDK
-config:
-  source: files
-  target: usr
-arches:
-  x86_64:
-    sources:
-    - kind: ostree
-      url: gnomesdk:repo/
-      track: runtime/org.gnome.Sdk/x86_64/3.22
-      gpg-key: keys/gnome-sdk.gpg
-      ref: bc2d97521fa42ca824b4d28b1b7746e275820b26aa63c9ae08d6aa5eefcfee20
-  i386:
-    sources:
-    - kind: ostree
-      url: gnomesdk:repo/
-      track: runtime/org.gnome.Sdk/i386/3.22
-      gpg-key: keys/gnome-sdk.gpg
-      ref: f5616d5b7257a81a8e8b08c34cd7ffcfe3b79c80439c969799dc8617fd9ac5c5
diff --git a/elements/gnu-toolchain/stage1-binutils.bst b/elements/gnu-toolchain/stage1-binutils.bst
index f22a4458..72d51bcb 100644
--- a/elements/gnu-toolchain/stage1-binutils.bst
+++ b/elements/gnu-toolchain/stage1-binutils.bst
@@ -7,8 +7,8 @@ sources:
   ref: 5500a97a2ad1735db5b35bc51cfb825c1f4c38df
 
 depends:
-- gnu-toolchain/gnome-platform.bst
-- gnu-toolchain/gnome-sdk.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 f7244c00..17851848 100644
--- a/elements/gnu-toolchain/stage1-gcc.bst
+++ b/elements/gnu-toolchain/stage1-gcc.bst
@@ -7,8 +7,8 @@ sources:
   ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
 
 depends:
-- gnu-toolchain/gnome-platform.bst
-- gnu-toolchain/gnome-sdk.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 8e5399a0..80d3aa43 100644
--- a/elements/gnu-toolchain/stage1.bst
+++ b/elements/gnu-toolchain/stage1.bst
@@ -1,7 +1,7 @@
 kind: stack
 
 depends:
-- gnu-toolchain/gnome-platform.bst
-- gnu-toolchain/gnome-sdk.bst
+- gnu-toolchain/base-platform.bst
+- gnu-toolchain/base-sdk.bst
 - gnu-toolchain/stage1-binutils.bst
 - gnu-toolchain/stage1-gcc.bst
-- 
cgit v1.2.1