diff options
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 23 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_8.0.3.bb | 2 |
2 files changed, 13 insertions, 12 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 64bade86aa..eaabc0e706 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -220,15 +220,18 @@ PACKAGECONFIG[brlapi] = "--enable-brlapi,--disable-brlapi" | |||
220 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack," | 220 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack," |
221 | PACKAGECONFIG[debuginfo] = "--enable-libdw,--disable-libdw,elfutils" | 221 | PACKAGECONFIG[debuginfo] = "--enable-libdw,--disable-libdw,elfutils" |
222 | 222 | ||
223 | INSANE_SKIP:${PN} = "arch" | 223 | INSANE_SKIP:${PN}-common = "arch" |
224 | 224 | ||
225 | FILES:${PN} += "${datadir}/icons" | 225 | FILES:${PN} += "${datadir}/icons" |
226 | 226 | ||
227 | # For user who want to install all arch packages | 227 | # For user who want to install all arch packages |
228 | PACKAGES =+ "${PN}-system-all ${PN}-user-all" | 228 | PACKAGES =+ "${PN}-common" |
229 | RDEPENDS:${PN} += "${PN}-common" | ||
229 | 230 | ||
230 | ALLOW_EMPTY:${PN}-system-all = "1" | 231 | ALLOW_EMPTY:${PN} = "1" |
231 | ALLOW_EMPTY:${PN}-user-all = "1" | 232 | FILES:${PN} = "" |
233 | |||
234 | FILES:${PN}-common = "${bindir}/* ${includedir}/* ${libexecdir}/* ${datadir}/* ${localstatedir}" | ||
232 | 235 | ||
233 | PACKAGES_DYNAMIC += "^${PN}-user-.* ^${PN}-system-.*" | 236 | PACKAGES_DYNAMIC += "^${PN}-user-.* ^${PN}-system-.*" |
234 | 237 | ||
@@ -236,15 +239,13 @@ PACKAGESPLITFUNCS =+ "split_qemu_packages" | |||
236 | 239 | ||
237 | python split_qemu_packages () { | 240 | python split_qemu_packages () { |
238 | archdir = d.expand('${bindir}/') | 241 | archdir = d.expand('${bindir}/') |
239 | syspackages = do_split_packages(d, archdir, r'^qemu-system-(.*)$', '${PN}-system-%s', 'QEMU full system emulation binaries(%s)' , prepend=True) | 242 | subpackages = do_split_packages(d, archdir, r'^qemu-system-(.*)$', '${PN}-system-%s', 'QEMU full system emulation binaries(%s)' , prepend=True, extra_depends='${PN}-common') |
240 | if syspackages: | ||
241 | d.setVar('RDEPENDS:' + d.getVar('PN') + '-system-all', ' '.join(syspackages)) | ||
242 | 243 | ||
243 | userpackages = do_split_packages(d, archdir, r'^qemu-((?!system|edid|ga|img|io|nbd|pr-helper|storage-daemon).*)$', '${PN}-user-%s', 'QEMU full user emulation binaries(%s)' , prepend=True) | 244 | subpackages += do_split_packages(d, archdir, r'^qemu-((?!system|edid|ga|img|io|nbd|pr-helper|storage-daemon).*)$', '${PN}-user-%s', 'QEMU full user emulation binaries(%s)' , prepend=True, extra_depends='${PN}-common') |
244 | if userpackages: | 245 | if subpackages: |
245 | d.setVar('RDEPENDS:' + d.getVar('PN') + '-user-all', ' '.join(userpackages)) | 246 | d.appendVar('RDEPENDS:' + d.getVar('PN'), ' ' + ' '.join(subpackages)) |
246 | mipspackage = d.getVar('PN') + "-user-mips" | 247 | mipspackage = d.getVar('PN') + "-user-mips" |
247 | if mipspackage in ' '.join(userpackages): | 248 | if mipspackage in ' '.join(subpackages): |
248 | d.appendVar('RDEPENDS:' + mipspackage, ' ' + d.getVar("MLPREFIX") + 'bash') | 249 | d.appendVar('RDEPENDS:' + mipspackage, ' ' + d.getVar("MLPREFIX") + 'bash') |
249 | } | 250 | } |
250 | 251 | ||
diff --git a/meta/recipes-devtools/qemu/qemu_8.0.3.bb b/meta/recipes-devtools/qemu/qemu_8.0.3.bb index 42e133967e..5d3c47c3b0 100644 --- a/meta/recipes-devtools/qemu/qemu_8.0.3.bb +++ b/meta/recipes-devtools/qemu/qemu_8.0.3.bb | |||
@@ -8,7 +8,7 @@ DEPENDS:append:libc-musl = " libucontext" | |||
8 | 8 | ||
9 | CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" | 9 | CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" |
10 | 10 | ||
11 | RDEPENDS:${PN}:class-target += "bash" | 11 | RDEPENDS:${PN}-common:class-target += "bash" |
12 | 12 | ||
13 | EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}" | 13 | EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}" |
14 | EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" | 14 | EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" |