Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kirkstone] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77 #1317

Merged
merged 4 commits into from
May 30, 2024

Conversation

shr-project
Copy link
Contributor

@shr-project shr-project commented May 14, 2024

This is needed for "iw reg" to work correctly with updated wireless-reg which was backported to kirkstone in:
https://git.openembedded.org/openembedded-core/commit/?h=kirkstone&id=11c9c6eec5ff45cd1fd4858bc28f38693c5d0fde

The necessary changes are included in 6.1.74, but bump to 6.1.77 to keep 6.1 revision in sync for kirkstone, mickledore, nanbield, master branches.

work-shared/raspberrypi4-64/kernel-source $ git log --oneline f364e0eb8f973e1aa24a3c451d18e84247a8efcd..1cdbd99f402b76c61632d09a49b20ce90af0cc72 | grep cfg80211                                     
dd9465b10880 wifi: cfg80211: lock wiphy mutex for rfkill poll                                                                                                                                                                                 
15577a98ef29 wifi: cfg80211: fix CQM for non-range use                                                                                                                                                                                        
db57ef0dd4c2 wifi: cfg80211: fix certs build to not depend on file order                                                                                                                                                                      
ec350809cd98 wifi: cfg80211: Add my certificate                                                                                                                                                                                               
db46c77f3d51 Revert "wifi: cfg80211: fix CQM for non-range use"                                                                                                                                                                               
307a6525c82a wifi: cfg80211: fix CQM for non-range use                                                                                                                                                                                        
25bc87768cef wifi: cfg80211: fix kernel-doc for wiphy_delayed_work_flush()                                                                                                                                                                    
697fb94e3e8d wifi: cfg80211: add flush functions for wiphy work

Be aware that only rpi5 is using 6.1 kernel by default in kirkstone and other RPIs still default to 5.15 which is still affected:

conf/machine/include/rpi-default-versions.inc:PREFERRED_VERSION_linux-raspberrypi ??= "5.15.%"
conf/machine/raspberrypi5.conf:PREFERRED_VERSION_linux-raspberrypi = "6.1%"

latest rpi-5.15.y doesn't have the backports for this, backport them as .patch files.

kraj added 2 commits May 14, 2024 12:29
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@shr-project shr-project changed the title linux-raspberrypi_6.1.bb: Upgrade to 6.1.77 [kirkstone] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77 May 14, 2024
shr-project added a commit to shr-project/meta-raspberrypi that referenced this pull request May 14, 2024
* 6.1 version was used by default since mickledore:
  agherzan@12a1187
  and kirkstone for rpi5 MACHINEs since:
  agherzan@9dc6673

* scarthgap uses 6.6 by default since:
  agherzan@1cf3dd5

* nobody is probably using 5.15 with newer release and there are issues with "iw reg" since
  wireless-regdb upgrade in oe-core as well as shown in:
  agherzan#1317
  so better to drop it from master/scarthgap together with
  rpi.scc used only for 5.15 and 0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch
  used only by rpi.scc

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Copy link
Collaborator

@kraj kraj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

agherzan pushed a commit that referenced this pull request May 28, 2024
* 6.1 version was used by default since mickledore:
  12a1187
  and kirkstone for rpi5 MACHINEs since:
  9dc6673

* scarthgap uses 6.6 by default since:
  1cf3dd5

* nobody is probably using 5.15 with newer release and there are issues with "iw reg" since
  wireless-regdb upgrade in oe-core as well as shown in:
  #1317
  so better to drop it from master/scarthgap together with
  rpi.scc used only for 5.15 and 0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch
  used only by rpi.scc

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Copy link
Owner

@agherzan agherzan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@agherzan agherzan enabled auto-merge (rebase) May 28, 2024 22:12
shr-project and others added 2 commits May 29, 2024 11:39
…wireless-regdb-2024.01.23 and newer

* backported to oe-core kirkstone in:
  https://git.openembedded.org/openembedded-core/commit/?h=kirkstone&id=11c9c6eec5ff45cd1fd4858bc28f38693c5d0fde

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
This fixes:

The configuration key "build.os" is required to build your
documentation. Read more at
https://docs.readthedocs.io/en/stable/config-file/v2.html#build-os

Signed-off-by: Andrei Gherzan <andrei@gherzan.com>
auto-merge was automatically disabled May 29, 2024 09:39

Head branch was pushed to by a user without write access

@shr-project
Copy link
Contributor Author

Force pushed with missing Signed-off-by.

@agherzan agherzan enabled auto-merge (rebase) May 29, 2024 10:56
@agherzan agherzan merged commit 70c293b into agherzan:kirkstone May 30, 2024
17 checks passed
daregit pushed a commit to daregit/yocto-combined that referenced this pull request Jun 3, 2024
* 6.1 version was used by default since mickledore:
  agherzan/meta-raspberrypi@12a1187
  and kirkstone for rpi5 MACHINEs since:
  agherzan/meta-raspberrypi@9dc6673

