[gnome-build-meta/jjardon/ostree_fdsdk: 7/8] Use ostree from fdsdk

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

commit 783b45afb636e9c9942581ff58de415b8e325925
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Apr 7 11:52:54 2020 +0100

    Use ostree from fdsdk

 elements/core-deps.bst             |   1 -
 elements/core-deps/eos-updater.bst |   2 +-
 elements/core-deps/flatpak.bst     |   2 +-
 elements/core-deps/libostree.bst   |  40 -----
 elements/vm/dev-repo-script.bst    |   2 +-
 elements/vm/image.bst              |   4 +-
 elements/vm/initramfs/deps.bst     |   2 +-
 elements/vm/ostree-config.bst      |   2 +-
 elements/vm/repo.bst               |   4 +-
 files/ostree/no-boot-symlink.patch | 313 -------------------------------------
 10 files changed, 9 insertions(+), 363 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index b8f63a9f..7a652c27 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -79,7 +79,6 @@ depends:
 - core-deps/libnma.bst
 - core-deps/liboauth.bst
 - core-deps/libosinfo.bst
-- core-deps/libostree.bst
 - core-deps/libpeas.bst
 - core-deps/libportal.bst
 - core-deps/libqmi.bst
diff --git a/elements/core-deps/eos-updater.bst b/elements/core-deps/eos-updater.bst
index 403c9cef..802dcbc8 100644
--- a/elements/core-deps/eos-updater.bst
+++ b/elements/core-deps/eos-updater.bst
@@ -8,10 +8,10 @@ depends:
 - core-deps/NetworkManager.bst
 - core-deps/flatpak.bst
 - core-deps/mogwai.bst
-- core-deps/libostree.bst
 - sdk/gobject-introspection.bst
 - freedesktop-sdk.bst:components/avahi.bst
 - freedesktop-sdk.bst:components/gnupg.bst
+- freedesktop-sdk.bst:components/ostree.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
 build-depends:
diff --git a/elements/core-deps/flatpak.bst b/elements/core-deps/flatpak.bst
index f7d85b0e..ca5648e5 100644
--- a/elements/core-deps/flatpak.bst
+++ b/elements/core-deps/flatpak.bst
@@ -17,7 +17,6 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 
 depends:
-- core-deps/libostree.bst
 - core-deps/polkit.bst
 - sdk/appstream-glib.bst
 - sdk/json-glib.bst
@@ -28,5 +27,6 @@ depends:
 - freedesktop-sdk.bst:components/libcap.bst
 - freedesktop-sdk.bst:components/libseccomp.bst
 - freedesktop-sdk.bst:components/libxml2.bst
+- freedesktop-sdk.bst:components/ostree.bst
 - freedesktop-sdk.bst:components/xorg-lib-xau.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/vm/dev-repo-script.bst b/elements/vm/dev-repo-script.bst
index e44c2317..cecde8b5 100644
--- a/elements/vm/dev-repo-script.bst
+++ b/elements/vm/dev-repo-script.bst
@@ -4,7 +4,7 @@ depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
 
 runtime-depends:
-- core-deps/libostree.bst
+- freedesktop-sdk.bst:components/ostree.bst
 - freedesktop-sdk.bst:components/curl.bst
 
 config:
diff --git a/elements/vm/image.bst b/elements/vm/image.bst
index a65e296e..9367dd25 100644
--- a/elements/vm/image.bst
+++ b/elements/vm/image.bst
@@ -1,9 +1,9 @@
 kind: script
 
 build-depends:
-- core-deps/libostree.bst
 - vm/qemu-tools.bst
 - vm/repo.bst
+- freedesktop-sdk.bst:components/ostree.bst
 - freedesktop-sdk.bst:integration/mtab.bst
 - freedesktop-sdk.bst:components/genimage.bst
 
@@ -31,7 +31,7 @@ config:
     destination: '/genimage'
   - element: vm/repo.bst
     destination: '/source-repo'
-  - element: core-deps/libostree.bst
+  - freedesktop-sdk.bst:components/ostree.bst
     destination: '/'
   - element: vm/qemu-tools.bst
     destination: '/'
diff --git a/elements/vm/initramfs/deps.bst b/elements/vm/initramfs/deps.bst
index 34a6fd20..0ccd5665 100644
--- a/elements/vm/initramfs/deps.bst
+++ b/elements/vm/initramfs/deps.bst
@@ -11,7 +11,7 @@ runtime-depends:
 - freedesktop-sdk.bst:components/shadow.bst
 - freedesktop-sdk.bst:components/tzdata.bst
 - freedesktop-sdk.bst:components/pkg-config.bst
-- core-deps/libostree.bst
+- freedesktop-sdk.bst:components/ostree.bst
 - vm/linux-firmware.bst
 - vm/plymouth-gnome-theme.bst
 - vm/eos-repartition.bst
diff --git a/elements/vm/ostree-config.bst b/elements/vm/ostree-config.bst
index 33994bb0..e6c75595 100644
--- a/elements/vm/ostree-config.bst
+++ b/elements/vm/ostree-config.bst
@@ -12,7 +12,7 @@ build-depends:
 
 runtime-depends:
 - freedesktop-sdk.bst:components/systemd.bst
-- core-deps/libostree.bst
+- freedesktop-sdk.bst:components/ostree.bst
 
 config:
   build-commands:
diff --git a/elements/vm/repo.bst b/elements/vm/repo.bst
index 0ad012ab..5cc3f667 100644
--- a/elements/vm/repo.bst
+++ b/elements/vm/repo.bst
@@ -1,9 +1,9 @@
 kind: script
 
 build-depends:
-- core-deps/libostree.bst
 - vm/filesystem.bst
 - vm/initial-scripts.bst
+- freedesktop-sdk.bst:components/ostree.bst
 - freedesktop-sdk.bst:vm/prepare-image.bst
 
 variables:
@@ -16,7 +16,7 @@ config:
   layout:
   - element: ''
     destination: /tmp
-  - element: core-deps/libostree.bst
+  - element: freedesktop-sdk:components/ostree.bst
     destination: /
   - element: vm/filesystem.bst
     destination: /sysroot