Skip to content

Remove duplicate v2.2.x/sof-v2.2/intel-signed/sof-*.ldc dict files - #92

Merged
keqiaozhang merged 1 commit into
thesofproject:mainfrom
marc-hb:remove-dup-2.2-ldc
Sep 9, 2022
Merged

keqiaozhang merged 1 commit into
thesofproject:mainfrom
marc-hb:remove-dup-2.2-ldc

Conversation

@marc-hb

@marc-hb marc-hb commented Sep 8, 2022

Copy link
Copy Markdown
Collaborator

Fixes commit 512d219 ("add v2.2 firmware, topology and tools binaries"). The HOWTO-new-release.md provides slow and careful, step by step instructions including the following text; however it looks like the v2.2 commit was a bit rushed.

If the intel-signed/*.ri files came with some corresponding *.ldc
dictionary files, do not add the corresponding *.ldc files to the
release because they should be exact duplicates of the community
*.ldc files.

The following checksums proves that these files are duplicates:

$ sof-bin/v2.2.x/sof-v2.2$ shasum *.ldc */*.ldc | sort

05d8a94e7aa31dfed1e5696733f263193f1b44a3  intel-signed/sof-jsl.ldc
05d8a94e7aa31dfed1e5696733f263193f1b44a3  sof-jsl.ldc
344dd3aecfc530556af997ebb440662edb97791b  intel-signed/sof-apl.ldc
344dd3aecfc530556af997ebb440662edb97791b  sof-apl.ldc
344dd3aecfc530556af997ebb440662edb97791b  sof-glk.ldc
6b1fcf9f5cd77fa2051726d9cb3fdd7a668f0cee  sof-bdw.ldc
935d3e85c9ed9e852cd9d06426e9aa5ec72d2b7f  intel-signed/sof-icl.ldc
935d3e85c9ed9e852cd9d06426e9aa5ec72d2b7f  sof-icl.ldc
af73bd7ec4860583383deb6c8196c2a2018e7bf2  intel-signed/sof-cnl.ldc
af73bd7ec4860583383deb6c8196c2a2018e7bf2  sof-cfl.ldc
af73bd7ec4860583383deb6c8196c2a2018e7bf2  sof-cml.ldc
af73bd7ec4860583383deb6c8196c2a2018e7bf2  sof-cnl.ldc
bab02299351aea1919259becc8874afdf5955517  intel-signed/sof-adl.ldc
bab02299351aea1919259becc8874afdf5955517  intel-signed/sof-adl-s.ldc
bab02299351aea1919259becc8874afdf5955517  intel-signed/sof-ehl.ldc
bab02299351aea1919259becc8874afdf5955517  intel-signed/sof-tgl-h.ldc
bab02299351aea1919259becc8874afdf5955517  intel-signed/sof-tgl.ldc
bab02299351aea1919259becc8874afdf5955517  sof-adl.ldc
bab02299351aea1919259becc8874afdf5955517  sof-adl-s.ldc
bab02299351aea1919259becc8874afdf5955517  sof-ehl.ldc
bab02299351aea1919259becc8874afdf5955517  sof-tgl-h.ldc
bab02299351aea1919259becc8874afdf5955517  sof-tgl.ldc
e0207abdfc4751729c4ed27da5849c4016bbba14  sof-byt.ldc
e0207abdfc4751729c4ed27da5849c4016bbba14  sof-cht.ldc

Signed-off-by: Marc Herbert marc.herbert@intel.com

Fixes commit 512d219 ("add v2.2 firmware, topology and tools
binaries"). The HOWTO-new-release.md provides slow and careful, step by
step instructions including the following text; however it looks like
the v2.2 commit was a bit rushed.

  If the `intel-signed/*.ri` files came with some corresponding `*.ldc`
  dictionary files, do not add the corresponding `*.ldc` files to the
  release because they should be exact duplicates of the community
  `*.ldc` files.

The following checksums proves that these files are duplicates:

```
$ sof-bin/v2.2.x/sof-v2.2$ shasum *.ldc */*.ldc | sort

05d8a94e7aa31dfed1e5696733f263193f1b44a3  intel-signed/sof-jsl.ldc
05d8a94e7aa31dfed1e5696733f263193f1b44a3  sof-jsl.ldc
344dd3aecfc530556af997ebb440662edb97791b  intel-signed/sof-apl.ldc
344dd3aecfc530556af997ebb440662edb97791b  sof-apl.ldc
344dd3aecfc530556af997ebb440662edb97791b  sof-glk.ldc
6b1fcf9f5cd77fa2051726d9cb3fdd7a668f0cee  sof-bdw.ldc
935d3e85c9ed9e852cd9d06426e9aa5ec72d2b7f  intel-signed/sof-icl.ldc
935d3e85c9ed9e852cd9d06426e9aa5ec72d2b7f  sof-icl.ldc
af73bd7ec4860583383deb6c8196c2a2018e7bf2  intel-signed/sof-cnl.ldc
af73bd7ec4860583383deb6c8196c2a2018e7bf2  sof-cfl.ldc
af73bd7ec4860583383deb6c8196c2a2018e7bf2  sof-cml.ldc
af73bd7ec4860583383deb6c8196c2a2018e7bf2  sof-cnl.ldc
bab02299351aea1919259becc8874afdf5955517  intel-signed/sof-adl.ldc
bab02299351aea1919259becc8874afdf5955517  intel-signed/sof-adl-s.ldc
bab02299351aea1919259becc8874afdf5955517  intel-signed/sof-ehl.ldc
bab02299351aea1919259becc8874afdf5955517  intel-signed/sof-tgl-h.ldc
bab02299351aea1919259becc8874afdf5955517  intel-signed/sof-tgl.ldc
bab02299351aea1919259becc8874afdf5955517  sof-adl.ldc
bab02299351aea1919259becc8874afdf5955517  sof-adl-s.ldc
bab02299351aea1919259becc8874afdf5955517  sof-ehl.ldc
bab02299351aea1919259becc8874afdf5955517  sof-tgl-h.ldc
bab02299351aea1919259becc8874afdf5955517  sof-tgl.ldc
e0207abdfc4751729c4ed27da5849c4016bbba14  sof-byt.ldc
e0207abdfc4751729c4ed27da5849c4016bbba14  sof-cht.ldc
```

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb
marc-hb marked this pull request as ready for review September 8, 2022 16:59
@mengdonglin

Copy link
Copy Markdown
Contributor

@marc-hb Thank you! LGTM. Can you please add Keqiao and me to reviewers?

@keqiaozhang FYI. Can you please give a look? I think this is helpful for v2.2.2

@keqiaozhang keqiaozhang left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. I will keep it in mind in the next release.

@keqiaozhang
keqiaozhang merged commit 9820474 into thesofproject:main Sep 9, 2022
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.

3 participants