[meta-xilinx] [PATCH] qemu: Update qemu to version 2.6

[Alistair Francis]

On Tue, Dec 20, 2016 at 9:18 AM, Alistair Francis
<alistair.francis at xilinx.com> wrote:
> On Tue, Dec 20, 2016 at 12:54 AM, Robert Yang <liezhi.yang at windriver.com> wrote:
>>
>> Hi,
>>
>> oe-core's master branch has updated oe-core to 2.7.0, why not use the one
>> in oe-core ?
>
> Hey Robert,
>
> I titled the patch incorrectly.
>
> It should be 'qemu-xillinx:'. Xilinx maintains it's own fork of QEMU
> and unfortunately that is only based on version 2.6.0.

I have sent a V2 that should clarify what the patch is doing.

Thanks,

Alistair

>
> Thanks,
>
> Alistair
>
>>
>> // Robert
>>
>>
>> On 12/20/2016 08:00 AM, Alistair Francis wrote:
>>>
>>> Update Xilinx's QEMU to the 2016.4 release which is based off mainline
>>> QEMU version 2.6.0.
>>>
>>> Signed-off-by: Alistair Francis <alistair.francis at xilinx.com>
>>> ---
>>>  recipes-devtools/qemu/qemu-xilinx_2.2.5.bb | 55
>>> ------------------------------
>>>  recipes-devtools/qemu/qemu-xilinx_2.6.0.bb | 45 ++++++++++++++++++++++++
>>>  2 files changed, 45 insertions(+), 55 deletions(-)
>>>  delete mode 100644 recipes-devtools/qemu/qemu-xilinx_2.2.5.bb
>>>  create mode 100644 recipes-devtools/qemu/qemu-xilinx_2.6.0.bb
>>>
>>> diff --git a/recipes-devtools/qemu/qemu-xilinx_2.2.5.bb
>>> b/recipes-devtools/qemu/qemu-xilinx_2.2.5.bb
>>> deleted file mode 100644
>>> index 06dec53..0000000
>>> --- a/recipes-devtools/qemu/qemu-xilinx_2.2.5.bb
>>> +++ /dev/null
>>> @@ -1,55 +0,0 @@
>>> -QEMU_TARGETS ?= "aarch64 arm microblaze microblazeel"
>>> -
>>> -require recipes-devtools/qemu/qemu.inc
>>> -
>>> -SUMMARY = "Xilinx's fork of a fast open source processor emulator"
>>> -HOMEPAGE = "https://github.com/xilinx/qemu/"
>>> -
>>> -LIC_FILES_CHKSUM = " \
>>> -               file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
>>> -
>>> file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913 \
>>> -               "
>>> -
>>> -XILINX_RELEASE_VERSION = "v2016.3"
>>> -SRCREV = "de453ab4cf993f63de502c4efd8a08a347c3b164"
>>> -SRC_URI = "git://github.com/Xilinx/qemu.git;protocol=https;nobranch=1"
>>> -
>>> -S = "${WORKDIR}/git"
>>> -
>>> -PV = "2.2.50-xilinx-${XILINX_RELEASE_VERSION}+git+${SRCPV}"
>>> -
>>> -# Disable KVM completely
>>> -KVMENABLE = "--disable-kvm"
>>> -
>>> -# Strip all appends (needed because qemu.inc adds patches using
>>> overrides)
>>> -SRC_URI[_append] = ""
>>> -
>>> -DISABLE_STATIC_pn-qemu-xilinx-native = ""
>>> -
>>> -PACKAGECONFIG[quorum] = "--enable-quorum, --disable-quorum, gnutls,"
>>> -PACKAGECONFIG[vnc-tls] = "--enable-vnc
>>> --enable-vnc-tls,--disable-vnc-tls, gnutls,"
>>> -PACKAGECONFIG[vnc-ws] = "--enable-vnc --enable-vnc-ws,--disable-vnc-ws,
>>> gnutls,"
>>> -PACKAGECONFIG[gcrypt] =
>>> "--enable-libgcrypt,--disable-libgcrypt,libgcrypt,"
>>> -PACKAGECONFIG[nss] = ""
>>> -PACKAGECONFIG[nettle] = ""
>>> -PACKAGECONFIG[glx] = ""
>>> -PACKAGECONFIG[gnutls] = ""
>>> -PACKAGECONFIG[bzip2] = ""
>>> -
>>> -# append a suffix dir, to allow multiple versions of QEMU to be installed
>>> -datadir_append = "/qemu-xilinx"
>>> -bindir_append = "/qemu-xilinx"
>>> -libexecdir_append = "/qemu-xilinx"
>>> -
>>> -# ensure configure is passed the modified dirs
>>> -EXTRA_OECONF += " \
>>> -               --bindir=${bindir} \
>>> -               --datadir=${datadir} \
>>> -               --mandir=${mandir} \
>>> -               --docdir=${docdir} \
>>> -               "
>>> -
>>> -do_install() {
>>> -       export STRIP="true"
>>> -       autotools_do_install
>>> -}
>>> diff --git a/recipes-devtools/qemu/qemu-xilinx_2.6.0.bb
>>> b/recipes-devtools/qemu/qemu-xilinx_2.6.0.bb
>>> new file mode 100644
>>> index 0000000..f6c7f30
>>> --- /dev/null
>>> +++ b/recipes-devtools/qemu/qemu-xilinx_2.6.0.bb
>>> @@ -0,0 +1,45 @@
>>> +QEMU_TARGETS ?= "aarch64 arm microblaze microblazeel"
>>> +
>>> +require recipes-devtools/qemu/qemu.inc
>>> +
>>> +SUMMARY = "Xilinx's fork of a fast open source processor emulator"
>>> +HOMEPAGE = "https://github.com/xilinx/qemu/"
>>> +
>>> +LIC_FILES_CHKSUM = " \
>>> +               file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
>>> +
>>> file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913 \
>>> +               "
>>> +
>>> +XILINX_RELEASE_VERSION = "v2016.4"
>>> +SRCREV = "4b90a13118b6e005d688d7aefb0900f7a67531df"
>>> +SRC_URI = "git://github.com/Xilinx/qemu.git;protocol=https;nobranch=1"
>>> +
>>> +S = "${WORKDIR}/git"
>>> +
>>> +PV = "2.6.0-xilinx-${XILINX_RELEASE_VERSION}+git+${SRCPV}"
>>> +
>>> +# Disable KVM completely
>>> +KVMENABLE = "--disable-kvm"
>>> +
>>> +# Strip all appends (needed because qemu.inc adds patches using
>>> overrides)
>>> +SRC_URI[_append] = ""
>>> +
>>> +DISABLE_STATIC_pn-qemu-xilinx-native = ""
>>> +
>>> +# append a suffix dir, to allow multiple versions of QEMU to be installed
>>> +datadir_append = "/qemu-xilinx"
>>> +bindir_append = "/qemu-xilinx"
>>> +libexecdir_append = "/qemu-xilinx"
>>> +
>>> +# ensure configure is passed the modified dirs
>>> +EXTRA_OECONF += " \
>>> +               --bindir=${bindir} \
>>> +               --datadir=${datadir} \
>>> +               --mandir=${mandir} \
>>> +               --docdir=${docdir} \
>>> +               "
>>> +
>>> +do_install() {
>>> +       export STRIP="true"
>>> +       autotools_do_install
>>> +}
>>>
>> --
>> _______________________________________________
>> meta-xilinx mailing list
>> meta-xilinx at yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-xilinx