[gnome-build-meta/abderrahim/more-cleanups: 1/3] drop vm/qemu-tools.bst




commit ec83c792aa168d5b27d3c4a63c940801679e538f
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Dec 24 09:45:04 2021 +0100

    drop vm/qemu-tools.bst
    
    We already build qemu in core-deps/qemu.bst and it has all the needed tools
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1423>

 elements/boards/pinebook-pro/image-deps.bst  |  8 ++---
 elements/boards/raspberrypi-4/image-deps.bst | 10 +++----
 elements/boards/rock64/image-deps.bst        |  8 ++---
 elements/vm/image.bst                        |  4 +--
 elements/vm/qemu-tools.bst                   | 44 ----------------------------
 5 files changed, 15 insertions(+), 59 deletions(-)
---
diff --git a/elements/boards/pinebook-pro/image-deps.bst b/elements/boards/pinebook-pro/image-deps.bst
index 2838e3f18..c4d3f6473 100644
--- a/elements/boards/pinebook-pro/image-deps.bst
+++ b/elements/boards/pinebook-pro/image-deps.bst
@@ -1,8 +1,8 @@
 kind: stack
 
 depends:
-- freedesktop-sdk.bst:integration/mtab.bst
-- freedesktop-sdk.bst:components/genimage.bst
-- vm/qemu-tools.bst
-- core-deps/libostree.bst
 - boards/pinebook-pro/u-boot.bst
+- core-deps/libostree.bst
+- core-deps/qemu.bst
+- freedesktop-sdk.bst:components/genimage.bst
+- freedesktop-sdk.bst:integration/mtab.bst
diff --git a/elements/boards/raspberrypi-4/image-deps.bst b/elements/boards/raspberrypi-4/image-deps.bst
index cbc29e3da..c0ebf8b8e 100644
--- a/elements/boards/raspberrypi-4/image-deps.bst
+++ b/elements/boards/raspberrypi-4/image-deps.bst
@@ -1,9 +1,9 @@
 kind: stack
 
 depends:
-- freedesktop-sdk.bst:integration/mtab.bst
-- freedesktop-sdk.bst:components/genimage.bst
-- vm/qemu-tools.bst
-- core-deps/libostree.bst
-- boards/raspberrypi-4/bsp/u-boot.bst
 - boards/raspberrypi-4/bsp/rpi-efi-boot-script.bst
+- boards/raspberrypi-4/bsp/u-boot.bst
+- core-deps/libostree.bst
+- core-deps/qemu.bst
+- freedesktop-sdk.bst:components/genimage.bst
+- freedesktop-sdk.bst:integration/mtab.bst
diff --git a/elements/boards/rock64/image-deps.bst b/elements/boards/rock64/image-deps.bst
index ccb0ee5f6..06892d491 100644
--- a/elements/boards/rock64/image-deps.bst
+++ b/elements/boards/rock64/image-deps.bst
@@ -1,8 +1,8 @@
 kind: stack
 
 depends:
-- freedesktop-sdk.bst:integration/mtab.bst
-- freedesktop-sdk.bst:components/genimage.bst
-- vm/qemu-tools.bst
-- core-deps/libostree.bst
 - boards/rock64/u-boot.bst
+- core-deps/libostree.bst
+- core-deps/qemu.bst
+- freedesktop-sdk.bst:components/genimage.bst
+- freedesktop-sdk.bst:integration/mtab.bst
diff --git a/elements/vm/image.bst b/elements/vm/image.bst
index 97edcfc52..32e73d38c 100644
--- a/elements/vm/image.bst
+++ b/elements/vm/image.bst
@@ -2,7 +2,7 @@ kind: script
 
 build-depends:
 - core-deps/libostree.bst
-- vm/qemu-tools.bst
+- core-deps/qemu.bst
 - vm/repo.bst
 - freedesktop-sdk.bst:integration/mtab.bst
 - freedesktop-sdk.bst:components/genimage.bst
@@ -37,7 +37,7 @@ config:
     destination: '/source-repo'
   - element: core-deps/libostree.bst
     destination: '/'
-  - element: vm/qemu-tools.bst
+  - element: core-deps/qemu.bst
     destination: '/'
   - element: integration/mtab.bst
     destination: '/'


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]