On Thu, Nov 30, 2017 at 1:50 PM, Manjukumar Matha <manjukumar.harthikote-ma...@xilinx.com> wrote: > Rewire so that we can update the Xilinx QEMU devicetree release just > like other recipes > > Signed-off-by: Manjukumar Matha <manjukumar.harthikote-ma...@xilinx.com>
Acked-by: Alistair Francis <alistair.fran...@xilinx.com> Alistair > --- > recipes-devtools/qemu/qemu-devicetrees.inc | 37 > ++++++++++++++++++++++++ > recipes-devtools/qemu/qemu-devicetrees_2017.3.bb | 34 ++-------------------- > 2 files changed, 40 insertions(+), 31 deletions(-) > create mode 100644 recipes-devtools/qemu/qemu-devicetrees.inc > > diff --git a/recipes-devtools/qemu/qemu-devicetrees.inc > b/recipes-devtools/qemu/qemu-devicetrees.inc > new file mode 100644 > index 0000000..d4044ed > --- /dev/null > +++ b/recipes-devtools/qemu/qemu-devicetrees.inc > @@ -0,0 +1,37 @@ > +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" > + > +PV = "xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" > + > +BRANCH ?= "" > +REPO ?= "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https" > + > +BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) > != '']}" > +SRC_URI = "${REPO};${BRANCHARG}" > + > +S = "${WORKDIR}/git" > + > +# Don't need to do anything > +do_install() { > + : > +} > + > +do_deploy() { > + # single-arch dtbs > + for DTS_FILE in ${S}/LATEST/SINGLE_ARCH/*.dtb; do > + install -Dm 0644 $DTS_FILE > ${DEPLOYDIR}/qemu-hw-devicetrees/$(basename $DTS_FILE .dtb).dtb > + done > + > + # multi-arch dtbs > + for DTS_FILE in ${S}/LATEST/MULTI_ARCH/*.dtb; do > + install -Dm 0644 $DTS_FILE > ${DEPLOYDIR}/qemu-hw-devicetrees/multiarch/$(basename $DTS_FILE .dtb).dtb > + done > +} > + > +addtask deploy after do_install > diff --git a/recipes-devtools/qemu/qemu-devicetrees_2017.3.bb > b/recipes-devtools/qemu/qemu-devicetrees_2017.3.bb > index d5cfe0b..ec6093b 100644 > --- a/recipes-devtools/qemu/qemu-devicetrees_2017.3.bb > +++ b/recipes-devtools/qemu/qemu-devicetrees_2017.3.bb > @@ -1,32 +1,4 @@ > -SUMMARY = "Xilinx's hardware device trees required for QEMU" > -HOMEPAGE = "https://github.com/xilinx/qemu-devicetrees/"; > -LICENSE = "BSD" > -DEPENDS += "dtc-native" > +require qemu-devicetrees.inc > > -inherit deploy > - > -LIC_FILES_CHKSUM = > "file://Makefile;beginline=1;endline=27;md5=7348b6cbcae69912cb1dee68d6c68d99" > - > -SRCREV = "4b951c594078562e9dd828430075968dd91ac425" > -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() { > - # single-arch dtbs > - for DTS_FILE in ${S}/LATEST/SINGLE_ARCH/*.dtb; do > - install -Dm 0644 $DTS_FILE > ${DEPLOYDIR}/qemu-hw-devicetrees/$(basename $DTS_FILE .dtb).dtb > - done > - > - # multi-arch dtbs > - for DTS_FILE in ${S}/LATEST/MULTI_ARCH/*.dtb; do > - install -Dm 0644 $DTS_FILE > ${DEPLOYDIR}/qemu-hw-devicetrees/multiarch/$(basename $DTS_FILE .dtb).dtb > - done > -} > - > -addtask deploy after do_install > +XILINX_RELEASE_VERSION = "v2017.3" > +SRCREV ?= "4b951c594078562e9dd828430075968dd91ac425" > -- > 2.7.4 > > -- > _______________________________________________ > meta-xilinx mailing list > meta-xilinx@yoctoproject.org > https://lists.yoctoproject.org/listinfo/meta-xilinx -- _______________________________________________ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
