From: Mark Hatle <[email protected]>

The recipe version is now 'major.minor_vivado'.  In the future we may
drop the vivado component and just stay with major_minor.  But this sets
us up to make that change easier in the future.

Signed-off-by: Mark Hatle <[email protected]>
---
 ...-drm-xilinx-Add-encoder-for-Digilent-boards.patch |  0
 .../0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch |  0
 .../0003-drm-xilinx-Fix-DPMS-transition-to-on.patch  |  0
 .../0004-minized-wifi-bluetooth.cfg                  |  0
 ...-drm-xilinx-Add-encoder-for-Digilent-boards.patch |  0
 .../0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch |  0
 .../0003-drm-xilinx-Fix-DPMS-transition-to-on.patch  |  0
 .../0004-minized-wifi-bluetooth.cfg                  |  0
 ...-drm-xilinx-Add-encoder-for-Digilent-boards.patch |  0
 .../0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch |  0
 .../0003-drm-xilinx-Fix-DPMS-transition-to-on.patch  |  0
 .../0004-minized-wifi-bluetooth.cfg                  |  0
 ...-drm-xilinx-Add-encoder-for-Digilent-boards.patch |  0
 .../0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch |  0
 .../0003-drm-xilinx-Fix-DPMS-transition-to-on.patch  |  0
 .../0004-minized-wifi-bluetooth.cfg                  |  0
 ...ux-xlnx_2022.1.bbappend => linux-xlnx_%.bbappend} |  2 +-
 .../recipes-kernel/linux/linux-xlnx_2022.2.bbappend  | 12 ------------
 .../recipes-kernel/linux/linux-xlnx_2023.1.bbappend  | 12 ------------
 .../recipes-kernel/linux/linux-xlnx_2023.2.bbappend  | 12 ------------
 meta-xilinx-core/conf/layer.conf                     |  8 ++++----
 meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc |  4 ++--
 ...nux-xlnx_2022.1.bb => linux-xlnx_5.15-v2022.1.bb} |  0
 ...nux-xlnx_2022.2.bb => linux-xlnx_5.15-v2022.2.bb} |  0
 ...inux-xlnx_2023.1.bb => linux-xlnx_6.1-v2023.1.bb} |  0
 ...inux-xlnx_2023.2.bb => linux-xlnx_6.1-v2023.2.bb} |  0
 26 files changed, 7 insertions(+), 43 deletions(-)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2022.1 => 
5.15.19}/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2022.1 => 
5.15.19}/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2022.1 => 
5.15.19}/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2022.1 => 
5.15.19}/0004-minized-wifi-bluetooth.cfg (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2022.2 => 
5.15.36}/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2022.2 => 
5.15.36}/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2022.2 => 
5.15.36}/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2022.2 => 
5.15.36}/0004-minized-wifi-bluetooth.cfg (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2023.1 => 
6.1.30}/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2023.1 => 
6.1.30}/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2023.1 => 
6.1.30}/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2023.1 => 
6.1.30}/0004-minized-wifi-bluetooth.cfg (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2023.2 => 
6.1.60}/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2023.2 => 
6.1.60}/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2023.2 => 
6.1.60}/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/{v2023.2 => 
6.1.60}/0004-minized-wifi-bluetooth.cfg (100%)
 rename meta-xilinx-contrib/recipes-kernel/linux/{linux-xlnx_2022.1.bbappend => 
linux-xlnx_%.bbappend} (78%)
 delete mode 100644 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.2.bbappend
 delete mode 100644 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2023.1.bbappend
 delete mode 100644 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2023.2.bbappend
 rename meta-xilinx-core/recipes-kernel/linux/{linux-xlnx_2022.1.bb => 
linux-xlnx_5.15-v2022.1.bb} (100%)
 rename meta-xilinx-core/recipes-kernel/linux/{linux-xlnx_2022.2.bb => 
linux-xlnx_5.15-v2022.2.bb} (100%)
 rename meta-xilinx-core/recipes-kernel/linux/{linux-xlnx_2023.1.bb => 
linux-xlnx_6.1-v2023.1.bb} (100%)
 rename meta-xilinx-core/recipes-kernel/linux/{linux-xlnx_2023.2.bb => 
linux-xlnx_6.1-v2023.2.bb} (100%)

diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.19/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.19/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.19/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.19/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.19/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.19/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0004-minized-wifi-bluetooth.cfg
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.19/0004-minized-wifi-bluetooth.cfg
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0004-minized-wifi-bluetooth.cfg
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.19/0004-minized-wifi-bluetooth.cfg
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.36/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.36/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.36/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.36/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.36/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.36/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0004-minized-wifi-bluetooth.cfg
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.36/0004-minized-wifi-bluetooth.cfg
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.2/0004-minized-wifi-bluetooth.cfg
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/5.15.36/0004-minized-wifi-bluetooth.cfg
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.30/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.30/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.30/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.30/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.30/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.30/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.1/0004-minized-wifi-bluetooth.cfg
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.30/0004-minized-wifi-bluetooth.cfg
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.1/0004-minized-wifi-bluetooth.cfg
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.30/0004-minized-wifi-bluetooth.cfg
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.2/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.60/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.2/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.60/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.2/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.60/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.2/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.60/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.2/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.60/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.2/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.60/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.2/0004-minized-wifi-bluetooth.cfg
 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.60/0004-minized-wifi-bluetooth.cfg
