diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-20 10:07:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-21 10:38:30 +0000 |
commit | 85c88f8332502ca295d9dcf3dc978f27b3d31eb4 (patch) | |
tree | d64059f2379e0b3889b68659195742c98455de22 /meta/recipes-devtools/qemu | |
parent | 321aebfa281bd28e368c684ece57867f6bd0cbe7 (diff) | |
download | poky-85c88f8332502ca295d9dcf3dc978f27b3d31eb4.tar.gz |
qemu: Clean up DEPENDS
Move the common dependencies to qemu.inc for cleaner entries in the
various recipes. Remove an unneeded inherit.
(From OE-Core rev: 6e7c2ae575b8f04fd117cc56980bb25113f343a8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu-native_8.1.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu-system-native_8.1.2.bb | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 2 | ||||
-rw-r--r-- | 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 73a0f63f2b..a77953529b 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 @@ | |||
1 | BPN = "qemu" | 1 | BPN = "qemu" |
2 | 2 | ||
3 | DEPENDS = "glib-2.0-native zlib-native ninja-native meson-native" | 3 | DEPENDS += "glib-2.0-native zlib-native" |
4 | 4 | ||
5 | require qemu-native.inc | 5 | require qemu-native.inc |
6 | 6 | ||
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 558a416f7b..0634b34242 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 @@ | |||
1 | BPN = "qemu" | 1 | BPN = "qemu" |
2 | 2 | ||
3 | inherit python3-dir | ||
4 | |||
5 | require qemu-native.inc | 3 | require qemu-native.inc |
6 | 4 | ||
7 | # As some of the files installed by qemu-native and qemu-system-native | 5 | # As some of the files installed by qemu-native and qemu-system-native |
8 | # are the same, we depend on qemu-native to get the full installation set | 6 | # are the same, we depend on qemu-native to get the full installation set |
9 | # and avoid file clashes | 7 | # and avoid file clashes |
10 | DEPENDS = "glib-2.0-native zlib-native pixman-native qemu-native bison-native meson-native ninja-native" | 8 | DEPENDS += "glib-2.0-native zlib-native pixman-native qemu-native" |
11 | 9 | ||
12 | EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" | 10 | EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" |
13 | 11 | ||
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 58284ef993..9e187a0995 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" | |||
6 | HOMEPAGE = "http://qemu.org" | 6 | HOMEPAGE = "http://qemu.org" |
7 | LICENSE = "GPL-2.0-only & LGPL-2.1-only" | 7 | LICENSE = "GPL-2.0-only & LGPL-2.1-only" |
8 | 8 | ||
9 | DEPENDS += "bison-native meson-native ninja-native" | ||
10 | |||
9 | RDEPENDS:${PN}-ptest = "bash" | 11 | RDEPENDS:${PN}-ptest = "bash" |
10 | 12 | ||
11 | require qemu-targets.inc | 13 | 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 84ee0bcc49..dc1352232e 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" | |||
2 | 2 | ||
3 | require qemu.inc | 3 | require qemu.inc |
4 | 4 | ||
5 | DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" | 5 | DEPENDS += "glib-2.0 zlib pixman" |
6 | 6 | ||
7 | DEPENDS:append:libc-musl = " libucontext" | 7 | DEPENDS:append:libc-musl = " libucontext" |
8 | 8 | ||