recipes-connectivity: wpa-supplicant: Enable suiteb, wnm and mbo - #403
recipes-connectivity: wpa-supplicant: Enable suiteb, wnm and mbo#403GaoleZhangHaha wants to merge 2 commits into
Conversation
|
No need to, it will be handled automatically once the PR for the main branch is merged (if you request a backport there). |
The following change was submitted to Yocto’s main branch: wpa-supplicant: add PACKAGECONFIG controls for suiteb, wnm, and mbo (38860938302e6167b1c890b75e808f3a4ff08805). This change has already been merged. However, the Yocto wrynose branch rejected to pick this change. Therefore, I applied modification of 38860938302e6167b1c890b75e808f3a4ff08805 to the wrynose branch of meta-qcom-distro. In other words, recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend in meta-qcom-distro differs between the main and wrynose branches. in meta-qcom-distro main branch, the PR is: #400 |
There was a problem hiding this comment.
Open it again because the backport of #400 just won't be enough to implement the functionality.
|
|
||
| PACKAGECONFIG:append:qcom-distro = " suiteb wnm mbo" | ||
|
|
||
| do_configure:append() { |
There was a problem hiding this comment.
the :qcom-distro override is needed here as well
| PACKAGECONFIG[wnm] = ",," | ||
| PACKAGECONFIG[mbo] = ",," | ||
|
|
||
| PACKAGECONFIG:append:qcom-distro = " suiteb wnm mbo" |
There was a problem hiding this comment.
This should also go on the first line then or it should be removed because the backport will bring this line.
There was a problem hiding this comment.
yes, I removed them to recipe-backports, another commit included in this PR. Please have a check, thanks!
| @@ -0,0 +1,20 @@ | |||
| PACKAGECONFIG[suiteb] = ",," | |||
There was a problem hiding this comment.
Please move addition of these PACKAGECONFIG entries to recipes-backports/wpa-supplicant/wpa-suplicant_%.bbappend (separate commit). Drop enablement of these options, they will be handled via a normal backports.
There was a problem hiding this comment.
And it's even worse. You can't just set these entries unconditionally, it breaks layer compatibility checks. So you need to add an anonymous python function, which sets these flags only if qcom-distro is one of enabled overrides.
There was a problem hiding this comment.
yes, I generate another commit on recipe-backports, the commit also in this PR, please have a check, thanks!
… qcom Control suiteb, wnm, and mbo options through PACKAGECONFIG for qcom distro. Signed-off-by: Gaole Zhang <gaole.zhang@oss.qualcomm.com>
…m-distro Enable the suiteb, wnm, and mbo PACKAGECONFIG options for qcom-distro builds to support WPA Suite B, Wireless Network Management, and Multi-Band Operation features. - suiteb: Enable CONFIG_SUITEB and CONFIG_SUITEB192 for WPA-EAP-SUITE-B and WPA-EAP-SUITE-B-192 enterprise modes. - wnm: Enable CONFIG_WNM for IEEE 802.11v Wireless Network Management. - mbo: Enable CONFIG_MBO for Multi-Band Operation extensions used with BSS Transition Management. Signed-off-by: Gaole Zhang <gaole.zhang@oss.qualcomm.com>
| @@ -0,0 +1,14 @@ | |||
| do_configure:append:qcom-distro() { | |||
There was a problem hiding this comment.
Control suiteb, wnm, and mbo options through PACKAGECONFIG for
qcom distro.
Why?
There was a problem hiding this comment.
To avoid affecting other DISTROs, the qcom-distro suffix was added.
| @@ -0,0 +1,9 @@ | |||
| PACKAGECONFIG[suiteb] = ",," | |||
There was a problem hiding this comment.
You have been explicitly asked to drop this.
There was a problem hiding this comment.
But when I remove these:
PACKAGECONFIG[suiteb] = ",,"
PACKAGECONFIG[wnm] = ",,"
PACKAGECONFIG[mbo] = ",,"
from this file, I got QA issue when compile:
ERROR: wpa-supplicant-2.11-r0 do_configure: QA Issue: wpa-supplicant: invalid PACKAGECONFIG(s): mbo suiteb wnm [invalid-packageconfig]
ERROR: wpa-supplicant-2.11-r0 do_configure: Fatal QA errors were found, failing task.
There was a problem hiding this comment.
This still breaks yocto-check-layers. Please test your PRs before submitting.
There was a problem hiding this comment.
Sorry, I didn’t quite catch what you meant. I’m not sure why this change breaks yocto-check-layers. Is there a command I can run to check this?
There was a problem hiding this comment.
yes, please validate your PR with:
ci/kas-container-shell-helper.sh ci/yocto-check-layer.sh
3 participants
Enable the suiteb, wnm and mbo PACKAGECONFIG options for qcom-distro builds to support WPA Suite B, Wireless Network Management and Multi Band Operation features.
CRs-Fixed: 4551534, 4562906