From fc190469301bffeded32fdfb0500b05addd4b40b Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Mon, 12 Dec 2022 19:59:06 +0100
Subject: [PATCH] `uefi`: bump kernel to `6.1.y`; remove dangling symlinks
 (#4555)

---
 config/sources/families/include/uefi_common.inc                 | 2 +-
 .../0002-Add-PHYT0004-via-ACPI-support-to-stmmac.patch          | 0
 patch/kernel/uefi-arm64-current                                 | 1 -
 patch/kernel/uefi-arm64-edge                                    | 2 +-
 patch/kernel/uefi-x86-current                                   | 1 -
 5 files changed, 2 insertions(+), 4 deletions(-)
 rename patch/kernel/archive/{uefi-arm64-5.19 => uefi-arm64-6.1}/0002-Add-PHYT0004-via-ACPI-support-to-stmmac.patch (100%)
 delete mode 120000 patch/kernel/uefi-arm64-current
 delete mode 120000 patch/kernel/uefi-x86-current

diff --git a/config/sources/families/include/uefi_common.inc b/config/sources/families/include/uefi_common.inc
index c816da7e03..0fc4604877 100644
--- a/config/sources/families/include/uefi_common.inc
+++ b/config/sources/families/include/uefi_common.inc
@@ -21,7 +21,7 @@ case "${BRANCH}" in
 	edge)
 		export DISTRO_GENERIC_KERNEL=no
 		export LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}"
-		export KERNELBRANCH="branch:linux-6.0.y"
+		export KERNELBRANCH='branch:linux-6.1.y'
 		export KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty.
 		export KERNELDIR="linux-uefi-${LINUXFAMILY}"          # Avoid sharing a source tree with others, until we know it's safe.
 		;;
diff --git a/patch/kernel/archive/uefi-arm64-5.19/0002-Add-PHYT0004-via-ACPI-support-to-stmmac.patch b/patch/kernel/archive/uefi-arm64-6.1/0002-Add-PHYT0004-via-ACPI-support-to-stmmac.patch
similarity index 100%
rename from patch/kernel/archive/uefi-arm64-5.19/0002-Add-PHYT0004-via-ACPI-support-to-stmmac.patch
rename to patch/kernel/archive/uefi-arm64-6.1/0002-Add-PHYT0004-via-ACPI-support-to-stmmac.patch
diff --git a/patch/kernel/uefi-arm64-current b/patch/kernel/uefi-arm64-current
deleted file mode 120000
index d164450fd6..0000000000
--- a/patch/kernel/uefi-arm64-current
+++ /dev/null
@@ -1 +0,0 @@
-archive/uefi-x86-5.15
\ No newline at end of file
diff --git a/patch/kernel/uefi-arm64-edge b/patch/kernel/uefi-arm64-edge
index 66dc7958f8..fecc0b919d 120000
--- a/patch/kernel/uefi-arm64-edge
+++ b/patch/kernel/uefi-arm64-edge
@@ -1 +1 @@
-archive/uefi-arm64-5.19
\ No newline at end of file
+archive/uefi-arm64-6.1
\ No newline at end of file
diff --git a/patch/kernel/uefi-x86-current b/patch/kernel/uefi-x86-current
deleted file mode 120000
index d164450fd6..0000000000
--- a/patch/kernel/uefi-x86-current
+++ /dev/null
@@ -1 +0,0 @@
-archive/uefi-x86-5.15
\ No newline at end of file