From 6c94abe54d9b05d94ced1517a04b4f6e46e4fd0b Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Fri, 3 Feb 2023 13:39:59 +0100 Subject: [PATCH 1/3] linux-mainline: Bump to latest releases Signed-off-by: Marek Belisko --- .../{linux-mainline_5.15.35.bb => linux-mainline_5.10.166.bb} | 2 +- .../{linux-mainline_5.10.2.bb => linux-mainline_5.15.91.bb} | 3 +-- .../{linux-mainline_5.4.69.bb => linux-mainline_5.4.230.bb} | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) rename recipes-kernel/linux/{linux-mainline_5.15.35.bb => linux-mainline_5.10.166.bb} (63%) rename recipes-kernel/linux/{linux-mainline_5.10.2.bb => linux-mainline_5.15.91.bb} (51%) rename recipes-kernel/linux/{linux-mainline_5.4.69.bb => linux-mainline_5.4.230.bb} (51%) diff --git a/recipes-kernel/linux/linux-mainline_5.15.35.bb b/recipes-kernel/linux/linux-mainline_5.10.166.bb similarity index 63% rename from recipes-kernel/linux/linux-mainline_5.15.35.bb rename to recipes-kernel/linux/linux-mainline_5.10.166.bb index dba9b44..79ac129 100644 --- a/recipes-kernel/linux/linux-mainline_5.15.35.bb +++ b/recipes-kernel/linux/linux-mainline_5.10.166.bb @@ -4,4 +4,4 @@ DESCRIPTION = "Mainline Longterm Linux kernel" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -SRC_URI[sha256sum] = "0a1a5ae2f30eb2b38215e59077f045aabd7f4e2857a881482f02ea48186105d8" +SRC_URI[sha256sum] = "0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af" diff --git a/recipes-kernel/linux/linux-mainline_5.10.2.bb b/recipes-kernel/linux/linux-mainline_5.15.91.bb similarity index 51% rename from recipes-kernel/linux/linux-mainline_5.10.2.bb rename to recipes-kernel/linux/linux-mainline_5.15.91.bb index 80eec77..4b44a93 100644 --- a/recipes-kernel/linux/linux-mainline_5.10.2.bb +++ b/recipes-kernel/linux/linux-mainline_5.15.91.bb @@ -4,5 +4,4 @@ DESCRIPTION = "Mainline Longterm Linux kernel" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -SRC_URI[md5sum] = "0751179f60de73eb2cd93f161fa52fcf" -SRC_URI[sha256sum] = "3b84e13abae26af17ebccc4d7212f5843a991127a73a320848d5c6942ef781a2" +SRC_URI[sha256sum] = "a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80" diff --git a/recipes-kernel/linux/linux-mainline_5.4.69.bb b/recipes-kernel/linux/linux-mainline_5.4.230.bb similarity index 51% rename from recipes-kernel/linux/linux-mainline_5.4.69.bb rename to recipes-kernel/linux/linux-mainline_5.4.230.bb index 17613d7..d06dc89 100644 --- a/recipes-kernel/linux/linux-mainline_5.4.69.bb +++ b/recipes-kernel/linux/linux-mainline_5.4.230.bb @@ -4,5 +4,4 @@ DESCRIPTION = "Mainline Longterm Linux kernel" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -SRC_URI[md5sum] = "98c8187b801f006ba203db0669e307a5" -SRC_URI[sha256sum] = "a8b31d716b397303a183e42ad525ff2871024a43e3ea530d0fdf73b7f9d27da7" +SRC_URI[sha256sum] = "a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f" From f87d85fa2ea11cba4f7c528701d1d9e04fa73366 Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Fri, 3 Feb 2023 13:32:36 +0100 Subject: [PATCH 2/3] linux-mainline: Add handling for 6.x kernel Signed-off-by: Marek Belisko --- recipes-kernel/linux/linux-mainline.inc | 5 ++++- recipes-kernel/linux/linux-mainline_6.1.9.bb | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 recipes-kernel/linux/linux-mainline_6.1.9.bb diff --git a/recipes-kernel/linux/linux-mainline.inc b/recipes-kernel/linux/linux-mainline.inc index e03fa62..217438e 100644 --- a/recipes-kernel/linux/linux-mainline.inc +++ b/recipes-kernel/linux/linux-mainline.inc @@ -20,7 +20,10 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" S = "${WORKDIR}/linux-${PV}" -SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \ +# get release version 5.x or 6.x based on version +KRELEASE = "${@d.getVar('PV', True).split('.')[0]}" + +SRC_URI = "https://www.kernel.org/pub/linux/kernel/v${KRELEASE}.x/linux-${PV}.tar.xz \ file://0001-dts-orange-pi-zero-Add-wifi-support.patch \ file://0002-dts-nanopi-neo-air-add-camera.patch \ file://0003-dts-allwinner-bananapi-m2-zreo-Enforce-consistent-MM.patch \ diff --git a/recipes-kernel/linux/linux-mainline_6.1.9.bb b/recipes-kernel/linux/linux-mainline_6.1.9.bb new file mode 100644 index 0000000..f7caf24 --- /dev/null +++ b/recipes-kernel/linux/linux-mainline_6.1.9.bb @@ -0,0 +1,7 @@ +require linux-mainline.inc + +DESCRIPTION = "Mainline Longterm Linux kernel" + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +SRC_URI[sha256sum] = "d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b" From be26c5dd90e64a01052349e28bfdb77e276f7b77 Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Fri, 3 Feb 2023 13:41:54 +0100 Subject: [PATCH 3/3] Use 6.x kernel by default Signed-off-by: Marek Belisko --- conf/machine/include/sunxi.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/sunxi.inc b/conf/machine/include/sunxi.inc index 3c771a6..ccc370f 100644 --- a/conf/machine/include/sunxi.inc +++ b/conf/machine/include/sunxi.inc @@ -14,7 +14,7 @@ XSERVER = "xserver-xorg \ xf86-input-keyboard" PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline" -PREFERRED_VERSION_linux-mainline ?= "5.15.%" +PREFERRED_VERSION_linux-mainline ?= "6.1.%" PREFERRED_PROVIDER_u-boot ?= "u-boot" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"