similarity index 100%
rename from 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2023.2/0004-minized-wifi-bluetooth.cfg
rename to 
meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/6.1.60/0004-minized-wifi-bluetooth.cfg
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.1.bbappend 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_%.bbappend
similarity index 78%
rename from meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.1.bbappend
rename to meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_%.bbappend
index c789c7a9..8a6a6dc4 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.1.bbappend
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS:prepend := 
"${THISDIR}/linux-xlnx/v${@bb.parse.vars_from_file(d.getVar('FILE', 
False),d)[1] or ''}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-xlnx/${LINUX_VERSION}:"
 
 # Note: These patches are very old and doesn't apply on top of 5.x
 #       kernel. For more details refer README.md file.
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.2.bbappend 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.2.bbappend
deleted file mode 100644
index c789c7a9..00000000
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.2.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS:prepend := 
"${THISDIR}/linux-xlnx/v${@bb.parse.vars_from_file(d.getVar('FILE', 
False),d)[1] or ''}:"
-
-# Note: These patches are very old and doesn't apply on top of 5.x
-#       kernel. For more details refer README.md file.
-
-#SRC_URI:append:zybo-linux-bd-zynq7 = " \
-#      file://0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch \
-#      file://0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch \
-#      file://0003-drm-xilinx-Fix-DPMS-transition-to-on.patch \
-#      "
-
-SRC_URI:append:minized-zynq7 = " file://0004-minized-wifi-bluetooth.cfg"
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2023.1.bbappend 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2023.1.bbappend
deleted file mode 100644
index c789c7a9..00000000
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2023.1.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS:prepend := 
"${THISDIR}/linux-xlnx/v${@bb.parse.vars_from_file(d.getVar('FILE', 
False),d)[1] or ''}:"
-
-# Note: These patches are very old and doesn't apply on top of 5.x
-#       kernel. For more details refer README.md file.
-
-#SRC_URI:append:zybo-linux-bd-zynq7 = " \
-#      file://0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch \
-#      file://0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch \
-#      file://0003-drm-xilinx-Fix-DPMS-transition-to-on.patch \
-#      "
-
-SRC_URI:append:minized-zynq7 = " file://0004-minized-wifi-bluetooth.cfg"
diff --git 
a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2023.2.bbappend 
b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2023.2.bbappend
deleted file mode 100644
index c789c7a9..00000000
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2023.2.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS:prepend := 
"${THISDIR}/linux-xlnx/v${@bb.parse.vars_from_file(d.getVar('FILE', 
False),d)[1] or ''}:"
-
-# Note: These patches are very old and doesn't apply on top of 5.x
-#       kernel. For more details refer README.md file.
-
-#SRC_URI:append:zybo-linux-bd-zynq7 = " \
-#      file://0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch \
-#      file://0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch \
-#      file://0003-drm-xilinx-Fix-DPMS-transition-to-on.patch \
-#      "
-
-SRC_URI:append:minized-zynq7 = " file://0004-minized-wifi-bluetooth.cfg"
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index c5594d75..4457b5f9 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -64,10 +64,10 @@ 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'}"
 
-XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%"
-XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%"
-XILINX_LINUX_VERSION[v2023.1] = "6.1.30-xilinx-v2023.1%"
-XILINX_LINUX_VERSION[v2023.2] = "6.1.60-xilinx-v2023.2%"
+XILINX_LINUX_VERSION[v2022.1] = "5.15.19%"
+XILINX_LINUX_VERSION[v2022.2] = "5.15.36%"
+XILINX_LINUX_VERSION[v2023.1] = "6.1.30%"
+XILINX_LINUX_VERSION[v2023.2] = "6.1.60%"
 PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', 
d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
 # Mali needs to match the kernel version
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc 
b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
index f280da9f..897fbb1c 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
@@ -1,6 +1,6 @@
 # This version extension should match CONFIG_LOCALVERSION in defconfig
-LINUX_VERSION_EXTENSION ?= 
"-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}"
-PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git"
+LINUX_VERSION_EXTENSION ?= "-xilinx"
+PV = "${LINUX_VERSION}+git"
 
 # Sources, by default allow for the use of SRCREV pointing to orphaned 
tags/commits
 KBRANCH ?= "undefined"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb 
b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.1.bb
similarity index 100%
rename from meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb
rename to meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.1.bb
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb 
b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.2.bb
similarity index 100%
rename from meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb
rename to meta-xilinx-core/recipes-kernel/linux/linux-xlnx_5.15-v2022.2.bb
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb 
b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.1-v2023.1.bb
similarity index 100%
rename from meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb
rename to meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.1-v2023.1.bb
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb 
b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.1-v2023.2.bb
similarity index 100%
rename from meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb
rename to meta-xilinx-core/recipes-kernel/linux/linux-xlnx_6.1-v2023.2.bb
-- 
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5327): 
https://lists.yoctoproject.org/g/meta-xilinx/message/5327
Mute This Topic: https://lists.yoctoproject.org/mt/106179144/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to