From 675f3f79e39be402065fb6c9fcfba2a9f5693a0a Mon Sep 17 00:00:00 2001 From: Angelos Mouzakitis Date: Tue, 10 Oct 2023 18:49:37 +0200 Subject: virtio-loopback: Update upstream to epsilon branches These is the prerequisite work to enable support for feature vhost-devices on the adapter (gpu, sound, gpio) v2: Add sound support on virtio-loopback-adapter v2: Update recipe names of adapter and loopbackdriver with virtio- prefixes v2: Update recipes URI location to AGL-gerrit servers Change-Id: I15b45d37f0726864629749e8cb77dd6cf6d03628 Signed-off-by: Angelos Mouzakitis --- .../loopbackdriver.bb | 14 ------------- .../virtio-loopback-driver.bb | 14 +++++++++++++ .../qemu-vhost-user-devices.bb | 6 ++---- .../recipes-virtioloopback/adapter/adapter.bb | 21 ------------------- .../rust-vhost-device/rust-vhost-device_git.bb | 2 +- .../virtio-loopback-adapter.bb | 24 ++++++++++++++++++++++ 6 files changed, 41 insertions(+), 40 deletions(-) delete mode 100644 meta-egvirt/recipes-kernel/kernel-module-virtio-loopback/loopbackdriver.bb create mode 100644 meta-egvirt/recipes-kernel/kernel-module-virtio-loopback/virtio-loopback-driver.bb delete mode 100644 meta-egvirt/recipes-virtioloopback/adapter/adapter.bb create mode 100644 meta-egvirt/recipes-virtioloopback/virtio-loopback-adapter/virtio-loopback-adapter.bb diff --git a/meta-egvirt/recipes-kernel/kernel-module-virtio-loopback/loopbackdriver.bb b/meta-egvirt/recipes-kernel/kernel-module-virtio-loopback/loopbackdriver.bb deleted file mode 100644 index d5c13a21..00000000 --- a/meta-egvirt/recipes-kernel/kernel-module-virtio-loopback/loopbackdriver.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Virtio-loopback driver" -DESCRIPTION = "Virtio-Loopback kernel driver" -LICENSE = "GPL" -LIC_FILES_CHKSUM = "file://README.md;md5=c912e5645ed908bc9570ba05c92b3723" - -inherit module - -SRC_URI = "git://git.virtualopensystems.com/virtio-loopback/loopback_driver.git;protocol=https;rev=02c2bb2980bf307aa654d908f3d54ce2c01d2d92;branch=beta-release" - -S = "${WORKDIR}/git" - -MAKE_TARGETS = "-C ${STAGING_KERNEL_DIR} M=${WORKDIR}/git MODULE_GIT_REPOSITORY_DIR=${METADIR}/meta-agl-devel" -MODULES_INSTALL_TARGET = "-C ${STAGING_KERNEL_DIR} M=${WORKDIR}/git modules_install" - diff --git a/meta-egvirt/recipes-kernel/kernel-module-virtio-loopback/virtio-loopback-driver.bb b/meta-egvirt/recipes-kernel/kernel-module-virtio-loopback/virtio-loopback-driver.bb new file mode 100644 index 00000000..2601b515 --- /dev/null +++ b/meta-egvirt/recipes-kernel/kernel-module-virtio-loopback/virtio-loopback-driver.bb @@ -0,0 +1,14 @@ +SUMMARY = "Virtio-loopback driver" +DESCRIPTION = "Virtio-Loopback kernel driver" +LICENSE = "GPL" +LIC_FILES_CHKSUM = "file://README.md;md5=c912e5645ed908bc9570ba05c92b3723" + +inherit module + +SRC_URI = "git://git.virtualopensystems.com/virtio-loopback/loopback_driver.git;protocol=https;rev=aaa8c982c56837369aaca4c04f4b5499915dcf24;branch=epsilon-release-5.15" + +S = "${WORKDIR}/git" + +MAKE_TARGETS = "-C ${STAGING_KERNEL_DIR} M=${WORKDIR}/git MODULE_GIT_REPOSITORY_DIR=${METADIR}/meta-agl-devel" +MODULES_INSTALL_TARGET = "-C ${STAGING_KERNEL_DIR} M=${WORKDIR}/git modules_install" + diff --git a/meta-egvirt/recipes-qemu/qemu-vhost-user-devices/qemu-vhost-user-devices.bb b/meta-egvirt/recipes-qemu/qemu-vhost-user-devices/qemu-vhost-user-devices.bb index 2e7eeef5..032375c1 100644 --- a/meta-egvirt/recipes-qemu/qemu-vhost-user-devices/qemu-vhost-user-devices.bb +++ b/meta-egvirt/recipes-qemu/qemu-vhost-user-devices/qemu-vhost-user-devices.bb @@ -9,10 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ inherit pkgconfig DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native" -SRC_URI = "git://git.virtualopensystems.com/virtio-loopback/qemu.git;protocol=https;branch=beta-release \ - file://0001-Add-NULL-array-terminate-entry-for-arg-parsing-optio.patch \ - " -SRCREV = "bf75006d5415b4e485f0bc30b8d7461b3616e9ca" +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/virtio/qemu;protocol=https;branch=master" +SRCREV = "af1a266670d040d2f4083ff309d732d648afba2a" S = "${WORKDIR}/git" UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta-egvirt/recipes-virtioloopback/adapter/adapter.bb b/meta-egvirt/recipes-virtioloopback/adapter/adapter.bb deleted file mode 100644 index 1cff4baf..00000000 --- a/meta-egvirt/recipes-virtioloopback/adapter/adapter.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Adapter application" -DESCRIPTION = "Application description here" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.md;md5=ecc9c54ada6f0c33054d3bde010744f7" - -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:" -SRC_URI = "git://git.virtualopensystems.com/virtio-loopback/adapter_app.git;protocol=https;rev=da82d88bd72cc9e11b4df11d0b594d3554a75d4f;branch=beta-release" -S = "${WORKDIR}/git" - -do_compile() { - cd ${S} - make -} - -do_install() { - mkdir ${D}/usr/bin/ -p - install -m 0755 ${S}/adapter ${D}/usr/bin/ -} - -DEPENDS = "" -FILES:${PN} += "/usr/bin/adapter" diff --git a/meta-egvirt/recipes-virtioloopback/rust-vhost-device/rust-vhost-device_git.bb b/meta-egvirt/recipes-virtioloopback/rust-vhost-device/rust-vhost-device_git.bb index 1de6fa59..cdd6e71d 100644 --- a/meta-egvirt/recipes-virtioloopback/rust-vhost-device/rust-vhost-device_git.bb +++ b/meta-egvirt/recipes-virtioloopback/rust-vhost-device/rust-vhost-device_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM="file://README.md;md5=b92c66b94b87c250f37ea0234c9e2d9a" inherit cargo -SRC_URI = "git://git.virtualopensystems.com/virtio-loopback/vhost-user-rng-rust/vhost-device.git;protocol=https;rev=9ff74d7bbc71852b020f62c3663faca41595d4a9" +SRC_URI = "git://git.virtualopensystems.com/virtio-loopback/vhost-user-rng-rust/vhost-device.git;protocol=https;rev=de0c5cf1ceb079992f7680ffc7f1f04447b869e2" SRC_URI += "git://git.virtualopensystems.com/virtio-loopback/vhost-user-rng-rust/vhost.git;protocol=https;rev=89fcc56b86b1f165c5b00144df26430a07e1a051;destsuffix=vhost" SRC_URI += "git://git.virtualopensystems.com/virtio-loopback/vhost-user-rng-rust/vhost-user-backend.git;protocol=https;rev=78ce5fc3ba73e5ac359dcd030b1e8b08ee7e9f2c;destsuffix=vhost-user-backend" SRC_URI += "git://git.virtualopensystems.com/virtio-loopback/vhost-user-rng-rust/vm-virtio.git;protocol=https;rev=edb16fd8900c14c17c3ab781160aac87813d3b4a;destsuffix=vm-virtio" diff --git a/meta-egvirt/recipes-virtioloopback/virtio-loopback-adapter/virtio-loopback-adapter.bb b/meta-egvirt/recipes-virtioloopback/virtio-loopback-adapter/virtio-loopback-adapter.bb new file mode 100644 index 00000000..6cce646d --- /dev/null +++ b/meta-egvirt/recipes-virtioloopback/virtio-loopback-adapter/virtio-loopback-adapter.bb @@ -0,0 +1,24 @@ +SUMMARY = "Virtio-loopback-adapter application" +DESCRIPTION = "Adapter bridge for virtio-loopback" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README.md;md5=ecc9c54ada6f0c33054d3bde010744f7" + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:" +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/virtio/adapter_app;protocol=https;branch=master" +SRCREV = "ddc98ee7562fa01abbd4d1b027efd5e98ceb93bf" + +S = "${WORKDIR}/git" +TARGET_CC_ARCH += "${LDFLAGS}" + +do_compile() { + cd ${S} + make +} + +do_install() { + mkdir ${D}/usr/bin/ -p + install -m 0755 ${S}/adapter ${D}/usr/bin/virtio-loopback-adapter +} + +DEPENDS = "" +FILES:${PN} += "/usr/bin/virtio-loopback-adapter" -- cgit 1.2.3-korg