Move the common dependencies to qemu.inc for cleaner entries in the various recipes. Remove an unneeded inherit.
Signed-off-by: Richard Purdie <[email protected]> --- meta/recipes-devtools/qemu/qemu-native_8.1.2.bb | 2 +- meta/recipes-devtools/qemu/qemu-system-native_8.1.2.bb | 4 +--- meta/recipes-devtools/qemu/qemu.inc | 2 ++ meta/recipes-devtools/qemu/qemu_8.1.2.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/qemu/qemu-native_8.1.2.bb b/meta/recipes-devtools/qemu/qemu-native_8.1.2.bb index 73a0f63f2b2..a77953529b1 100644 --- a/meta/recipes-devtools/qemu/qemu-native_8.1.2.bb +++ b/meta/recipes-devtools/qemu/qemu-native_8.1.2.bb @@ -1,6 +1,6 @@ BPN = "qemu" -DEPENDS = "glib-2.0-native zlib-native ninja-native meson-native" +DEPENDS += "glib-2.0-native zlib-native" require qemu-native.inc diff --git a/meta/recipes-devtools/qemu/qemu-system-native_8.1.2.bb b/meta/recipes-devtools/qemu/qemu-system-native_8.1.2.bb index 558a416f7b4..0634b342429 100644 --- a/meta/recipes-devtools/qemu/qemu-system-native_8.1.2.bb +++ b/meta/recipes-devtools/qemu/qemu-system-native_8.1.2.bb @@ -1,13 +1,11 @@ BPN = "qemu" -inherit python3-dir - require qemu-native.inc # As some of the files installed by qemu-native and qemu-system-native # are the same, we depend on qemu-native to get the full installation set # and avoid file clashes -DEPENDS = "glib-2.0-native zlib-native pixman-native qemu-native bison-native meson-native ninja-native" +DEPENDS += "glib-2.0-native zlib-native pixman-native qemu-native" EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 58284ef9937..9e187a09958 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -6,6 +6,8 @@ a variety of guest operating systems" HOMEPAGE = "http://qemu.org"; LICENSE = "GPL-2.0-only & LGPL-2.1-only" +DEPENDS += "bison-native meson-native ninja-native" + RDEPENDS:${PN}-ptest = "bash" require qemu-targets.inc diff --git a/meta/recipes-devtools/qemu/qemu_8.1.2.bb b/meta/recipes-devtools/qemu/qemu_8.1.2.bb index 84ee0bcc492..dc1352232ef 100644 --- a/meta/recipes-devtools/qemu/qemu_8.1.2.bb +++ b/meta/recipes-devtools/qemu/qemu_8.1.2.bb @@ -2,7 +2,7 @@ BBCLASSEXTEND = "nativesdk" require qemu.inc -DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" +DEPENDS += "glib-2.0 zlib pixman" DEPENDS:append:libc-musl = " libucontext" -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192796): https://lists.openembedded.org/g/openembedded-core/message/192796 Mute This Topic: https://lists.openembedded.org/mt/103278928/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
