| Message ID | 20220221163754.150011-3-Jerome.Pouiller@silabs.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | linux-firmware: update wfx | expand |
On 21/02/2022 16:37, Jerome Pouiller wrote: > From: Jérôme Pouiller <jerome.pouiller@silabs.com> <snip> > diff --git a/WHENCE b/WHENCE > index 0a6cb15..96f67f7 100644 > --- a/WHENCE > +++ b/WHENCE > @@ -5845,8 +5845,18 @@ Driver: wfx - Silicon Labs Wi-Fi Transceiver > File: wfx/wfm_wf200_C0.sec > Version: 3.12.1 > > +File: wfx/brd4001a.pds not listed in WHENCE > +File: wfx/brd8022a.pds not listed in WHENCE > +File: wfx/brd8023a.pds not listed in WHENCE This format does not appear to be correct. While this will seemingly pass the `check_whence.py` check, it will be completely ignored by `copy-firmware.sh`, as that takes the full line after 'File: ' (e.g. 'wfx/brd4001a.pds not listed in WHENCE', which of course does not exist). I'm assuming the trailing ' not listed in WHENCE' needs to be removed from each of these lines. Otherwise these are likely not being picked up by distros (they are missing from Arch, for example). This may have been the intention, but that seems odd (and unclear if so). Regards, Ben
On Thursday 7 July 2022 19:40:27 CEST Josh Boyer wrote: > On Thu, Jul 7, 2022 at 1:04 PM Ben Brown <ben@demerara.io> wrote: > > On 21/02/2022 16:37, Jerome Pouiller wrote: > > > From: Jérôme Pouiller <jerome.pouiller@silabs.com> > > <snip> > > > diff --git a/WHENCE b/WHENCE > > > index 0a6cb15..96f67f7 100644 > > > --- a/WHENCE > > > +++ b/WHENCE > > > @@ -5845,8 +5845,18 @@ Driver: wfx - Silicon Labs Wi-Fi Transceiver > > > File: wfx/wfm_wf200_C0.sec > > > Version: 3.12.1 > > > > > > +File: wfx/brd4001a.pds not listed in WHENCE > > > +File: wfx/brd8022a.pds not listed in WHENCE > > > +File: wfx/brd8023a.pds not listed in WHENCE > > > > This format does not appear to be correct. While this will seemingly > > pass the `check_whence.py` check, it will be completely ignored by > > `copy-firmware.sh`, as that takes the full line after 'File: ' (e.g. > > 'wfx/brd4001a.pds not listed in WHENCE', which of course does not exist). > > Oh, indeed. > > > I'm assuming the trailing ' not listed in WHENCE' needs to be removed > > from each of these lines. Otherwise these are likely not being picked up > > by distros (they are missing from Arch, for example). This may have been > > the intention, but that seems odd (and unclear if so). > > I doubt that was the intention. I'll correct WHENCE in a separate > commit. Thank you for reporting the issue. It seems I had copy-pasted the output of check_whence.py. I was probably not very awake. Sorry for the disturb. Do you think the change below could be useful? ---------8<-------------8<---------------- diff --git i/check_whence.py w/check_whence.py index 8805e99..8244288 100755 --- i/check_whence.py +++ w/check_whence.py @@ -6,11 +6,11 @@ def list_whence(): with open('WHENCE', encoding='utf-8') as whence: for line in whence: - match = re.match(r'(?:File|Source):\s*"(.*)"', line) + match = re.match(r'(?:File|Source):\s*"(.*)"\s*$', line) if match: yield match.group(1) continue - match = re.match(r'(?:File|Source):\s*(\S*)', line) + match = re.match(r'(?:File|Source):\s*(\S*)\s*$', line) if match: yield match.group(1) continue
diff --git a/WHENCE b/WHENCE index 0a6cb15..96f67f7 100644 --- a/WHENCE +++ b/WHENCE @@ -5845,8 +5845,18 @@ Driver: wfx - Silicon Labs Wi-Fi Transceiver File: wfx/wfm_wf200_C0.sec Version: 3.12.1 +File: wfx/brd4001a.pds not listed in WHENCE +File: wfx/brd8022a.pds not listed in WHENCE +File: wfx/brd8023a.pds not listed in WHENCE + Licence: Redistributable. See wfx/LICENCE.wf200 for details. -Originates from https://github.com/SiliconLabs/wfx-firmware + +The firmware itself originates from https://github.com/SiliconLabs/wfx-firmware + +The *.pds files come from https://github.com/SiliconLabs/wfx-pds + +They have been processed with the tool "pds_compress" available on +https://github.com/SiliconLabs/wfx-linux-tools -------------------------------------------------------------------------- diff --git a/wfx/brd4001a.pds b/wfx/brd4001a.pds new file mode 100644 index 0000000000000000000000000000000000000000..9765d132c28bdd1c3c78cdd6a876a04818a3e25f GIT binary patch literal 625 zcmZwENe+TQ5Cu>?g7>HeIFQ(h3nph1_Jjo>&Ypn$yLmK!H^hZjfDj(lm9F1;I`+EC z@SaI+0w7PLQCC|S%$LUaa^lmP2rN=O28$F=z=evZU^B%t$XW9h<f8c+a@BkTxoN(I z+%?}p9-8kV&tDI?^#kOk`4Kk2rPsMM?0`dH;Sf-0!yH1Pxe)kvLx*lLkAqq>?xsJE zx7TsTmQb0w&;0wtXiUNW0ly1hzE=sMPE;+XvMAL*k*cw(MIx!*CHt!{Z5kZNW$v~P Fd;t0Utj7QV literal 0 HcmV?d00001 diff --git a/wfx/brd8022a.pds b/wfx/brd8022a.pds new file mode 100644 index 0000000000000000000000000000000000000000..737286f323615c1d07ec1a972fc97908a21fb6bf GIT binary patch literal 584 zcmZvZIS#@w5JgRkM8O$orw9ZhVTl5gup_09Qn2qQu>RdR8s8?OfKja2c{5|pycAi> zxUJ>t14Y(sxSe%-zalx<UMfeMf+wFKJHk&OBG15=!gI(;<5S34<1@%b<8#PW;|s`5 z<4ee0<15JHmv`Cv8uHZm2HwQTcn!4~PR?TjPVaXwp_W1xBybNyC!x4wT%b&jS)1gn zNa&>&=<k0S$ElAry0wESL=Hi3$)Ya5%SgUY1tIOJw2Wm~sgbctCn_yd$@E+Dzx>Mg M-!?A%h0r?i21vxA{r~^~ literal 0 HcmV?d00001 diff --git a/wfx/brd8023a.pds b/wfx/brd8023a.pds new file mode 100644 index 0000000000000000000000000000000000000000..9765d132c28bdd1c3c78cdd6a876a04818a3e25f