From b6798c28c1425b9d8c90388c692df2fbe1ac558d Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 9 Jun 2024 15:31:16 +0200 Subject: [PATCH] rockchip-rk3588: `current` (6.8) and `edge` (6.10) - use major+minor in kernel config filenames - `LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}" # Attention: not -${BRANCH} (edge/current/legacy), -but ${KERNEL_MAJOR_MINOR} thus 6.8 / 6.10 etc` --- ...8-edge.config => linux-rockchip-rk3588-6.10.config} | 0 ...oldedge.config => linux-rockchip-rk3588-6.8.config} | 0 config/sources/families/rockchip-rk3588.conf | 10 +++++----- 3 files changed, 5 insertions(+), 5 deletions(-) rename config/kernel/{linux-rockchip-rk3588-edge.config => linux-rockchip-rk3588-6.10.config} (100%) rename config/kernel/{linux-rockchip-rk3588-oldedge.config => linux-rockchip-rk3588-6.8.config} (100%) diff --git a/config/kernel/linux-rockchip-rk3588-edge.config b/config/kernel/linux-rockchip-rk3588-6.10.config similarity index 100% rename from config/kernel/linux-rockchip-rk3588-edge.config rename to config/kernel/linux-rockchip-rk3588-6.10.config diff --git a/config/kernel/linux-rockchip-rk3588-oldedge.config b/config/kernel/linux-rockchip-rk3588-6.8.config similarity index 100% rename from config/kernel/linux-rockchip-rk3588-oldedge.config rename to config/kernel/linux-rockchip-rk3588-6.8.config diff --git a/config/sources/families/rockchip-rk3588.conf b/config/sources/families/rockchip-rk3588.conf index 7e25550c7a19..e83927af6a9a 100644 --- a/config/sources/families/rockchip-rk3588.conf +++ b/config/sources/families/rockchip-rk3588.conf @@ -41,15 +41,15 @@ case $BRANCH in edge) LINUXFAMILY=rockchip-rk3588 - LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH - KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel. + KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel. + LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}" # Attention: not -${BRANCH} (edge/current/legacy), but -${KERNEL_MAJOR_MINOR} thus 6.8 / 6.10 etc # No need, because default: KERNELPATCHDIR='archive/rockchip-rk3588-6.10' ;; - oldedge) + current) LINUXFAMILY=rockchip-rk3588 - LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH - KERNEL_MAJOR_MINOR="6.8" # Major and minor versions of this kernel. + KERNEL_MAJOR_MINOR="6.8" # Major and minor versions of this kernel. + LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}" # Attention: not -${BRANCH} (edge/current/legacy), -but ${KERNEL_MAJOR_MINOR} thus 6.8 / 6.10 etc # No need, because default: KERNELPATCHDIR='archive/rockchip-rk3588-6.8' ;;