Move UEFI legacy to 5.15.y, current to 6.1.y and edge to 6.2.y (#4896)

config/boards/uefi-arm64.conf

@@ -1,6 +1,6 @@
 # aarch64 via UEFI for all UEFI-enabled boards
 export BOARD_NAME="UEFI arm64"
 export BOARDFAMILY="uefi-arm64"
-export KERNEL_TARGET="current,edge"
+export KERNEL_TARGET="legacy,current,edge"
 
 export BOOT_LOGO=desktop

config/boards/uefi-riscv64.conf

@@ -1,5 +1,5 @@
 # riscv64 via UEFI for all UEFI-enabled boards
 export BOARD_NAME="UEFI riscv64"
 export BOARDFAMILY="uefi-riscv64"
-export KERNEL_TARGET="current,edge"
+export KERNEL_TARGET="legacy,current,edge"
 export SERIALCON="ttyS0"

config/boards/uefi-x86.conf

@@ -1,6 +1,6 @@
 # x86_64 via UEFI/BIOS for all boards
 export BOARD_NAME="UEFI x86"
 export BOARDFAMILY="uefi-x86"
-export KERNEL_TARGET="current,edge"
+export KERNEL_TARGET="legacy,current,edge"
 
 export BOOT_LOGO=desktop

config/kernel/linux-uefi-arm64-edge.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.2.0-rc7 Kernel Configuration
+# Linux/arm64 6.2.2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0"
 CONFIG_CC_IS_GCC=y
@@ -7387,7 +7387,6 @@ CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DBI=m
 CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_USE_DYNAMIC_DEBUG=y
 CONFIG_DRM_KMS_HELPER=m
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set

config/sources/families/include/uefi_common.inc

@@ -10,7 +10,8 @@ case "${BRANCH}" in
 		declare -g DISTRO_GENERIC_KERNEL=yes
 		;;
 
-	current)
+	legacy)
+
 		declare -g DISTRO_GENERIC_KERNEL=no
 		declare -g LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}"
 		declare -g KERNEL_MAJOR_MINOR="5.15"                      # Major and minor versions of this kernel. For mainline caching.
@@ -18,12 +19,21 @@ case "${BRANCH}" in
 		declare -g KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty.
 		;;
 
+	current)
+
+		declare -g DISTRO_GENERIC_KERNEL=no
+		declare -g LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}"
+		declare -g KERNEL_MAJOR_MINOR="6.1"                      # Major and minor versions of this kernel. For mainline caching.
+		declare -g KERNELBRANCH="branch:linux-6.1.y"             # Branch or tag to build from. It should match MAJOR_MINOR
+		declare -g KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty.
+		;;
+
 	edge)
+
 		declare -g DISTRO_GENERIC_KERNEL=no
 		declare -g LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}"
 		declare -g KERNEL_MAJOR_MINOR="6.2"    # Major and minor versions of this kernel. For mainline caching.
-		declare -g KERNELBRANCH='tag:v6.2-rc7' # @TODO: soon-to-be 'branch:linux-6.2.y' when it is released
-		#declare -g KERNELBRANCH="branch:linux-6.2.y"             # Branch or tag to build from. It should match MAJOR_MINOR
+		declare -g KERNELBRANCH="branch:linux-6.2.y"             # Branch or tag to build from. It should match MAJOR_MINOR
 		declare -g KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty.
 		;;
 esac

patch/kernel/uefi-arm64-current

@@ -0,0 +1 @@
+archive/uefi-arm64-6.1