* scarthgap uses 6.6 by default since:
  agherzan/meta-raspberrypi@1cf3dd5

* nobody is probably using 5.15 with newer release and there are issues with "iw reg" since
  wireless-regdb upgrade in oe-core as well as shown in:
  agherzan/meta-raspberrypi#1317
  so better to drop it from master/scarthgap together with
  rpi.scc used only for 5.15 and 0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch
  used only by rpi.scc

Signed-off-by: Martin Jansa <martin.jansagmail.com>
daregit pushed a commit to daregit/yocto-combined that referenced this pull request Jun 4, 2024
* 6.1 version was used by default since mickledore:
  agherzan/meta-raspberrypi@12a1187
  and kirkstone for rpi5 MACHINEs since:
  agherzan/meta-raspberrypi@9dc6673

* scarthgap uses 6.6 by default since:
  agherzan/meta-raspberrypi@1cf3dd5

* nobody is probably using 5.15 with newer release and there are issues with "iw reg" since
  wireless-regdb upgrade in oe-core as well as shown in:
  agherzan/meta-raspberrypi#1317
  so better to drop it from master/scarthgap together with
  rpi.scc used only for 5.15 and 0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch
  used only by rpi.scc

Signed-off-by: Martin Jansa <martin.jansagmail.com>
shr-project added a commit to shr-project/meta-webosose that referenced this pull request Jun 10, 2024
:Release Notes:
Remove the backported wens certificate used by wireless-regdb since
2024.01.23 as mentioned in:
https://git.openembedded.org/openembedded-core/commit/?h=kirkstone&id=11c9c6eec5ff45cd1fd4858bc28f38693c5d0fde
revert:
http://gpro.lge.com/c/webos-pro/meta-lg-webos/+/404384 webos: webos-raspberrypi: linux-raspberrypi=webosrpi36

:Detailed Notes:
The same is now backported in meta-raspberrypi with:
agherzan/meta-raspberrypi#1317

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 used in meta-raspberrypi/kirkstone
before the backports from:
agherzan/meta-raspberrypi#1317 [kirkstone] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77
agherzan/meta-raspberrypi#1319 [mickledore] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77
agherzan/meta-raspberrypi#1318 [nanbield] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77
agherzan/meta-raspberrypi#1320 [scarthgap] linux-raspberrypi: Drop 5.15

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRQ-21716] CCC: Various build fixes
[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

Change-Id: Iffa75dc5c9e6f77736dcd73020e87e497a84f21a
Reviewed-on: http://gpro.lge.com/c/webos-pro/meta-lg-webos/+/409332
Reviewed-by: Ghane Simit <simit.ghane@lge.com>
Reviewed-by: Abdul Khader <abdul.khader@lge.com>
Reviewed-by: Hieu Van Nguyen <hieu2.nguyen@lge.com>
Reviewed-by: Jaekyu Lee <jaekyu.lee@lge.com>
Reviewed-by: Yangwoo Byun <yw.byun@lge.com>
shr-project added a commit to shr-project/meta-webosose that referenced this pull request Jun 10, 2024
…pi=v6.6.22

:Release Notes:
Backport latest kernel for rpi MACHINEs to fix compatibility with
wireless-regdb-2024.01.23 and newer.

: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:
agherzan/meta-raspberrypi#1317 [kirkstone] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77
agherzan/meta-raspberrypi#1319 [mickledore] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77
agherzan/meta-raspberrypi#1318 [nanbield] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77
agherzan/meta-raspberrypi#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-backports-5.0: linux-raspberrypi=v6.1.77 linux-raspberrypi=v6.6.22
[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

Change-Id: I8c555e50ec38a7a4d409f303d6a04c6d73e0c0eb
shr-project added a commit to shr-project/meta-webosose that referenced this pull request Jun 10, 2024
: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:
agherzan/meta-raspberrypi#1317 [kirkstone] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77
agherzan/meta-raspberrypi#1319 [mickledore] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77
agherzan/meta-raspberrypi#1318 [nanbield] linux-raspberrypi_6.1.bb: Upgrade to 6.1.77
agherzan/meta-raspberrypi#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

Change-Id: I5819a60908b89cfa88870419827a80753979649b
daregit pushed a commit to daregit/yocto-combined that referenced this pull request Jun 17, 2024
* 6.1 version was used by default since mickledore:
  agherzan/meta-raspberrypi@12a1187
  and kirkstone for rpi5 MACHINEs since:
  agherzan/meta-raspberrypi@9dc6673

* scarthgap uses 6.6 by default since:
  agherzan/meta-raspberrypi@1cf3dd5

* nobody is probably using 5.15 with newer release and there are issues with "iw reg" since
  wireless-regdb upgrade in oe-core as well as shown in:
  agherzan/meta-raspberrypi#1317
  so better to drop it from master/scarthgap together with
  rpi.scc used only for 5.15 and 0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch
  used only by rpi.scc

Signed-off-by: Martin Jansa <martin.jansagmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants