[gnome-build-meta/valentindavid/factorize-board-image-deps: 3/3] Factorize common dependencies in bootable images

[Valentin David <valentindavid src gnome org>]

commit f08459d32c6317ed1a46904894a066e0db05237f
Author: Valentin David <valentin david codethink co uk>
Date:   Fri Jun 12 12:41:58 2020 +0200

    Factorize common dependencies in bootable images

 elements/boards/pinebook-pro/deps.bst       | 35 +----------------------------
 elements/boards/pinebook-pro/filesystem.bst |  1 +
 elements/boards/raspberrypi-4/deps.bst      | 32 +-------------------------
 elements/vm/common-deps.bst                 | 23 +++++++++++++++++++
 elements/vm/deps.bst                        | 21 +----------------
 elements/vm/filesystem.bst                  |  1 +
 6 files changed, 28 insertions(+), 85 deletions(-)
---
diff --git a/elements/boards/pinebook-pro/deps.bst b/elements/boards/pinebook-pro/deps.bst
index a766543e..b84bfb28 100644
--- a/elements/boards/pinebook-pro/deps.bst
+++ b/elements/boards/pinebook-pro/deps.bst
@@ -1,41 +1,8 @@
 kind: stack
 
 runtime-depends:
-- freedesktop-sdk.bst:components/avahi.bst
-- freedesktop-sdk.bst:components/util-linux.bst
-- freedesktop-sdk.bst:components/tzdata.bst
-- freedesktop-sdk.bst:components/systemd.bst
-- freedesktop-sdk.bst:components/xorg-server.bst
-- freedesktop-sdk.bst:components/shadow.bst
-- freedesktop-sdk.bst:vm/mesa-default.bst
-
-- core-deps/flatpak.bst
-- vm/ostree-config.bst
-- core-deps/eos-updater.bst
-
-- vm/plymouth-gnome-theme.bst
-- vm/dev-repo-script.bst
-
-- freedesktop-sdk.bst:vm/config/pulseaudio.bst
-- freedesktop-sdk.bst:vm/config/sudo.bst
-- freedesktop-sdk.bst:vm/config/journald.bst
-- freedesktop-sdk.bst:vm/config/useradd-ostree.bst
-- vm/flathub-config.bst
-
-# And add GNOME core on top !
-- sdk-platform.bst
-- core.bst
-- core/systemd-presets.bst
+- vm/common-deps.bst
 
 - boards/pinebook-pro/initramfs.bst
-- vm/resize-root.bst
-- vm/eos-repartition.bst
-
 - boards/pinebook-pro/keyboard-updater.bst
-
-- freedesktop-sdk.bst:components/linux-firmware.bst
-- freedesktop-sdk.bst:components/wireless-regdb-bin.bst
-
-- vm/wpa-supplicant-config.bst
-
 - boards/pinebook-pro/disable-suspend.bst
diff --git a/elements/boards/pinebook-pro/filesystem.bst b/elements/boards/pinebook-pro/filesystem.bst
index e005a981..76cf9f5c 100644
--- a/elements/boards/pinebook-pro/filesystem.bst
+++ b/elements/boards/pinebook-pro/filesystem.bst
@@ -2,6 +2,7 @@ kind: compose
 
 build-depends:
 - boards/pinebook-pro/deps.bst
+- boards/pinebook-pro/initramfs.bst
 
 config:
   exclude:
diff --git a/elements/boards/raspberrypi-4/deps.bst b/elements/boards/raspberrypi-4/deps.bst
index 74db16a0..58680727 100644
--- a/elements/boards/raspberrypi-4/deps.bst
+++ b/elements/boards/raspberrypi-4/deps.bst
@@ -1,37 +1,7 @@
 kind: stack
 
 runtime-depends:
