From c6d396acd59fecef538156ae502f8d0da561f55e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 16 Jul 2024 19:21:38 +0900 Subject: [PATCH] webos: webos-raspberrypi: linux-raspberrypi=v6.1.77 :Release Notes: :Detailed Notes: There is recipes-kernel/linux/linux-raspberrypi_6.1.bb recipe in meta-raspberrypi/kirkstone which was backported to support raspberrypi5 which we can switch to by setting PREFERRED_VERSION_linux-raspberrypi (all rpis use 6.1 since mickledore and 6.6 since scarthgap). rpi-6.1.y has these changes as well: BUILD/work-shared/raspberrypi4-64/kernel-source $ git log rpi-6.1.y --oneline net/wireless/certs/wens.hex db57ef0dd4c2 wifi: cfg80211: fix certs build to not depend on file order ec350809cd98 wifi: cfg80211: Add my certificate but only since 6.1.74 (not 6.1.61 currently used in meta-raspberrypi/kirkstone), so backport newer 6.1 from: https://github.com/agherzan/meta-raspberrypi/pull/1317 [kirkstone] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77 https://github.com/agherzan/meta-raspberrypi/pull/1319 [mickledore] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77 https://github.com/agherzan/meta-raspberrypi/pull/1318 [nanbield] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77 https://github.com/agherzan/meta-raspberrypi/pull/1320 [scarthgap] linux-raspberrypi: Drop 5.15 This can be dropped once the above PRs are merged upstream and weboslayers.py updated but it would be useful to keep for langdale compatibility as meta-raspberrypi/langdale doesn't have 6.1 recipe at all and it would break the bisect-ability of yocto upgrade chain :Testing Performed: Only build tested. :QA Notes: No change to image. :Issues Addressed: [WRQ-20169] CCC: webos-raspberrypi: linux-raspberrypi=v6.1.77 [WRQ-20759] iw reg set doesn't work [WRQ-16273] [TAS Failed][OSE][QWAPI-3045] com.webos.service.wifi: getCountryCode [WRQ-693] Create GPVB with Yocto 4.2 Mickledore Cherry-picked-from-commit: d970a5ef9ae1c22fdd22ec06553e8fb029036454 Cherry-picked-from-branch: --- .../conf/machine/include/webos-rpi.inc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/meta-webos-raspberrypi/conf/machine/include/webos-rpi.inc b/meta-webos-raspberrypi/conf/machine/include/webos-rpi.inc index 2fb1a2a83..d33b40312 100644 --- a/meta-webos-raspberrypi/conf/machine/include/webos-rpi.inc +++ b/meta-webos-raspberrypi/conf/machine/include/webos-rpi.inc @@ -99,3 +99,16 @@ WKS_FILE = "sdimage-raspberrypi-webos.wks" # Use Fake KMS until surface-manager is fixed to support Full KMS, see WRP-5 VC4DTBO = "vc4-fkms-v3d" + +# overwrite 5.15 used for rpi3 and rpi4 MACHINEs in kirkstone: +# conf/machine/include/rpi-default-versions.inc:PREFERRED_VERSION_linux-raspberrypi ??= "5.15.%" +# conf/machine/raspberrypi5.conf:PREFERRED_VERSION_linux-raspberrypi = "6.1%" +# all rpi MACHINEs use 6.1 since mickledore and 6.6 since scarthgap (keep in mind that this won't work in langdale) +# See meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.1.bb +# 6.1.61 (backported to kirkstone for rpi5), no 6.1 in langdale, 6.1.54 mickledore, 6.1.61 nanbield, 6.1.77 scarthgap +# and meta-webos-backports/meta-webos-backports-5.0/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.1.bb +# 6.1.77 backported from scarthgap for all releases (the same backports send upstream, except for long dead langdale) +# For scarthgap see meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.6.bb +# 6.6.22 scarthgap (uses this one by default) +# Be aware that meta-webos-backports-5.0 has lower priority (34) than meta-raspberrypi (50) in our weboslayers.py +PREFERRED_VERSION_linux-raspberrypi = "6.1.77%"