Merge branch 'master' into v23.02

Bump version
2023-02-18 10:34:59 +01:00 · 2023-02-17 23:07:19 +01:00 · 2023-02-17 23:06:47 +01:00 · 2023-02-12 21:52:47 +01:00 · 2023-02-12 12:34:01 +01:00
16 changed files with 25 additions and 6 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-23.02.0-trunk
+23.02.2
--- a/config/sources/common.conf
+++ b/config/sources/common.conf
@ -11,4 +11,4 @@ export MAIN_CMDLINE='rw no_console_suspend consoleblank=0 fsck.fix=yes fsck.repa
 # kernel configuration
 [[ -z $KERNELDIR ]]          && export KERNELDIR="$MAINLINE_KERNEL_DIR"
 [[ -z $KERNELSOURCE ]]       && export KERNELSOURCE="$MAINLINE_KERNEL_SOURCE"
-[[ -z $KERNELBRANCH ]]       && export KERNELBRANCH='branch:linux-6.0.y'
+[[ -z $KERNELBRANCH ]]       && export KERNELBRANCH='branch:linux-6.0.y' && export KERNELBRANCH='commit:d60c95efffe84428e3611431bf688f50bfc13f4e'
--- a/config/sources/families/bcm2711.conf
+++ b/config/sources/families/bcm2711.conf
@ -20,6 +20,7 @@ case "${BRANCH}" in
 		export RASPI_DISTRO_KERNEL=no
 		export KERNELSOURCE='https://github.com/raspberrypi/linux'
 		export KERNELBRANCH="branch:rpi-5.15.y"
 		export KERNELBRANCH="commit:14b35093ca68bf2c81bbc90aace5007142b40b40"
 		export KERNELPATCHDIR="${LINUXFAMILY}-${BRANCH}"
 		export LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
 		;;
@ -27,6 +28,7 @@ case "${BRANCH}" in
 		export RASPI_DISTRO_KERNEL=no
 		export KERNELSOURCE='https://github.com/raspberrypi/linux'
 		export KERNELBRANCH="branch:rpi-6.1.y"
 		export KERNELBRANCH="commit:3c734d43c5fa10352e46fa7009d0e824e31b3199"
 		export KERNELPATCHDIR="${LINUXFAMILY}-${BRANCH}"
 		export LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
 		;;
--- a/config/sources/families/imx6.conf
+++ b/config/sources/families/imx6.conf
@ -11,12 +11,13 @@ case $BRANCH in
 	current)
 		KERNELBRANCH='branch:linux-5.15.y'
-
+		KERNELBRANCH='commit:85d7786c66b69d3f07cc149ac2f78d8f330c7c11'
 		;;
 	edge)
 		KERNELBRANCH='branch:linux-6.1.y'
 		KERNELBRANCH='commit:d60c95efffe84428e3611431bf688f50bfc13f4e'
 		;;
--- a/config/sources/families/include/meson64_common.inc
+++ b/config/sources/families/include/meson64_common.inc
@ -25,6 +25,7 @@ case $BRANCH in
 	current)
 		KERNELBRANCH='branch:linux-6.1.y'
 		KERNELBRANCH='commit:d60c95efffe84428e3611431bf688f50bfc13f4e'
 		KERNELPATCHDIR='meson64-current'
 		;;
--- a/config/sources/families/include/meson_common.inc
+++ b/config/sources/families/include/meson_common.inc
@ -37,6 +37,7 @@ case $BRANCH in
 	current)
 		KERNELBRANCH="branch:linux-5.15.y"
 		KERNELBRANCH='commit:85d7786c66b69d3f07cc149ac2f78d8f330c7c11'
 		KERNELPATCHDIR='meson-'$BRANCH
 		;;
@ -44,6 +45,7 @@ case $BRANCH in
 	edge)
 		KERNELBRANCH="branch:linux-6.1.y"
 		KERNELBRANCH='commit:d60c95efffe84428e3611431bf688f50bfc13f4e'
 		KERNELPATCHDIR='meson-'$BRANCH
 		;;
--- a/config/sources/families/include/rockchip64_common.inc
+++ b/config/sources/families/include/rockchip64_common.inc
@ -117,6 +117,7 @@ case $BRANCH in
 	current)
 		KERNELBRANCH="branch:linux-5.15.y"
 		KERNELBRANCH='commit:85d7786c66b69d3f07cc149ac2f78d8f330c7c11'
 		KERNELPATCHDIR='rockchip64-'$BRANCH
 		LINUXFAMILY=rockchip64
 		LINUXCONFIG='linux-rockchip64-'$BRANCH
@ -126,6 +127,7 @@ case $BRANCH in
 		KERNELPATCHDIR='rockchip64-'$BRANCH
 		KERNELBRANCH="branch:linux-6.1.y"
 		KERNELBRANCH='commit:d60c95efffe84428e3611431bf688f50bfc13f4e'
 		LINUXFAMILY=rockchip64
 		LINUXCONFIG='linux-rockchip64-'$BRANCH
--- a/config/sources/families/media.conf
+++ b/config/sources/families/media.conf
@ -62,6 +62,7 @@ case $BRANCH in
 	current)
 		KERNELBRANCH="branch:linux-6.1.y"
 		KERNELBRANCH='commit:d60c95efffe84428e3611431bf688f50bfc13f4e'
 		LINUXCONFIG='linux-media-'$BRANCH
 		KERNELPATCHDIR='media-'$BRANCH
 		LINUXFAMILY=media
