From: Mark Hatle <[email protected]> Move from Vivado style versions, to upstream QEMU version numbers. Version is now handled by the recipe name instead of internal hard coded items.
Signed-off-by: Mark Hatle <[email protected]> --- meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc | 2 +- .../recipes-devtools/qemu/qemu-xilinx-2024.1.inc | 3 --- meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc | 5 ++++- ...u-xilinx-native_2024.1.bb => qemu-xilinx-native_8.1.0.bb} | 1 - ...m-native_2024.1.bb => qemu-xilinx-system-native_8.1.0.bb} | 1 - .../qemu/{qemu-xilinx_2024.1.bb => qemu-xilinx_8.1.0.bb} | 1 - 6 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2024.1.inc rename meta-xilinx-core/recipes-devtools/qemu/{qemu-xilinx-native_2024.1.bb => qemu-xilinx-native_8.1.0.bb} (90%) rename meta-xilinx-core/recipes-devtools/qemu/{qemu-xilinx-system-native_2024.1.bb => qemu-xilinx-system-native_8.1.0.bb} (97%) rename meta-xilinx-core/recipes-devtools/qemu/{qemu-xilinx_2024.1.bb => qemu-xilinx_8.1.0.bb} (98%) diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc index 52f5a69f..3e56e349 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc @@ -7,7 +7,7 @@ inherit deploy LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=27;md5=7348b6cbcae69912cb1dee68d6c68d99" -PV = "xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" +PV .= "+git" REPO ?= "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2024.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2024.1.inc deleted file mode 100644 index d48350b2..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2024.1.inc +++ /dev/null @@ -1,3 +0,0 @@ -XILINX_QEMU_VERSION = "v8.1.0" -BRANCH = "xlnx_rel_v2024.1" -SRCREV = "2319c870e754148ec3b9d40be0d3dbee959c3251" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc index 4509889c..179903c5 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc @@ -8,12 +8,15 @@ COMPATIBLE_HOST:arm = "null" # x86_64 is needed to build nativesdks QEMU_TARGETS = "aarch64 arm microblaze microblazeel riscv32 x86_64" +BRANCH = "xlnx_rel_v2024.1" +SRCREV = "2319c870e754148ec3b9d40be0d3dbee959c3251" + LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" FILESEXTRAPATHS:prepend := "${THISDIR}/qemu-xilinx-8.1.0:" -PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" +PV .= "+git" REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https" BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_8.1.0.bb similarity index 90% rename from meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2024.1.bb rename to meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_8.1.0.bb index 5ffdeb98..49ffbe6e 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2024.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_8.1.0.bb @@ -2,7 +2,6 @@ BPN = "qemu-xilinx" DEPENDS += "glib-2.0-native zlib-native" -require qemu-xilinx-2024.1.inc require qemu-xilinx-native-8.1.inc require qemu-native-alt.inc diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_8.1.0.bb similarity index 97% rename from meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2024.1.bb rename to meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_8.1.0.bb index 7e985088..0e3bfc84 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2024.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_8.1.0.bb @@ -1,7 +1,6 @@ BPN = "qemu-xilinx" require qemu-system-native-alt.inc -require qemu-xilinx-2024.1.inc require qemu-xilinx-native-8.1.inc # As some of the files installed by qemu-native and qemu-system-native diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2024.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_8.1.0.bb similarity index 98% rename from meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2024.1.bb rename to meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_8.1.0.bb index cff60bd6..50d9922f 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2024.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_8.1.0.bb @@ -1,6 +1,5 @@ BBCLASSEXTEND = "nativesdk" -require qemu-xilinx-2024.1.inc require qemu-8.1.inc require qemu-xilinx-8.1.inc require qemu-alt.inc -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5322): https://lists.yoctoproject.org/g/meta-xilinx/message/5322 Mute This Topic: https://lists.yoctoproject.org/mt/106179139/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
