From: Thierry Reding Date: Mon, 30 Sep 2019 11:17:04 +0000 (+0200) Subject: Remove duplicate symlinks X-Git-Tag: 20191215~37 X-Git-Url: https://git.proxmox.com/?p=mirror_linux-firmware.git;a=commitdiff_plain;h=9cfefbd7fbdaa5ae769e3061c463f8345d146fb7 Remove duplicate symlinks Now that the copy-firmware.sh script can create symlinks from the Link: entries in the WHENCE file on the fly, remove the duplicate symlinks from the filesystem. One odd entry was intel/dsp_fw_cnl.bin which was listed both as symlink and as a regular file. Both entries can be removed since the it's really a symlink, so it will be recreated at installation time. While at it, update the check_whence.py script to not look for the existence of symlinks in the filesystem because they are created on the fly at installation time by the copy_firmware.sh script. Signed-off-by: Thierry Reding Signed-off-by: Josh Boyer --- diff --git a/WHENCE b/WHENCE index c1726355..88620a8e 100644 --- a/WHENCE +++ b/WHENCE @@ -3678,7 +3678,6 @@ File: intel/dsp_fw_cnl_v1191.bin Version: 10.00.00.1191 File: intel/dsp_fw_cnl_v1858.bin Version: 10.23.00.1858 -File: intel/dsp_fw_cnl.bin Link: intel/dsp_fw_cnl.bin -> dsp_fw_cnl_v1858.bin License: Redistributable. See LICENCE.adsp_sst for details diff --git a/a300_pfp.fw b/a300_pfp.fw deleted file mode 120000 index c1f0c373..00000000 --- a/a300_pfp.fw +++ /dev/null @@ -1 +0,0 @@ -qcom/a300_pfp.fw \ No newline at end of file diff --git a/a300_pm4.fw b/a300_pm4.fw deleted file mode 120000 index 54e2627e..00000000 --- a/a300_pm4.fw +++ /dev/null @@ -1 +0,0 @@ -qcom/a300_pm4.fw \ No newline at end of file diff --git a/check_whence.py b/check_whence.py index 523692c5..4adbfc30 100755 --- a/check_whence.py +++ b/check_whence.py @@ -5,11 +5,11 @@ import os, re, sys def list_whence(): with open('WHENCE') as whence: for line in whence: - match = re.match(r'(?:File|Link|Source):\s*"(.*)"', line) + match = re.match(r'(?:File|Source):\s*"(.*)"', line) if match: yield match.group(1) continue - match = re.match(r'(?:File|Link|Source):\s*(\S*)', line) + match = re.match(r'(?:File|Source):\s*(\S*)', line) if match: yield match.group(1) continue diff --git a/cxgb4/t4-config.txt b/cxgb4/t4-config.txt deleted file mode 120000 index 9f014190..00000000 --- a/cxgb4/t4-config.txt +++ /dev/null @@ -1 +0,0 @@ -configs/t4-config-default.txt \ No newline at end of file diff --git a/cxgb4/t4fw.bin b/cxgb4/t4fw.bin deleted file mode 120000 index 2d7a9d22..00000000 --- a/cxgb4/t4fw.bin +++ /dev/null @@ -1 +0,0 @@ -t4fw-1.24.3.0.bin \ No newline at end of file diff --git a/cxgb4/t5-config.txt b/cxgb4/t5-config.txt deleted file mode 120000 index 8c78ce5a..00000000 --- a/cxgb4/t5-config.txt +++ /dev/null @@ -1 +0,0 @@ -configs/t5-config-default.txt \ No newline at end of file diff --git a/cxgb4/t5fw.bin b/cxgb4/t5fw.bin deleted file mode 120000 index 5bed1d3f..00000000 --- a/cxgb4/t5fw.bin +++ /dev/null @@ -1 +0,0 @@ -t5fw-1.24.3.0.bin \ No newline at end of file diff --git a/cxgb4/t6-config.txt b/cxgb4/t6-config.txt deleted file mode 120000 index 0189c27b..00000000 --- a/cxgb4/t6-config.txt +++ /dev/null @@ -1 +0,0 @@ -configs/t6-config-default.txt \ No newline at end of file diff --git a/cxgb4/t6fw.bin b/cxgb4/t6fw.bin deleted file mode 120000 index d05ce481..00000000 --- a/cxgb4/t6fw.bin +++ /dev/null @@ -1 +0,0 @@ -t6fw-1.24.3.0.bin \ No newline at end of file diff --git a/intel/dsp_fw_bxtn.bin b/intel/dsp_fw_bxtn.bin deleted file mode 120000 index 4855b55b..00000000 --- a/intel/dsp_fw_bxtn.bin +++ /dev/null @@ -1 +0,0 @@ -dsp_fw_bxtn_v3366.bin \ No newline at end of file diff --git a/intel/dsp_fw_cnl.bin b/intel/dsp_fw_cnl.bin deleted file mode 120000 index 94204f9b..00000000 --- a/intel/dsp_fw_cnl.bin +++ /dev/null @@ -1 +0,0 @@ -dsp_fw_cnl_v1858.bin \ No newline at end of file diff --git a/intel/dsp_fw_glk.bin b/intel/dsp_fw_glk.bin deleted file mode 120000 index 0eb9ae01..00000000 --- a/intel/dsp_fw_glk.bin +++ /dev/null @@ -1 +0,0 @@ -dsp_fw_glk_v3366.bin \ No newline at end of file diff --git a/intel/dsp_fw_kbl.bin b/intel/dsp_fw_kbl.bin deleted file mode 120000 index 51a921eb..00000000 --- a/intel/dsp_fw_kbl.bin +++ /dev/null @@ -1 +0,0 @@ -dsp_fw_kbl_v3402.bin \ No newline at end of file diff --git a/intel/dsp_fw_release.bin b/intel/dsp_fw_release.bin deleted file mode 120000 index 21dd15ef..00000000 --- a/intel/dsp_fw_release.bin +++ /dev/null @@ -1 +0,0 @@ -dsp_fw_release_v3402.bin \ No newline at end of file diff --git a/intel/ipu3-fw.bin b/intel/ipu3-fw.bin deleted file mode 120000 index a95fd3ff..00000000 --- a/intel/ipu3-fw.bin +++ /dev/null @@ -1 +0,0 @@ -irci_irci_ecr-master_20161208_0213_20170112_1500.bin \ No newline at end of file diff --git a/libertas/sd8688.bin b/libertas/sd8688.bin deleted file mode 120000 index 46d817f5..00000000 --- a/libertas/sd8688.bin +++ /dev/null @@ -1 +0,0 @@ -../mrvl/sd8688.bin \ No newline at end of file diff --git a/libertas/sd8688_helper.bin b/libertas/sd8688_helper.bin deleted file mode 120000 index 6515a2c5..00000000 --- a/libertas/sd8688_helper.bin +++ /dev/null @@ -1 +0,0 @@ -../mrvl/sd8688_helper.bin \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0058-0011_1x100.nffw b/netronome/flower/nic_AMDA0058-0011_1x100.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0058-0011_1x100.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0058-0011_2x40.nffw b/netronome/flower/nic_AMDA0058-0011_2x40.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0058-0011_2x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0058-0011_4x10_1x40.nffw b/netronome/flower/nic_AMDA0058-0011_4x10_1x40.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0058-0011_4x10_1x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0058-0011_8x10.nffw b/netronome/flower/nic_AMDA0058-0011_8x10.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0058-0011_8x10.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0058-0012_1x100.nffw b/netronome/flower/nic_AMDA0058-0012_1x100.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0058-0012_1x100.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0058-0012_2x40.nffw b/netronome/flower/nic_AMDA0058-0012_2x40.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0058-0012_2x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0058-0012_4x10_1x40.nffw b/netronome/flower/nic_AMDA0058-0012_4x10_1x40.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0058-0012_4x10_1x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0058-0012_8x10.nffw b/netronome/flower/nic_AMDA0058-0012_8x10.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0058-0012_8x10.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0078-0011_1x100.nffw b/netronome/flower/nic_AMDA0078-0011_1x100.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0078-0011_1x100.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0078-0011_2x40.nffw b/netronome/flower/nic_AMDA0078-0011_2x40.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0078-0011_2x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0078-0011_4x10_1x40.nffw b/netronome/flower/nic_AMDA0078-0011_4x10_1x40.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0078-0011_4x10_1x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0078-0011_8x10.nffw b/netronome/flower/nic_AMDA0078-0011_8x10.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0078-0011_8x10.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0078-0012_1x100.nffw b/netronome/flower/nic_AMDA0078-0012_1x100.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0078-0012_1x100.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0078-0012_2x40.nffw b/netronome/flower/nic_AMDA0078-0012_2x40.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0078-0012_2x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0078-0012_4x10_1x40.nffw b/netronome/flower/nic_AMDA0078-0012_4x10_1x40.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0078-0012_4x10_1x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0078-0012_8x10.nffw b/netronome/flower/nic_AMDA0078-0012_8x10.nffw deleted file mode 120000 index 0f2bad2e..00000000 --- a/netronome/flower/nic_AMDA0078-0012_8x10.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0058.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0081-0001_1x40.nffw b/netronome/flower/nic_AMDA0081-0001_1x40.nffw deleted file mode 120000 index 1d78d605..00000000 --- a/netronome/flower/nic_AMDA0081-0001_1x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0081.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0081-0001_4x10.nffw b/netronome/flower/nic_AMDA0081-0001_4x10.nffw deleted file mode 120000 index 1d78d605..00000000 --- a/netronome/flower/nic_AMDA0081-0001_4x10.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0081.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0081.nffw b/netronome/flower/nic_AMDA0081.nffw deleted file mode 120000 index 7850171d..00000000 --- a/netronome/flower/nic_AMDA0081.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0097.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0096-0001_2x10.nffw b/netronome/flower/nic_AMDA0096-0001_2x10.nffw deleted file mode 120000 index 334d828b..00000000 --- a/netronome/flower/nic_AMDA0096-0001_2x10.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0096.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0097-0001_2x40.nffw b/netronome/flower/nic_AMDA0097-0001_2x40.nffw deleted file mode 120000 index 7850171d..00000000 --- a/netronome/flower/nic_AMDA0097-0001_2x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0097.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw b/netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw deleted file mode 120000 index 7850171d..00000000 --- a/netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0097.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0097-0001_8x10.nffw b/netronome/flower/nic_AMDA0097-0001_8x10.nffw deleted file mode 120000 index 7850171d..00000000 --- a/netronome/flower/nic_AMDA0097-0001_8x10.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0097.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0099-0001_1x10_1x25.nffw b/netronome/flower/nic_AMDA0099-0001_1x10_1x25.nffw deleted file mode 120000 index b2cd0803..00000000 --- a/netronome/flower/nic_AMDA0099-0001_1x10_1x25.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0099.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0099-0001_2x10.nffw b/netronome/flower/nic_AMDA0099-0001_2x10.nffw deleted file mode 120000 index b2cd0803..00000000 --- a/netronome/flower/nic_AMDA0099-0001_2x10.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0099.nffw \ No newline at end of file diff --git a/netronome/flower/nic_AMDA0099-0001_2x25.nffw b/netronome/flower/nic_AMDA0099-0001_2x25.nffw deleted file mode 120000 index b2cd0803..00000000 --- a/netronome/flower/nic_AMDA0099-0001_2x25.nffw +++ /dev/null @@ -1 +0,0 @@ -nic_AMDA0099.nffw \ No newline at end of file diff --git a/netronome/nic_AMDA0058-0011_2x40.nffw b/netronome/nic_AMDA0058-0011_2x40.nffw deleted file mode 120000 index 336c76e1..00000000 --- a/netronome/nic_AMDA0058-0011_2x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic/nic_AMDA0058-0011_2x40.nffw \ No newline at end of file diff --git a/netronome/nic_AMDA0058-0012_2x40.nffw b/netronome/nic_AMDA0058-0012_2x40.nffw deleted file mode 120000 index 23a96d3b..00000000 --- a/netronome/nic_AMDA0058-0012_2x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic/nic_AMDA0058-0012_2x40.nffw \ No newline at end of file diff --git a/netronome/nic_AMDA0078-0011_1x100.nffw b/netronome/nic_AMDA0078-0011_1x100.nffw deleted file mode 120000 index d35d450d..00000000 --- a/netronome/nic_AMDA0078-0011_1x100.nffw +++ /dev/null @@ -1 +0,0 @@ -nic/nic_AMDA0078-0011_1x100.nffw \ No newline at end of file diff --git a/netronome/nic_AMDA0081-0001_1x40.nffw b/netronome/nic_AMDA0081-0001_1x40.nffw deleted file mode 120000 index 29f855eb..00000000 --- a/netronome/nic_AMDA0081-0001_1x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic/nic_AMDA0081-0001_1x40.nffw \ No newline at end of file diff --git a/netronome/nic_AMDA0081-0001_4x10.nffw b/netronome/nic_AMDA0081-0001_4x10.nffw deleted file mode 120000 index aac204c8..00000000 --- a/netronome/nic_AMDA0081-0001_4x10.nffw +++ /dev/null @@ -1 +0,0 @@ -nic/nic_AMDA0081-0001_4x10.nffw \ No newline at end of file diff --git a/netronome/nic_AMDA0096-0001_2x10.nffw b/netronome/nic_AMDA0096-0001_2x10.nffw deleted file mode 120000 index 64ace8cd..00000000 --- a/netronome/nic_AMDA0096-0001_2x10.nffw +++ /dev/null @@ -1 +0,0 @@ -nic/nic_AMDA0096-0001_2x10.nffw \ No newline at end of file diff --git a/netronome/nic_AMDA0097-0001_2x40.nffw b/netronome/nic_AMDA0097-0001_2x40.nffw deleted file mode 120000 index 206a46da..00000000 --- a/netronome/nic_AMDA0097-0001_2x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic/nic_AMDA0097-0001_2x40.nffw \ No newline at end of file diff --git a/netronome/nic_AMDA0097-0001_4x10_1x40.nffw b/netronome/nic_AMDA0097-0001_4x10_1x40.nffw deleted file mode 120000 index 29df1eee..00000000 --- a/netronome/nic_AMDA0097-0001_4x10_1x40.nffw +++ /dev/null @@ -1 +0,0 @@ -nic/nic_AMDA0097-0001_4x10_1x40.nffw \ No newline at end of file diff --git a/netronome/nic_AMDA0097-0001_8x10.nffw b/netronome/nic_AMDA0097-0001_8x10.nffw deleted file mode 120000 index 382dcbc1..00000000 --- a/netronome/nic_AMDA0097-0001_8x10.nffw +++ /dev/null @@ -1 +0,0 @@ -nic/nic_AMDA0097-0001_8x10.nffw \ No newline at end of file diff --git a/netronome/nic_AMDA0099-0001_1x10_1x25.nffw b/netronome/nic_AMDA0099-0001_1x10_1x25.nffw deleted file mode 120000 index f52c37de..00000000 --- a/netronome/nic_AMDA0099-0001_1x10_1x25.nffw +++ /dev/null @@ -1 +0,0 @@ -nic/nic_AMDA0099-0001_1x10_1x25.nffw \ No newline at end of file diff --git a/netronome/nic_AMDA0099-0001_2x10.nffw b/netronome/nic_AMDA0099-0001_2x10.nffw deleted file mode 120000 index cbb4b47f..00000000 --- a/netronome/nic_AMDA0099-0001_2x10.nffw +++ /dev/null @@ -1 +0,0 @@ -nic/nic_AMDA0099-0001_2x10.nffw \ No newline at end of file diff --git a/netronome/nic_AMDA0099-0001_2x25.nffw b/netronome/nic_AMDA0099-0001_2x25.nffw deleted file mode 120000 index a1af5a5f..00000000 --- a/netronome/nic_AMDA0099-0001_2x25.nffw +++ /dev/null @@ -1 +0,0 @@ -nic/nic_AMDA0099-0001_2x25.nffw \ No newline at end of file diff --git a/nvidia/tegra124/vic.bin b/nvidia/tegra124/vic.bin deleted file mode 120000 index 968fcd4c..00000000 --- a/nvidia/tegra124/vic.bin +++ /dev/null @@ -1 +0,0 @@ -vic03_ucode.bin \ No newline at end of file diff --git a/nvidia/tegra186/vic.bin b/nvidia/tegra186/vic.bin deleted file mode 120000 index d785732b..00000000 --- a/nvidia/tegra186/vic.bin +++ /dev/null @@ -1 +0,0 @@ -vic04_ucode.bin \ No newline at end of file diff --git a/nvidia/tegra210/vic.bin b/nvidia/tegra210/vic.bin deleted file mode 120000 index d785732b..00000000 --- a/nvidia/tegra210/vic.bin +++ /dev/null @@ -1 +0,0 @@ -vic04_ucode.bin \ No newline at end of file diff --git a/qat_mmp.bin b/qat_mmp.bin deleted file mode 120000 index c7f8851c..00000000 --- a/qat_mmp.bin +++ /dev/null @@ -1 +0,0 @@ -qat_895xcc_mmp.bin \ No newline at end of file diff --git a/rt3070.bin b/rt3070.bin deleted file mode 120000 index d233a1d5..00000000 --- a/rt3070.bin +++ /dev/null @@ -1 +0,0 @@ -rt2870.bin \ No newline at end of file diff --git a/rt3090.bin b/rt3090.bin deleted file mode 120000 index c5a9ab01..00000000 --- a/rt3090.bin +++ /dev/null @@ -1 +0,0 @@ -rt2860.bin \ No newline at end of file diff --git a/s2250.fw b/s2250.fw deleted file mode 120000 index 7db38074..00000000 --- a/s2250.fw +++ /dev/null @@ -1 +0,0 @@ -go7007/s2250-2.fw \ No newline at end of file diff --git a/s2250_loader.fw b/s2250_loader.fw deleted file mode 120000 index b57ac10b..00000000 --- a/s2250_loader.fw +++ /dev/null @@ -1 +0,0 @@ -go7007/s2250-1.fw \ No newline at end of file diff --git a/ti-connectivity/wl1271-nvs.bin b/ti-connectivity/wl1271-nvs.bin deleted file mode 120000 index a30a0760..00000000 --- a/ti-connectivity/wl1271-nvs.bin +++ /dev/null @@ -1 +0,0 @@ -wl127x-nvs.bin \ No newline at end of file diff --git a/ti-connectivity/wl12xx-nvs.bin b/ti-connectivity/wl12xx-nvs.bin deleted file mode 120000 index a30a0760..00000000 --- a/ti-connectivity/wl12xx-nvs.bin +++ /dev/null @@ -1 +0,0 @@ -wl127x-nvs.bin \ No newline at end of file