-- freedesktop-sdk.bst:components/util-linux.bst
-- freedesktop-sdk.bst:components/tzdata.bst
-- freedesktop-sdk.bst:components/systemd.bst
-- freedesktop-sdk.bst:components/xorg-server.bst
-- freedesktop-sdk.bst:components/shadow.bst
-- freedesktop-sdk.bst:components/avahi.bst
-- freedesktop-sdk.bst:vm/mesa-default.bst
-
-- core-deps/flatpak.bst
-- vm/ostree-config.bst
-- core-deps/eos-updater.bst
-- vm/dev-repo-script.bst
-- vm/plymouth-gnome-theme.bst
-
-- freedesktop-sdk.bst:vm/config/pulseaudio.bst
-- freedesktop-sdk.bst:vm/config/sudo.bst
-- freedesktop-sdk.bst:vm/config/journald.bst
-- vm/flathub-config.bst
-
-- sdk-platform.bst
-- core.bst
-- core/systemd-presets.bst
-
+- vm/common-deps.bst
 - boards/raspberrypi-4/initramfs.bst
-- vm/resize-root.bst
-- vm/eos-repartition.bst
-
-- freedesktop-sdk.bst:components/linux-firmware.bst
-- freedesktop-sdk.bst:components/wireless-regdb-bin.bst
-
-- vm/wpa-supplicant-config.bst
-
 - boards/raspberrypi-4/bsp/firmware.bst
 - boards/raspberrypi-4/bsp/rpi-userland.bst
diff --git a/elements/vm/common-deps.bst b/elements/vm/common-deps.bst
new file mode 100644
index 00000000..b8125496
--- /dev/null
+++ b/elements/vm/common-deps.bst
@@ -0,0 +1,23 @@
+kind: stack
+
+runtime-depends:
+- core.bst
+- core/systemd-presets.bst
+- sdk-platform.bst
+
+- vm/dev-repo-script.bst
+- vm/flathub-config.bst
+- vm/ostree-config.bst
+- vm/plymouth-gnome-theme.bst
+- vm/resize-root.bst
+- vm/spice-vdagent.bst
+- vm/wpa-supplicant-config.bst
+
+- freedesktop-sdk.bst:vm/config/pulseaudio.bst
+- freedesktop-sdk.bst:vm/config/sudo.bst
+- freedesktop-sdk.bst:vm/config/journald.bst
+- freedesktop-sdk.bst:vm/config/useradd-ostree.bst
+- freedesktop-sdk.bst:vm/mesa-default.bst
+- freedesktop-sdk.bst:components/linux-firmware.bst
+- freedesktop-sdk.bst:components/openssh-systemd.bst
+- freedesktop-sdk.bst:components/wireless-regdb-bin.bst
diff --git a/elements/vm/deps.bst b/elements/vm/deps.bst
index 370bc0aa..16251332 100644
--- a/elements/vm/deps.bst
+++ b/elements/vm/deps.bst
@@ -1,24 +1,5 @@
 kind: stack
 
 runtime-depends:
-- core.bst
-- core/systemd-presets.bst
-- sdk-platform.bst
-
-- vm/dev-repo-script.bst
-- vm/flathub-config.bst
+- vm/common-deps.bst
 - vm/initramfs.bst
-- vm/ostree-config.bst
-- vm/plymouth-gnome-theme.bst
-- vm/resize-root.bst
-- vm/spice-vdagent.bst
-- vm/wpa-supplicant-config.bst
-
-- freedesktop-sdk.bst:vm/config/pulseaudio.bst
-- freedesktop-sdk.bst:vm/config/sudo.bst
-- freedesktop-sdk.bst:vm/config/journald.bst
-- freedesktop-sdk.bst:vm/config/useradd-ostree.bst
-- freedesktop-sdk.bst:vm/mesa-default.bst
-- freedesktop-sdk.bst:components/linux-firmware.bst
-- freedesktop-sdk.bst:components/openssh-systemd.bst
-- freedesktop-sdk.bst:components/wireless-regdb-bin.bst
diff --git a/elements/vm/filesystem.bst b/elements/vm/filesystem.bst
index da7e9f3f..6141cf79 100644
--- a/elements/vm/filesystem.bst
+++ b/elements/vm/filesystem.bst
@@ -2,6 +2,7 @@ kind: compose
 
 build-depends:
 - vm/deps.bst
+- vm/initramfs.bst
 
 # Currently we just take everything and remove the
 # devel stuff (headers and static libraries), and debugging