From: Mark Hatle <[email protected]> Instead of recipe version and PV being different, move to recipe version matching the expected PV value.
Note, prior pv had a 'v' in it, this has been removed to match upstream Yocto Project numbering. Signed-off-by: Mark Hatle <[email protected]> --- meta-xilinx-core/conf/layer.conf | 8 ++++---- ...2.1.bb => u-boot-tools-xlnx_2021.01-xilinx-v2022.1.bb} | 0 ...2.2.bb => u-boot-tools-xlnx_2022.01-xilinx-v2022.2.bb} | 0 ...3.1.bb => u-boot-tools-xlnx_2023.01-xilinx-v2023.1.bb} | 0 ...3.2.bb => u-boot-tools-xlnx_2023.01-xilinx-v2023.2.bb} | 0 .../recipes-bsp/u-boot/u-boot-xlnx-2022.1.inc | 4 ++-- .../recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc | 4 ++-- .../recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc | 4 ++-- .../recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc | 4 ++-- .../recipes-bsp/u-boot/u-boot-xlnx-common.inc | 6 +----- ...nx_2022.1.bb => u-boot-xlnx_2021.01-xilinx-v2022.1.bb} | 0 ...nx_2022.2.bb => u-boot-xlnx_2022.01-xilinx-v2022.2.bb} | 0 ...nx_2023.1.bb => u-boot-xlnx_2023.01-xilinx-v2023.1.bb} | 0 ...nx_2023.2.bb => u-boot-xlnx_2023.01-xilinx-v2023.2.bb} | 0 14 files changed, 13 insertions(+), 17 deletions(-) rename meta-xilinx-core/recipes-bsp/u-boot/{u-boot-tools-xlnx_2022.1.bb => u-boot-tools-xlnx_2021.01-xilinx-v2022.1.bb} (100%) rename meta-xilinx-core/recipes-bsp/u-boot/{u-boot-tools-xlnx_2022.2.bb => u-boot-tools-xlnx_2022.01-xilinx-v2022.2.bb} (100%) rename meta-xilinx-core/recipes-bsp/u-boot/{u-boot-tools-xlnx_2023.1.bb => u-boot-tools-xlnx_2023.01-xilinx-v2023.1.bb} (100%) rename meta-xilinx-core/recipes-bsp/u-boot/{u-boot-tools-xlnx_2023.2.bb => u-boot-tools-xlnx_2023.01-xilinx-v2023.2.bb} (100%) rename meta-xilinx-core/recipes-bsp/u-boot/{u-boot-xlnx_2022.1.bb => u-boot-xlnx_2021.01-xilinx-v2022.1.bb} (100%) rename meta-xilinx-core/recipes-bsp/u-boot/{u-boot-xlnx_2022.2.bb => u-boot-xlnx_2022.01-xilinx-v2022.2.bb} (100%) rename meta-xilinx-core/recipes-bsp/u-boot/{u-boot-xlnx_2023.1.bb => u-boot-xlnx_2023.01-xilinx-v2023.1.bb} (100%) rename meta-xilinx-core/recipes-bsp/u-boot/{u-boot-xlnx_2023.2.bb => u-boot-xlnx_2023.01-xilinx-v2023.2.bb} (100%) diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index ada4e688..c5594d75 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -56,10 +56,10 @@ XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%" XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%" PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" -XILINX_UBOOT_VERSION[v2022.1] = "1:v2021.01-xilinx-v2022.1%" -XILINX_UBOOT_VERSION[v2022.2] = "1:v2022.01-xilinx-v2022.2%" -XILINX_UBOOT_VERSION[v2023.1] = "1:v2023.01-xilinx-v2023.1%" -XILINX_UBOOT_VERSION[v2023.2] = "1:v2023.01-xilinx-v2023.2%" +XILINX_UBOOT_VERSION[v2022.1] = "1:2021.01-xilinx-v2022.1%" +XILINX_UBOOT_VERSION[v2022.2] = "1:2022.01-xilinx-v2022.2%" +XILINX_UBOOT_VERSION[v2023.1] = "1:2023.01-xilinx-v2023.1%" +XILINX_UBOOT_VERSION[v2023.2] = "1:2023.01-xilinx-v2023.2%" PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2021.01-xilinx-v2022.1.bb similarity index 100% rename from meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.1.bb rename to meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2021.01-xilinx-v2022.1.bb diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.01-xilinx-v2022.2.bb similarity index 100% rename from meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb rename to meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.01-xilinx-v2022.2.bb diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.01-xilinx-v2023.1.bb similarity index 100% rename from meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.1.bb rename to meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.01-xilinx-v2023.1.bb diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.01-xilinx-v2023.2.bb similarity index 100% rename from meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.2.bb rename to meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2023.01-xilinx-v2023.2.bb diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.1.inc index a0c0b50d..69c7a639 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.1.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.1.inc @@ -1,5 +1,3 @@ -UBOOT_VERSION = "v2021.01" - UBRANCH ?= "xlnx_rebase_v2022.01_2022.1_update" SRCREV = "91ad7924e7f59584d597353e1bb86794341e0a7e" @@ -15,3 +13,5 @@ HAS_PLATFORM_INIT ?= " \ " DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native" + +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2021.01:" diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc index f9b8f52b..d111ae99 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc @@ -1,5 +1,3 @@ -UBOOT_VERSION = "v2022.01" - UBRANCH ?= "xlnx_rebase_v2022.01" SRCREV = "b31476685debf5512ed0d4e8000fa5167a22f530" @@ -15,3 +13,5 @@ HAS_PLATFORM_INIT ?= " \ " DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native" + +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2022.01:" diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc index 72f43f71..1fd191f0 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc @@ -1,5 +1,3 @@ -UBOOT_VERSION = "v2023.01" - UBRANCH = "xlnx_rebase_v2023.01_update" SRCREV = "1689570b68dd3827e527a520805aa0bb7f58ee09" @@ -15,3 +13,5 @@ HAS_PLATFORM_INIT ?= " \ " DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native" + +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2023.01:" diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc index 2e761ebe..86ba82bb 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc @@ -1,5 +1,3 @@ -UBOOT_VERSION = "v2023.01" - UBRANCH = "xlnx_rebase_v2023.01" SRCREV = "2b54ad6f1d278c419b927d10db2edf323d844578" @@ -18,6 +16,8 @@ DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native" SRC_URI:append:microblaze = " file://microblaze-generic-top.h" +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2023.01:" + do_configure:prepend:microblaze () { install ${WORKDIR}/microblaze-generic-top.h ${S}/include/configs/ } diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc index 02844d21..765af276 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc @@ -1,6 +1,4 @@ -# Use the name of the .bb for the extension -UBOOT_VERSION_EXTENSION ?= "-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}" -PV = "${UBOOT_VERSION}${UBOOT_VERSION_EXTENSION}+git" +PV .= "+git" UBOOTURI ?= "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https" UBRANCH ?= "" @@ -11,8 +9,6 @@ SRC_URI = "${UBOOTURI};${UBRANCHARG}" S = "${WORKDIR}/git" B = "${WORKDIR}/build" -FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-${UBOOT_VERSION}:" - UBOOT_MB_INC = "" UBOOT_MB_INC:microblaze = "u-boot-xlnx-microblaze.inc" require ${UBOOT_MB_INC} diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2021.01-xilinx-v2022.1.bb similarity index 100% rename from meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb rename to meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2021.01-xilinx-v2022.1.bb diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.01-xilinx-v2022.2.bb similarity index 100% rename from meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb rename to meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.01-xilinx-v2022.2.bb diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.01-xilinx-v2023.1.bb similarity index 100% rename from meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.1.bb rename to meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.01-xilinx-v2023.1.bb diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.01-xilinx-v2023.2.bb similarity index 100% rename from meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.2.bb rename to meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2023.01-xilinx-v2023.2.bb -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5326): https://lists.yoctoproject.org/g/meta-xilinx/message/5326 Mute This Topic: https://lists.yoctoproject.org/mt/106179143/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
