Rename the Xilinx QEMU and QEMU device tree versions to match the Xilinx releases.
Signed-off-by: Alistair Francis <[email protected]> --- recipes-devtools/qemu/qemu-devicetrees_2.6.0.bb | 36 ------------------- recipes-devtools/qemu/qemu-devicetrees_2016.4.bb | 33 +++++++++++++++++ recipes-devtools/qemu/qemu-xilinx_2.6.0.bb | 45 ------------------------ recipes-devtools/qemu/qemu-xilinx_2016.4.bb | 42 ++++++++++++++++++++++ 4 files changed, 75 insertions(+), 81 deletions(-) delete mode 100644 recipes-devtools/qemu/qemu-devicetrees_2.6.0.bb create mode 100644 recipes-devtools/qemu/qemu-devicetrees_2016.4.bb delete mode 100644 recipes-devtools/qemu/qemu-xilinx_2.6.0.bb create mode 100644 recipes-devtools/qemu/qemu-xilinx_2016.4.bb diff --git a/recipes-devtools/qemu/qemu-devicetrees_2.6.0.bb b/recipes-devtools/qemu/qemu-devicetrees_2.6.0.bb deleted file mode 100644 index db23c20..0000000 --- a/recipes-devtools/qemu/qemu-devicetrees_2.6.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Xilinx's hardware device trees required for QEMU" -HOMEPAGE = "https://github.com/xilinx/qemu-devicetrees/"; -LICENSE = "BSD" -DEPENDS += "dtc-native" - -inherit deploy - -LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=27;md5=7348b6cbcae69912cb1dee68d6c68d99" - -XILINX_RELEASE_VERSION = "v2016.4" -SRCREV = "1085e32a9ddc232963512923332094a58a05d1af" -SRC_URI = "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https;nobranch=1" - -S = "${WORKDIR}/git" - -PV = "2.6.0-xilinx-${XILINX_RELEASE_VERSION}+git+${SRCPV}" - -# Don't need to do anything -do_install() { - : -} - -do_deploy() { - for DTS_FILE in ${S}/LATEST/SINGLE_ARCH/*.dtb; do - if [ ! -f ${DTS_FILE} ]; then - bbwarn "${DTS_FILE} is not available!" - continue - fi - DTS_NAME=`basename -s .dtb ${DTS_FILE}` - install -d ${DEPLOYDIR} - install -d ${DEPLOYDIR}/qemu-hw-devicetrees - install -m 0644 ${S}/LATEST/SINGLE_ARCH/${DTS_NAME}.dtb ${DEPLOYDIR}/qemu-hw-devicetrees/${DTS_NAME}.dtb - done -} - -addtask deploy after do_install diff --git a/recipes-devtools/qemu/qemu-devicetrees_2016.4.bb b/recipes-devtools/qemu/qemu-devicetrees_2016.4.bb new file mode 100644 index 0000000..485ae5d --- /dev/null +++ b/recipes-devtools/qemu/qemu-devicetrees_2016.4.bb @@ -0,0 +1,33 @@ +SUMMARY = "Xilinx's hardware device trees required for QEMU" +HOMEPAGE = "https://github.com/xilinx/qemu-devicetrees/"; +LICENSE = "BSD" +DEPENDS += "dtc-native" + +inherit deploy + +LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=27;md5=7348b6cbcae69912cb1dee68d6c68d99" + +SRCREV = "1085e32a9ddc232963512923332094a58a05d1af" +SRC_URI = "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https;nobranch=1" + +S = "${WORKDIR}/git" + +# Don't need to do anything +do_install() { + : +} + +do_deploy() { + for DTS_FILE in ${S}/LATEST/SINGLE_ARCH/*.dtb; do + if [ ! -f ${DTS_FILE} ]; then + bbwarn "${DTS_FILE} is not available!" + continue + fi + DTS_NAME=`basename -s .dtb ${DTS_FILE}` + install -d ${DEPLOYDIR} + install -d ${DEPLOYDIR}/qemu-hw-devicetrees + install -m 0644 ${S}/LATEST/SINGLE_ARCH/${DTS_NAME}.dtb ${DEPLOYDIR}/qemu-hw-devicetrees/${DTS_NAME}.dtb + done +} + +addtask deploy after do_install diff --git a/recipes-devtools/qemu/qemu-xilinx_2.6.0.bb b/recipes-devtools/qemu/qemu-xilinx_2.6.0.bb deleted file mode 100644 index f6c7f30..0000000 --- a/recipes-devtools/qemu/qemu-xilinx_2.6.0.bb +++ /dev/null @@ -1,45 +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.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 -} diff --git a/recipes-devtools/qemu/qemu-xilinx_2016.4.bb b/recipes-devtools/qemu/qemu-xilinx_2016.4.bb new file mode 100644 index 0000000..4437ca9 --- /dev/null +++ b/recipes-devtools/qemu/qemu-xilinx_2016.4.bb @@ -0,0 +1,42 @@ +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 \ + " + +SRCREV = "4b90a13118b6e005d688d7aefb0900f7a67531df" +SRC_URI = "git://github.com/Xilinx/qemu.git;protocol=https;nobranch=1" + +S = "${WORKDIR}/git" + +# 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 +} -- 2.7.4 -- _______________________________________________ meta-xilinx mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-xilinx
