From 8b60fb750ded82cae209467895f2b732f8d9f0b4 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Wed, 27 Dec 2023 20:10:17 +0100 Subject: [PATCH] meson (32-bit): family common: drop KERNELBRANCH, rely on KERNEL_MAJOR_MINOR only, no more symlinks --- config/sources/families/include/meson_common.inc | 13 +++---------- patch/kernel/meson-current | 1 - patch/kernel/meson-edge | 1 - 3 files changed, 3 insertions(+), 12 deletions(-) delete mode 120000 patch/kernel/meson-current delete mode 120000 patch/kernel/meson-edge diff --git a/config/sources/families/include/meson_common.inc b/config/sources/families/include/meson_common.inc index 77640136ca..e820a8ac47 100644 --- a/config/sources/families/include/meson_common.inc +++ b/config/sources/families/include/meson_common.inc @@ -44,20 +44,13 @@ case $BOARD in esac case $BRANCH in + current) - - declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. - KERNELBRANCH="branch:linux-6.1.y" - KERNELPATCHDIR='meson-'$BRANCH - + declare -g KERNEL_MAJOR_MINOR="6.1" ;; edge) - - declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel. - KERNELBRANCH="branch:linux-6.6.y" - KERNELPATCHDIR='meson-'$BRANCH - + declare -g KERNEL_MAJOR_MINOR="6.6" ;; esac diff --git a/patch/kernel/meson-current b/patch/kernel/meson-current deleted file mode 120000 index 76bf5f8249..0000000000 --- a/patch/kernel/meson-current +++ /dev/null @@ -1 +0,0 @@ -archive/meson-6.1 \ No newline at end of file diff --git a/patch/kernel/meson-edge b/patch/kernel/meson-edge deleted file mode 120000 index e4db21594e..0000000000 --- a/patch/kernel/meson-edge +++ /dev/null @@ -1 +0,0 @@ -archive/meson-6.6 \ No newline at end of file