qemu-devicetrees: Move from target to native/nativesdk package

This recipe did not provide anything useful for the target, so adjust to only
run native and nativesdk.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

5 files changed, 6 insertions, 9 deletions

diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
index 9688b6f7..e75f556b 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
@@ -9,7 +9,7 @@ PREFERRED_PROVIDER_nativesdk-qemu = "nativesdk-qemu-xilinx"
 MACHINEOVERRIDES =. "qemuboot-xilinx:"
 
 # depend on qemu-helper-native, which will depend on QEMU
-EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native:do_addto_recipe_sysroot"
+EXTRA_IMAGEDEPENDS += "qemu-devicetrees-native qemu-system-native qemu-helper-native:do_addto_recipe_sysroot"
 
 # Use the xilinx specific version for these users
 IMAGE_CLASSES += "qemuboot-xilinx"
diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index 70f5bbd3..9aa47892 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -37,7 +37,6 @@ IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == ''
 
 EXTRA_IMAGEDEPENDS += " \
     u-boot-xlnx-scr \
-    qemu-devicetrees:do_deploy \
     "
 
 IMAGE_BOOT_FILES += " \
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index 7ea5a00f..b47f0b4b 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -37,7 +37,6 @@ IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == ''
 
 EXTRA_IMAGEDEPENDS += " \
     u-boot-xlnx-scr \
-    qemu-devicetrees:do_deploy \
     "
 
 IMAGE_BOOT_FILES += " \
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index 6aa24af8..15a48102 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -45,7 +45,6 @@ IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == ''
 
 EXTRA_IMAGEDEPENDS += " \
     virtual/bootloader \
-    qemu-devicetrees:do_deploy \
     u-boot-xlnx-uenv \
     u-boot-xlnx-scr \
     "
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
index e98f483b..c002c6c1 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
@@ -18,10 +18,7 @@ SRC_URI += "file://0001-versal-Reorder-serial-ports.patch"
 
 S = "${WORKDIR}/git"
 
-# Don't need to do anything
-do_install() {
-        :
-}
+do_install[noexec] = '1'
 
 do_deploy() {
         # single-arch dtbs
@@ -35,4 +32,7 @@ do_deploy() {
         done
 }
 
-addtask deploy after do_install
+addtask deploy after do_install before do_build
+
+COMPATIBLE_HOST:class-target = "none"
+BBCLASSEXTEND = "native nativesdk"