[gnome-build-meta/jjardon/fdsdk-beta5] junction.refs: Use freedesktop-sdk 19.08beta5

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 7ffdd31b51790f8dbc71ce8b5c869cd221d7b720
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Aug 29 13:35:22 2019 +0100

    junction.refs: Use freedesktop-sdk 19.08beta5

 elements/flatpak/platform-image.bst |  9 +++++----
 elements/flatpak/sdk-image.bst      | 12 +++++++-----
 elements/flatpak/sdk.bst            |  2 +-
 elements/sdk-platform.bst           |  6 ++++--
 elements/sdk.bst                    |  2 --
 elements/world/gnome-builder.bst    |  2 +-
 junction.refs                       |  2 +-
 7 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/elements/flatpak/platform-image.bst b/elements/flatpak/platform-image.bst
index b9ab4cb1..fbea56e0 100644
--- a/elements/flatpak/platform-image.bst
+++ b/elements/flatpak/platform-image.bst
@@ -2,20 +2,21 @@ kind: compose
 depends:
 - filename: sdk-platform.bst
   type: build
-- filename: multiarch-platform.bst
+- filename: multiarch/multiarch-platform.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: split-locales.bst
+- filename: integration/split-locales.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: split-docs.bst
+- filename: integration/split-docs.bst
   junction: freedesktop-sdk.bst
   type: build
 config:
   exclude:
   - devel
   - extra
-  - static
+  - static-blocklist
+  - vm-only
 public:
   bst:
     split-rules:
diff --git a/elements/flatpak/sdk-image.bst b/elements/flatpak/sdk-image.bst
index d1c5a18d..00041927 100644
--- a/elements/flatpak/sdk-image.bst
+++ b/elements/flatpak/sdk-image.bst
@@ -2,24 +2,26 @@ kind: compose
 depends:
 - filename: sdk.bst
   type: build
-- filename: multiarch-sdk.bst
+- filename: multiarch/multiarch-sdk.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: split-locales.bst
+- filename: integration/split-locales.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: split-docs.bst
+- filename: integration/split-docs.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: flatpak-builder-configuration.bst
+- filename: integration/flatpak-builder-configuration.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: debug-app-link.bst
+- filename: integration/debug-app-link.bst
   junction: freedesktop-sdk.bst
   type: build
 config:
   exclude:
   - extra
+  - static-blocklist
+  - vm-only
 public:
   bst:
     split-rules:
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index 12ad9621..6a4abea8 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -2,7 +2,7 @@ kind: flatpak_image
 depends:
 - filename: flatpak/sdk-image.bst
   type: build
-- filename: linker-debuginfo.bst
+- filename: integration/linker-debuginfo.bst
   junction: freedesktop-sdk.bst
   type: build
 
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 14b1cf87..fc6278d8 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -69,7 +69,7 @@ depends:
 
 # Due to being relatively deep in the stack, glib needs special treatment.
 
-- filename: mtab.bst
+- filename: integration/mtab.bst
   junction: freedesktop-sdk.bst
 - filename: components/ca-certificates.bst
   junction: freedesktop-sdk.bst
@@ -187,6 +187,8 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: components/nsswitch-config.bst
   junction: freedesktop-sdk.bst
+- filename: components/openssh.bst
+  junction: freedesktop-sdk.bst
 - filename: components/opus.bst
   junction: freedesktop-sdk.bst
 - filename: components/osmesa.bst
@@ -311,7 +313,7 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: components/libxkbcommon.bst
   junction: freedesktop-sdk.bst
-- filename: components/llvm8.bst
+- filename: components/llvm.bst
   junction: freedesktop-sdk.bst
 - filename: components/mesa-headers.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk.bst b/elements/sdk.bst
index 6a3b3ea3..39f19d3e 100644
--- a/elements/sdk.bst
+++ b/elements/sdk.bst
@@ -83,8 +83,6 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: components/jq.bst
   junction: freedesktop-sdk.bst
-- filename: components/libva-utils.bst
-  junction: freedesktop-sdk.bst
 - filename: components/wayland-protocols.bst
   junction: freedesktop-sdk.bst
 - filename: components/xorg-proto-xcb.bst
diff --git a/elements/world/gnome-builder.bst b/elements/world/gnome-builder.bst
index a0c37602..5f829107 100644
--- a/elements/world/gnome-builder.bst
+++ b/elements/world/gnome-builder.bst
@@ -24,7 +24,7 @@ depends:
 - world/template-glib.bst
 - filename: deploy-tools/flatpak.bst
   junction: freedesktop-sdk.bst
-- filename: components/llvm8.bst
+- filename: components/llvm.bst
   junction: freedesktop-sdk.bst
 - filename: bootstrap-import.bst
   junction: freedesktop-sdk.bst
diff --git a/junction.refs b/junction.refs
index da850e68..3df794bd 100644
--- a/junction.refs
+++ b/junction.refs
@@ -1,4 +1,4 @@
 projects:
   gnome:
     freedesktop-sdk.bst:
-    - ref: freedesktop-sdk-19.08beta.4-0-gaa3f0fb924a55572d894f417e236d056242332e9
+    - ref: freedesktop-sdk-19.08beta.5-0-gef5084a6425ad5d80990a7d2563596b72facd517