From 1b6deebbf60d6772aae8eae04418a7c82865c05a Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 2 Nov 2022 15:50:15 -0500 Subject: qemu-xilinx: Split to allow for version specific BRANCH/SRCREV Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc | 4 ++++ meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc | 4 ++++ meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb | 1 + meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb | 1 + .../recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb | 1 + .../recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb | 1 + meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc | 4 ---- meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb | 1 + meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb | 1 + 9 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc create mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc new file mode 100644 index 00000000..62a221f4 --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.1.inc @@ -0,0 +1,4 @@ +XILINX_QEMU_VERSION = "v6.1.0" +BRANCH = "xlnx_rel_v2022.2" +SRCREV = "74d70f8008bfbd1566c2eed3496a077a974de0d0" + diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc new file mode 100644 index 00000000..62a221f4 --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2022.2.inc @@ -0,0 +1,4 @@ +XILINX_QEMU_VERSION = "v6.1.0" +BRANCH = "xlnx_rel_v2022.2" +SRCREV = "74d70f8008bfbd1566c2eed3496a077a974de0d0" + diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb index 5e6c2d28..a6fd9268 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb @@ -1,3 +1,4 @@ +require qemu-xilinx-2022.1.inc require qemu-xilinx-native.inc BPN = "qemu-xilinx" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb index 5e6c2d28..e4f6732c 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.2.bb @@ -1,3 +1,4 @@ +require qemu-xilinx-2022.2.inc require qemu-xilinx-native.inc BPN = "qemu-xilinx" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb index 49faa73c..6afddb87 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb @@ -1,3 +1,4 @@ +require qemu-xilinx-2022.1.inc require qemu-xilinx-native.inc PROVIDES = "qemu-system-native" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb index 49faa73c..924ccd6f 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.2.bb @@ -1,3 +1,4 @@ +require qemu-xilinx-2022.2.inc require qemu-xilinx-native.inc PROVIDES = "qemu-system-native" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc index 2aa54c74..c9c6545e 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc @@ -10,10 +10,6 @@ LIC_FILES_CHKSUM = " \ " DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" -XILINX_QEMU_VERSION ?= "v6.1.0" -BRANCH ?= "xlnx_rel_v2022.2" -SRCREV = "74d70f8008bfbd1566c2eed3496a077a974de0d0" - FILESEXTRAPATHS:prepend := "${THISDIR}/files:" PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb index 4983b4df..9e9d05f6 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb @@ -1,3 +1,4 @@ +require qemu-xilinx-2022.1.inc require recipes-devtools/qemu/qemu.inc require qemu-xilinx.inc diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb index 4983b4df..6aac2ad6 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.2.bb @@ -1,3 +1,4 @@ +require qemu-xilinx-2022.2.inc require recipes-devtools/qemu/qemu.inc require qemu-xilinx.inc -- cgit v1.2.3-54-g00ecf