qemu: adapt to OE-core qemu splitting

Since oe-core commit 893846ead7ee54d53 [qemu: Split the qemu package],
qemu now has a similar (but different) split to what meta-virt has
been providing to vmsep enabled systems.

We override the oe-core splitting function to restore our ability to
separate functionality into logical groups.

This commit also provided RDEPENDS for the new oe-core named packages
to allow compatbility with updated images.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2023-07-25 14:24:15 -04:00
parent 58ef402d44
commit 77193109eb

View File

@ -1,3 +1,9 @@
# we have our own package splitting for qemu, inhbit the oe-core
# split by overriding the split function
python split_qemu_packages () {
print( "meta-virtualization: vmsplit: inhibiting core qemu package split" )
}
PACKAGES:prepend:class-target = "${PN}-x86_64 \ PACKAGES:prepend:class-target = "${PN}-x86_64 \
${PN}-aarch64 \ ${PN}-aarch64 \
${PN}-arm \ ${PN}-arm \
@ -10,27 +16,46 @@ PACKAGES:prepend:class-target = "${PN}-x86_64 \
" "
FILES:${PN}-x86_64:class-target = "${bindir}/qemu-system-x86_64 ${bindir}/qemu-x86_64" FILES:${PN}-x86_64:class-target = "${bindir}/qemu-system-x86_64 ${bindir}/qemu-x86_64"
RDEPENDS:${PN}-x86_64:append:class-target = "${PN}" RDEPENDS:${PN}-x86_64:append:class-target = " ${PN}"
RPROVIDES:${PN}-x86_64:append:class-target = " ${PN}-system-x86_64"
RPROVIDES:${PN}-x86_64:append:class-target = " ${PN}-user-x86_64"
RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-x86_64"
RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-x86_64"
INSANE_SKIP:${PN}-x86_64:class-target = "file-rdeps" INSANE_SKIP:${PN}-x86_64:class-target = "file-rdeps"
FILES:${PN}-i386:class-target = "${bindir}/qemu-i386" FILES:${PN}-i386:class-target = "${bindir}/qemu-i386"
RDEPENDS:${PN}-i386:append:class-target = "${PN}" RDEPENDS:${PN}-i386:append:class-target = " ${PN}"
RPROVIDES:${PN}-i386:append:class-target = " ${PN}-user-i386"
RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-i386"
INSANE_SKIP:${PN}-i386:class-target = "file-rdeps" INSANE_SKIP:${PN}-i386:class-target = "file-rdeps"
FILES:${PN}-system-i386:class-target = "${bindir}/qemu-system-i386" FILES:${PN}-system-i386:class-target = "${bindir}/qemu-system-i386"
RDEPENDS:${PN}-system-i386:append:class-target = "${PN}" RDEPENDS:${PN}-system-i386:append:class-target = " ${PN}"
RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-system-i386"
INSANE_SKIP:${PN}-system-i386:class-target = "file-rdeps" INSANE_SKIP:${PN}-system-i386:class-target = "file-rdeps"
FILES:${PN}-aarch64:class-target = "${bindir}/qemu-system-aarch64 ${bindir}/qemu-aarch64" FILES:${PN}-aarch64:class-target = "${bindir}/qemu-system-aarch64 ${bindir}/qemu-aarch64"
RDEPENDS:${PN}-aarch64:append:class-target = "${PN}" RDEPENDS:${PN}-aarch64:append:class-target = " ${PN}"
RPROVIDES:${PN}-aarch64:append:class-target = " ${PN}-system-aarch64"
RPROVIDES:${PN}-aarch64:append:class-target = " ${PN}-user-aarch64"
RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-aarch64"
RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-aarch64"
INSANE_SKIP:${PN}-aarch64:class-target = "file-rdeps" INSANE_SKIP:${PN}-aarch64:class-target = "file-rdeps"
FILES:${PN}-arm:class-target = "${bindir}/qemu-system-arm ${bindir}/qemu-arm" FILES:${PN}-arm:class-target = "${bindir}/qemu-system-arm ${bindir}/qemu-arm"
RDEPENDS:${PN}-arm:append:class-target = "${PN}" RDEPENDS:${PN}-arm:append:class-target = " ${PN}"
RPROVIDES:${PN}-arm:append:class-target = " ${PN}-system-arm"
RPROVIDES:${PN}-arm:append:class-target = " ${PN}-user-arm"
RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-arm"
RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-arm"
INSANE_SKIP:${PN}-arm:class-target = "file-rdeps" INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
FILES:${PN}-microblaze:class-target = "${bindir}/qemu-system-microblaze* ${bindir}/qemu-microblaze*" FILES:${PN}-microblaze:class-target = "${bindir}/qemu-system-microblaze* ${bindir}/qemu-microblaze*"
RDEPENDS:${PN}-microblaze:append:class-target = "${PN}" RDEPENDS:${PN}-microblaze:append:class-target = " ${PN}"
RPROVIDES:${PN}-microblaze:append:class-target = " ${PN}-system-microblaze"
RPROVIDES:${PN}-microblaze:append:class-target = " ${PN}-user-microblaze"
RDEPENDS:${PN}-system-all:append:class-target = " ${PN}-microblaze"
RDEPENDS:${PN}-user-all:append:class-target = " ${PN}-microblaze"
INSANE_SKIP:${PN}-arm:class-target = "file-rdeps" INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
FILES:${PN}-support:class-target = "${bindir}/* ${libexecdir}/*" FILES:${PN}-support:class-target = "${bindir}/* ${libexecdir}/*"