--- a/config/sources/families/mt7623.conf
+++ b/config/sources/families/mt7623.conf
@ -10,7 +10,7 @@ case $BRANCH in
 	legacy)
 		KERNELBRANCH='branch:linux-4.19.y'
-
+		KERNELBRANCH='commit:53b696f0584acce2e90db69272a2a11aab138370"
 		;;
 esac
--- a/config/sources/families/mvebu.conf
+++ b/config/sources/families/mvebu.conf
@ -13,12 +13,14 @@ case $BRANCH in
 	current)
 		KERNELBRANCH='branch:linux-5.15.y'
 		KERNELBRANCH='commit:85d7786c66b69d3f07cc149ac2f78d8f330c7c11'
 		;;
 	edge)
 		KERNELBRANCH='branch:linux-6.1.y'
 		KERNELBRANCH='commit:d60c95efffe84428e3611431bf688f50bfc13f4e'
 		LINUXCONFIG='linux-mvebu-edge'
 		KERNELPATCHDIR="mvebu-edge"
--- a/config/sources/families/mvebu64.conf
+++ b/config/sources/families/mvebu64.conf
@ -36,12 +36,13 @@ case $BRANCH in
 	current)
 		KERNELBRANCH='branch:linux-5.15.y'
-
+		KERNELBRANCH='commit:85d7786c66b69d3f07cc149ac2f78d8f330c7c11'
 		;;
 	edge)
 		KERNELBRANCH='branch:linux-6.1.y'
 		KERNELBRANCH='commit:d60c95efffe84428e3611431bf688f50bfc13f4e'
 		;;
 esac
--- a/config/sources/families/odroidxu4.conf
+++ b/config/sources/families/odroidxu4.conf
@ -12,12 +12,14 @@ case $BRANCH in
 		KERNELSOURCE='https://github.com/hardkernel/linux'
 		KERNELBRANCH='branch:odroid-5.4.y'
 		KERNELBRANCH='commit:3043e57d9fe81d5031c98da852e84e7956b4a953'
 		KERNELDIR='linux-odroidxu4'
 		;;
 	edge)
 		KERNELBRANCH='branch:linux-6.1.y'
 		KERNELBRANCH='commit:d60c95efffe84428e3611431bf688f50bfc13f4e'
 		KERNELDIR='linux-odroidxu4'
 		;;
--- a/config/sources/families/rk322x.conf
+++ b/config/sources/families/rk322x.conf
@ -20,12 +20,14 @@ case $BRANCH in
 	current)
 		KERNELBRANCH='branch:linux-6.1.y'
 		KERNELBRANCH='commit:d60c95efffe84428e3611431bf688f50bfc13f4e'
 		;;
 	edge)
 		KERNELBRANCH='branch:linux-6.1.y'
 		KERNELBRANCH='commit:d60c95efffe84428e3611431bf688f50bfc13f4e'
 		;;
--- a/config/sources/families/rk35xx.conf
+++ b/config/sources/families/rk35xx.conf
@ -13,6 +13,7 @@ case $BRANCH in
 		BOOTDIR='u-boot-rockchip64'
 		KERNELSOURCE='https://github.com/radxa/kernel'
 		KERNELBRANCH='branch:stable-4.19-rock3'
 		KERNELBRANCH='commit:12cbef410ae525b8c116feb0028882c7df554c81'
 		KERNELDIR='linux-rockchip64'
 		KERNELPATCHDIR='rk35xx-legacy'
 		if [[ $BOARD == rock-3a ]]; then
--- a/config/sources/families/rockchip-rk3588.conf
+++ b/config/sources/families/rockchip-rk3588.conf
@ -15,6 +15,7 @@ case $BRANCH in
 		KERNELDIR='linux-rockchip64'
 		KERNELSOURCE='https://github.com/radxa/kernel'
 		KERNELBRANCH='branch:linux-5.10-gen-rkr3.4'
 		KERNELBRANCH='commit:2284656fedcd957584f4fedbc7f7aa1da1a54ced'
 		KERNELPATCHDIR='rockchip-rk3588-legacy'
 		;;
--- a/config/sources/families/rockchip.conf
+++ b/config/sources/families/rockchip.conf
@ -28,12 +28,13 @@ case $BRANCH in
 	current)
 		KERNELBRANCH='branch:linux-6.1.y'
-
+		KERNELBRANCH='commit:d60c95efffe84428e3611431bf688f50bfc13f4e'
 		;;
 	edge)
 		KERNELBRANCH='branch:linux-6.1.y'
 		KERNELBRANCH='commit:d60c95efffe84428e3611431bf688f50bfc13f4e'
 		;;
 esac
Author	SHA1	Message	Date
Igor	63e1ccaec0	Merge branch 'master' into v23.02	2023-02-18 10:34:59 +01:00
Igor	1a8daf0fd4	Bump version	2023-02-17 23:07:19 +01:00
Igor	a4fe703d91	Merge branch 'master' into v23.02	2023-02-17 23:06:47 +01:00
Igor	21bac1e34b	Merge branch 'master' into v23.02	2023-02-12 21:52:47 +01:00
Igor	c5a38a8089	Set version and attach sources to commits	2023-02-12 12:34:01 +01:00