From 744c6353ac42507f0286d215050cf534441e3196 Mon Sep 17 00:00:00 2001 From: Sai Hari Chandana Kalluri Date: Thu, 6 Feb 2020 16:30:51 -0800 Subject: qemu-xilinx*: Enable qemu-xilinx-native as PROVIDER for qemu-native Enable qemu-xilinx-native as PROVIDES for qemu-native. Signed-off-by: Sai Hari Chandana Kalluri Signed-off-by: Mark Hatle --- .../recipes-devtools/qemu/qemu-xilinx-native_2020.1.bb | 2 ++ meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc | 9 ++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2020.1.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2020.1.bb index 87ea8553..45d474d1 100644 --- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2020.1.bb +++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2020.1.bb @@ -2,3 +2,5 @@ require qemu-xilinx-native.inc BPN = "qemu-xilinx" EXTRA_OECONF_append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent" + +PROVIDES = "qemu-native" diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc index a496e900..71f6cf9f 100644 --- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc +++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc @@ -1,7 +1,8 @@ SUMMARY = "Xilinx's fork of a fast open source processor emulator" HOMEPAGE = "https://github.com/xilinx/qemu/" -QEMU_TARGETS = "aarch64 arm microblaze microblazeel" +# x86_64 is needed to build nativesdks +QEMU_TARGETS = "aarch64 arm microblaze microblazeel x86_64" LIC_FILES_CHKSUM = " \ file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ @@ -39,12 +40,6 @@ DISABLE_STATIC_pn-${PN} = "" PTEST_ENABLED = "" -# append a suffix dir, to allow multiple versions of QEMU to be installed -EXTRA_OECONF_append = " \ - --bindir=${bindir}/qemu-xilinx \ - --libexecdir=${libexecdir}/qemu-xilinx \ - " - do_install_append() { # Prevent QA warnings about installed ${localstatedir}/run if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi -- cgit v1.2.3-54-g00ecf