[gnome-build-meta/valentindavid/ostree-from-fd-sdk: 2/2] Use ostree from Freedesktop SDK

[Valentin David <valentindavid src gnome org>]

commit 425492911385a2d6ea4a1f6bd6843deda49ffa47
Author: Valentin David <valentin david codethink co uk>
Date:   Sat May 9 14:36:22 2020 +0200

    Use ostree from Freedesktop SDK

 elements/boards/pinebook-pro/image-deps.bst     |  2 +-
 elements/boards/pinebook-pro/initramfs/deps.bst |  2 +-
 elements/boards/pinebook-pro/repo.bst           |  4 +--
 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 +--
 12 files changed, 13 insertions(+), 54 deletions(-)
---
diff --git a/elements/boards/pinebook-pro/image-deps.bst b/elements/boards/pinebook-pro/image-deps.bst
index 56f95c44..31faf0dc 100644
--- a/elements/boards/pinebook-pro/image-deps.bst
+++ b/elements/boards/pinebook-pro/image-deps.bst
@@ -4,5 +4,5 @@ runtime-depends:
 - freedesktop-sdk.bst:integration/mtab.bst
 - freedesktop-sdk.bst:components/genimage.bst
 - vm/qemu-tools.bst
-- core-deps/libostree.bst
+- freedesktop-sdk.bst:components/ostree.bst
 - boards/pinebook-pro/u-boot.bst
diff --git a/elements/boards/pinebook-pro/initramfs/deps.bst b/elements/boards/pinebook-pro/initramfs/deps.bst
index eeba23d6..de425737 100644
--- a/elements/boards/pinebook-pro/initramfs/deps.bst
+++ b/elements/boards/pinebook-pro/initramfs/deps.bst
@@ -16,5 +16,5 @@ runtime-depends:
 - freedesktop-sdk.bst:components/linux-firmware.bst
 - freedesktop-sdk.bst:components/wireless-regdb-bin.bst
 
-- core-deps/libostree.bst
+- freedesktop-sdk.bst:components/ostree.bst
 - vm/eos-repartition.bst
diff --git a/elements/boards/pinebook-pro/repo.bst b/elements/boards/pinebook-pro/repo.bst
index 0cd38094..9f43213a 100644
--- a/elements/boards/pinebook-pro/repo.bst
+++ b/elements/boards/pinebook-pro/repo.bst
@@ -2,7 +2,7 @@ kind: script
 
 build-depends:
 - freedesktop-sdk.bst:vm/prepare-image.bst
-- core-deps/libostree.bst
+- freedesktop-sdk.bst:components/ostree.bst
 - boards/pinebook-pro/initial-scripts.bst
 - boards/pinebook-pro/filesystem.bst
 
@@ -17,7 +17,7 @@ config:
   layout:
   - element: ''
     destination: /tmp
-  - element: core-deps/libostree.bst
+  - element: components/ostree.bst
     destination: /
   - element: boards/pinebook-pro/filesystem.bst
     destination: /sysroot
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index bc377eb7..2c18d12e 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -74,7 +74,6 @@ depends:
 - core-deps/libnma.bst
 - core-deps/liboauth.bst
 - core-deps/libosinfo.bst
-- core-deps/libostree.bst
 - core-deps/libpeas.bst
 - core-deps/libqmi.bst
 - core-deps/librest.bst
diff --git a/elements/core-deps/eos-updater.bst b/elements/core-deps/eos-updater.bst
index 403c9cef..d327506e 100644
--- a/elements/core-deps/eos-updater.bst
+++ b/elements/core-deps/eos-updater.bst
@@ -8,7 +8,7 @@ depends:
 - core-deps/NetworkManager.bst
 - core-deps/flatpak.bst
 - core-deps/mogwai.bst
-- core-deps/libostree.bst
+- freedesktop-sdk.bst:components/ostree.bst
 - sdk/gobject-introspection.bst
 - freedesktop-sdk.bst:components/avahi.bst
 - freedesktop-sdk.bst:components/gnupg.bst
diff --git a/elements/core-deps/flatpak.bst b/elements/core-deps/flatpak.bst
index f7d85b0e..247bf17d 100644
--- a/elements/core-deps/flatpak.bst
+++ b/elements/core-deps/flatpak.bst
@@ -17,7 +17,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 
 depends:
-- core-deps/libostree.bst
+- freedesktop-sdk.bst:components/ostree.bst
 - core-deps/polkit.bst
 - sdk/appstream-glib.bst
 - sdk/json-glib.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..cfde8d94 100644
--- a/elements/vm/image.bst
+++ b/elements/vm/image.bst
@@ -1,7 +1,7 @@
 kind: script
 
 build-depends:
-- core-deps/libostree.bst
+- freedesktop-sdk.bst:components/ostree.bst
 - vm/qemu-tools.bst
 - vm/repo.bst
 - freedesktop-sdk.bst:integration/mtab.bst
@@ -31,7 +31,7 @@ config:
     destination: '/genimage'
   - element: vm/repo.bst
     destination: '/source-repo'
-  - element: core-deps/libostree.bst
+  - element: 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 771fe33a..8aed0e8d 100644
--- a/elements/vm/initramfs/deps.bst
+++ b/elements/vm/initramfs/deps.bst
@@ -12,7 +12,7 @@ runtime-depends:
 - freedesktop-sdk.bst:components/tzdata.bst
 - freedesktop-sdk.bst:components/pkg-config.bst
 - freedesktop-sdk.bst:components/linux-firmware.bst
-- core-deps/libostree.bst
+- freedesktop-sdk.bst:components/ostree.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..5bbadd41 100644
--- a/elements/vm/repo.bst
+++ b/elements/vm/repo.bst
@@ -1,7 +1,7 @@
 kind: script
 
 build-depends:
-- core-deps/libostree.bst
+- freedesktop-sdk.bst:components/ostree.bst
 - vm/filesystem.bst
 - vm/initial-scripts.bst
 - freedesktop-sdk.bst:vm/prepare-image.bst
@@ -16,7 +16,7 @@ config:
   layout:
   - element: ''
     destination: /tmp
-  - element: core-deps/libostree.bst
+  - element: components/ostree.bst
     destination: /
   - element: vm/filesystem.bst
     destination: /sysroot