diff --git a/config/sources/cubox.conf b/config/sources/cubox.conf index 357623f218..eba55be9de 100644 --- a/config/sources/cubox.conf +++ b/config/sources/cubox.conf @@ -18,7 +18,7 @@ case $BRANCH in next) KERNELSOURCE=$MAINLINE_KERNEL_SOURCE - KERNELBRANCH=$MAINLINE_KERNEL_BRANCH + KERNELBRANCH='branch:linux-4.13.y' KERNELDIR=$MAINLINE_KERNEL_DIR BOOTPATCHDIR='u-boot-cubox-next' ;; diff --git a/config/sources/meson64.conf b/config/sources/meson64.conf index a5339de858..b3efd4980a 100644 --- a/config/sources/meson64.conf +++ b/config/sources/meson64.conf @@ -22,7 +22,7 @@ case $BRANCH in next) KERNELSOURCE=$MAINLINE_KERNEL_SOURCE - KERNELBRANCH=$MAINLINE_KERNEL_BRANCH + KERNELBRANCH='branch:linux-4.13.y' KERNELDIR=$MAINLINE_KERNEL_DIR KERNEL_USE_GCC='> 7.0' ;; diff --git a/config/sources/mvebu.conf b/config/sources/mvebu.conf index c029cdfc8d..51cfb3e051 100644 --- a/config/sources/mvebu.conf +++ b/config/sources/mvebu.conf @@ -22,7 +22,7 @@ case $BRANCH in next) KERNELSOURCE=$MAINLINE_KERNEL_SOURCE - KERNELBRANCH=$MAINLINE_KERNEL_BRANCH + KERNELBRANCH='branch:linux-4.13.y' KERNELDIR=$MAINLINE_KERNEL_DIR KERNEL_USE_GCC='> 7.0' diff --git a/config/sources/mvebu64.conf b/config/sources/mvebu64.conf index 28ab71b888..45cdf14de7 100644 --- a/config/sources/mvebu64.conf +++ b/config/sources/mvebu64.conf @@ -32,7 +32,7 @@ case $BRANCH in next) KERNELSOURCE=$MAINLINE_KERNEL_SOURCE - KERNELBRANCH=$MAINLINE_KERNEL_BRANCH + KERNELBRANCH='branch:linux-4.13.y' KERNELDIR=$MAINLINE_KERNEL_DIR KERNEL_USE_GCC='> 7.0' diff --git a/config/sources/odroidc2.conf b/config/sources/odroidc2.conf index c2cdcb7d94..ecbd541f0d 100644 --- a/config/sources/odroidc2.conf +++ b/config/sources/odroidc2.conf @@ -31,8 +31,7 @@ case $BRANCH in UBOOT_USE_GCC='> 7.0' KERNELSOURCE=$MAINLINE_KERNEL_SOURCE - KERNELBRANCH='branch:linux-4.12.y' - KERNELBRANCH=$MAINLINE_KERNEL_BRANCH + KERNELBRANCH='branch:linux-4.13.y' KERNELDIR=$MAINLINE_KERNEL_DIR KERNEL_USE_GCC='> 7.0' diff --git a/config/sources/rockchip.conf b/config/sources/rockchip.conf index cc76f79028..cb5b62a1fe 100644 --- a/config/sources/rockchip.conf +++ b/config/sources/rockchip.conf @@ -23,7 +23,7 @@ case $BRANCH in next) KERNELSOURCE=$MAINLINE_KERNEL_SOURCE - KERNELBRANCH=$MAINLINE_KERNEL_BRANCH + KERNELBRANCH='branch:linux-4.13.y' KERNELDIR=$MAINLINE_KERNEL_DIR ;; diff --git a/config/sources/sunxi64_common.inc b/config/sources/sunxi64_common.inc index 5e61017322..2c3aa69975 100644 --- a/config/sources/sunxi64_common.inc +++ b/config/sources/sunxi64_common.inc @@ -29,7 +29,7 @@ case $BRANCH in BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd' KERNELSOURCE=$MAINLINE_KERNEL_SOURCE - KERNELBRANCH=$MAINLINE_KERNEL_BRANCH + KERNELBRANCH='branch:linux-4.13.y' KERNELDIR=$MAINLINE_KERNEL_DIR KERNEL_USE_GCC='> 7.0' KERNELPATCHDIR='sunxi-next' diff --git a/config/sources/sunxi_common.inc b/config/sources/sunxi_common.inc index 84ba6daf0f..18b777bb23 100644 --- a/config/sources/sunxi_common.inc +++ b/config/sources/sunxi_common.inc @@ -25,7 +25,7 @@ case $BRANCH in next) KERNELSOURCE=$MAINLINE_KERNEL_SOURCE - KERNELBRANCH=$MAINLINE_KERNEL_BRANCH + KERNELBRANCH='branch:linux-4.13.y' KERNELDIR=$MAINLINE_KERNEL_DIR GOVERNOR=ondemand diff --git a/lib/configuration.sh b/lib/configuration.sh index 522e1b8a01..affd394174 100644 --- a/lib/configuration.sh +++ b/lib/configuration.sh @@ -42,8 +42,6 @@ if [[ $USE_MAINLINE_GOOGLE_MIRROR == yes ]]; then else MAINLINE_KERNEL_SOURCE='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git' fi - -MAINLINE_KERNEL_BRANCH='branch:linux-4.13.y' MAINLINE_KERNEL_DIR='linux-mainline' if [[ $USE_GITHUB_UBOOT_MIRROR == yes ]]; then