From ed589b248aef675cb5e845fcb55c12dfbcc5e925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Tue, 1 Mar 2022 15:10:04 +0100 Subject: [PATCH] Move away from fixed versions (#3518) --- config/sources/families/include/meson64_common.inc | 6 ++---- config/sources/families/include/sunxi64_common.inc | 2 +- config/sources/families/include/sunxi_common.inc | 2 +- config/sources/families/include/uefi_common.inc | 7 +++---- config/sources/families/jetson-nano.conf | 6 ++---- config/sources/families/media.conf | 6 ++---- config/sources/families/mvebu.conf | 6 ++---- config/sources/families/mvebu64.conf | 6 ++---- config/sources/families/odroidxu4.conf | 5 +++-- config/sources/families/rockchip.conf | 6 ++---- 10 files changed, 20 insertions(+), 32 deletions(-) diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc index b2ba75544..461ae808c 100644 --- a/config/sources/families/include/meson64_common.inc +++ b/config/sources/families/include/meson64_common.inc @@ -29,14 +29,12 @@ case $BRANCH in ;; current) - #KERNELBRANCH='branch:linux-5.10.y' - KERNELBRANCH="tag:v5.10.102" + KERNELBRANCH='branch:linux-5.10.y' KERNELPATCHDIR='meson64-current' ;; edge) - #KERNELBRANCH='branch:linux-5.15.y' - KERNELBRANCH="tag:v5.15.25" + KERNELBRANCH='branch:linux-5.15.y' KERNELPATCHDIR='meson64-edge' ;; diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index 5ce4a8f01..d1b24a476 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -16,7 +16,7 @@ case $BRANCH in current) KERNEL_VERSION_LEVEL="5.15" ;; edge) KERNEL_VERSION_LEVEL="5.16" - KERNELSWITCHOBJ="tag=v5.16.11" + #KERNELSWITCHOBJ="tag=v5.16.11" ;; esac diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index 5fc33b6cc..71dbe905d 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -15,7 +15,7 @@ case $BRANCH in legacy) KERNEL_VERSION_LEVEL="5.10" ;; current) KERNEL_VERSION_LEVEL="5.15" ;; edge) KERNEL_VERSION_LEVEL="5.16" - KERNELSWITCHOBJ="tag=v5.16.11" + #KERNELSWITCHOBJ="tag=v5.16.11" ;; esac diff --git a/config/sources/families/include/uefi_common.inc b/config/sources/families/include/uefi_common.inc index 5cf83374a..20dccd02a 100644 --- a/config/sources/families/include/uefi_common.inc +++ b/config/sources/families/include/uefi_common.inc @@ -14,8 +14,7 @@ legacy) current) export DISTRO_GENERIC_KERNEL=no export LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}" - #export KERNELBRANCH="branch:linux-5.15.y" - export KERNELBRANCH="tag:v5.15.25" + export KERNELBRANCH="branch:linux-5.15.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. ;; @@ -23,8 +22,8 @@ current) edge) export DISTRO_GENERIC_KERNEL=no export LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}" - #export KERNELBRANCH="branch:linux-5.16.y" - export KERNELBRANCH="tag:v5.16.11" + export KERNELBRANCH="branch:linux-5.16.y" + #export KERNELBRANCH="tag:v5.16.11" 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/config/sources/families/jetson-nano.conf b/config/sources/families/jetson-nano.conf index 78bbc66ac..a5109b6f8 100644 --- a/config/sources/families/jetson-nano.conf +++ b/config/sources/families/jetson-nano.conf @@ -21,8 +21,7 @@ case $BRANCH in ;; current) -# KERNELBRANCH="branch:linux-5.15.y" - KERNELBRANCH="tag:v5.15.25" + KERNELBRANCH="branch:linux-5.15.y" KERNELPATCHDIR='media-'$BRANCH LINUXFAMILY=media LINUXCONFIG='linux-media-'$BRANCH @@ -31,8 +30,7 @@ case $BRANCH in edge) # SKIP_BOOTSPLASH="yes" -# KERNELBRANCH="branch:linux-5.16.y" - KERNELBRANCH="tag:v5.16.11" + KERNELBRANCH="branch:linux-5.16.y" KERNELPATCHDIR='media-'$BRANCH LINUXFAMILY=media LINUXCONFIG='linux-media-'$BRANCH diff --git a/config/sources/families/media.conf b/config/sources/families/media.conf index 5f9478351..1652d20c8 100644 --- a/config/sources/families/media.conf +++ b/config/sources/families/media.conf @@ -29,8 +29,7 @@ case $BRANCH in ;; current) -# KERNELBRANCH="branch:linux-5.15.y" - KERNELBRANCH="tag:v5.15.25" + KERNELBRANCH="branch:linux-5.15.y" KERNELPATCHDIR='media-'$BRANCH LINUXFAMILY=media LINUXCONFIG='linux-media-'$BRANCH @@ -38,8 +37,7 @@ case $BRANCH in edge) # SKIP_BOOTSPLASH="yes" -# KERNELBRANCH="branch:linux-5.16.y" - KERNELBRANCH="tag:v5.16.11" + KERNELBRANCH="branch:linux-5.16.y" KERNELPATCHDIR='media-'$BRANCH LINUXFAMILY=media LINUXCONFIG='linux-media-'$BRANCH diff --git a/config/sources/families/mvebu.conf b/config/sources/families/mvebu.conf index ae46e34e7..d0171fc87 100644 --- a/config/sources/families/mvebu.conf +++ b/config/sources/families/mvebu.conf @@ -17,15 +17,13 @@ case $BRANCH in current) - #KERNELBRANCH='branch:linux-5.15.y' - KERNELBRANCH='tag:v5.15.25' + KERNELBRANCH='branch:linux-5.15.y' ;; edge) - #KERNELBRANCH='branch:linux-5.16.y' - KERNELBRANCH='tag:v5.16.11' + KERNELBRANCH='branch:linux-5.16.y' LINUXCONFIG='linux-mvebu-edge' KERNELPATCHDIR="mvebu-edge" diff --git a/config/sources/families/mvebu64.conf b/config/sources/families/mvebu64.conf index d3ad994a7..51eb8ca27 100644 --- a/config/sources/families/mvebu64.conf +++ b/config/sources/families/mvebu64.conf @@ -36,15 +36,13 @@ case $BRANCH in current) - #KERNELBRANCH='branch:linux-5.15.y' - KERNELBRANCH="tag:v5.15.25" + KERNELBRANCH='branch:linux-5.15.y' ;; edge) - #KERNELBRANCH='branch:linux-5.16.y' - KERNELBRANCH="tag:v5.16.11" + KERNELBRANCH='branch:linux-5.16.y' ;; esac diff --git a/config/sources/families/odroidxu4.conf b/config/sources/families/odroidxu4.conf index fbca9812f..dbdc09e4c 100644 --- a/config/sources/families/odroidxu4.conf +++ b/config/sources/families/odroidxu4.conf @@ -23,8 +23,9 @@ case $BRANCH in ;; edge) - #KERNELBRANCH='branch:linux-5.16.y' - KERNELBRANCH="tag:v5.16.11" + + KERNELBRANCH='branch:linux-5.16.y' + ;; esac diff --git a/config/sources/families/rockchip.conf b/config/sources/families/rockchip.conf index 3ea9abc75..3787811d0 100644 --- a/config/sources/families/rockchip.conf +++ b/config/sources/families/rockchip.conf @@ -26,15 +26,13 @@ case $BRANCH in current) - #KERNELBRANCH='branch:linux-5.15.y' - KERNELBRANCH="tag:v5.15.25" + KERNELBRANCH='branch:linux-5.15.y' ;; edge) - #KERNELBRANCH='branch:linux-5.16.y' - KERNELBRANCH="tag:v5.16.11" + KERNELBRANCH='branch:linux-5.16.y' ;;