From 4a90f64ed843e4c20660c6f8b98d1b0a272f1ea5 Mon Sep 17 00:00:00 2001 From: wangbin Date: Thu, 9 Jan 2020 15:39:17 +0800 Subject: [PATCH 1/3] remove some patches --- ...m-Raspberry-Pi-3A-WiFi-NVRAM-support.patch | 25 -------- ...brcm-Raspberry-Pi-Update-ccode-to-X2.patch | 57 ------------------- linux-firmware.spec | 5 +- 3 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch delete mode 100644 0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch diff --git a/0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch b/0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch deleted file mode 100644 index a3c297a..0000000 --- a/0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 94ee3042ad924d2ef8383dcde511a99660c23732 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Mon, 21 Jan 2019 07:41:41 +0000 -Subject: [PATCH 1/2] brcm: Raspberry Pi 3A+ WiFi NVRAM support - -The Raspberry Pi 3A+ uses the same WiFi module as the 3B+ so we -just symlink the expected NVRAM file to the 3B+ one. - -Signed-off-by: Peter Robinson ---- - brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt | 1 + - 1 file changed, 1 insertion(+) - create mode 120000 brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt - -diff --git a/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt -new file mode 120000 -index 0000000..36b5530 ---- /dev/null -+++ b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt -@@ -0,0 +1 @@ -+brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt -\ No newline at end of file --- -2.20.1 - diff --git a/0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch b/0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch deleted file mode 100644 index 1b31c43..0000000 --- a/0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 46e39557221d5eec381c99b9002f9208f71f7128 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Mon, 21 Jan 2019 08:12:49 +0000 -Subject: [PATCH 2/2] brcm: Raspberry Pi: Update ccode to X2 - -As per the docs [1] the X2 ccode allows the use of channels above -11 if the firmware detects appropriate other traffic on those -channels. The ALL option appears to restrict the use to the US -channel options without passively checking so X2 is overall better. - -Also fix a trailling space in the config while we're at it. - -[1] https://wireless.wiki.kernel.org/en/users/Drivers/brcm80211#regulatory_implementation_for_brcmsmac - -Signed-off-by: Peter Robinson ---- - brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt | 4 ++-- - brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt b/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt -index 732c19b..38a99db 100644 ---- a/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt -+++ b/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt -@@ -15,7 +15,7 @@ btc_params1=0x7530 - btc_params8=0x4e20 - cckbw202gpo=0 - cckpwroffset0=5 --ccode=ALL -+ccode=X2 - # cldo_pwm is not set - deadman_to=0xffffffff - devid=0x43e2 -@@ -39,7 +39,7 @@ papdmode=1 - papdvalidtest=1 - prodid=0x0726 - propbw202gpo=0xdd --spurconfig=0x3 -+spurconfig=0x3 - sromrev=11 - txpwrbckof=6 - vendid=0x14e4 -diff --git a/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt -index ba94f54..8d01fcf 100644 ---- a/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt -+++ b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt -@@ -16,6 +16,7 @@ btc_params8=0x4e20 - cbfilttype=1 - cckPwrIdxCorr=3 - cckTssiDelay=150 -+ccode=X2 - deadman_to=481500000 - devid=0x43ab - dot11agofdmhrbw202gpo=0x4442 --- -2.20.1 - diff --git a/linux-firmware.spec b/linux-firmware.spec index 741e0cb..6c3515d 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -13,8 +13,6 @@ URL: http://www.kernel.org/ BuildArch: noarch Source0: %{name}-%{version}.tar.gz -Patch1: 0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch -Patch2: 0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0 Provides: iwl100-firmware = 39.31.5.1-87 @@ -93,6 +91,9 @@ rm %{buildroot}/%{_lib_path}/{WHENCE,LICENCE.*,LICENSE.*} %{_lib_path}/* %changelog +* Thu Jan 9 2020 wangbin - 20190815-3 +- Remove some patches + * Thu Dec 19 2019 openEuler Buildteam - 20190815-2 - Fix upgrade problem -- Gitee From eba01bbd761b14d34950472bfe020fc1c09e71f8 Mon Sep 17 00:00:00 2001 From: wangbin Date: Thu, 9 Jan 2020 15:39:17 +0800 Subject: [PATCH 2/3] remove some patches --- ...m-Raspberry-Pi-3A-WiFi-NVRAM-support.patch | 25 -------- ...brcm-Raspberry-Pi-Update-ccode-to-X2.patch | 57 ------------------- linux-firmware.spec | 7 ++- 3 files changed, 4 insertions(+), 85 deletions(-) delete mode 100644 0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch delete mode 100644 0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch diff --git a/0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch b/0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch deleted file mode 100644 index a3c297a..0000000 --- a/0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 94ee3042ad924d2ef8383dcde511a99660c23732 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Mon, 21 Jan 2019 07:41:41 +0000 -Subject: [PATCH 1/2] brcm: Raspberry Pi 3A+ WiFi NVRAM support - -The Raspberry Pi 3A+ uses the same WiFi module as the 3B+ so we -just symlink the expected NVRAM file to the 3B+ one. - -Signed-off-by: Peter Robinson ---- - brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt | 1 + - 1 file changed, 1 insertion(+) - create mode 120000 brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt - -diff --git a/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt -new file mode 120000 -index 0000000..36b5530 ---- /dev/null -+++ b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt -@@ -0,0 +1 @@ -+brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt -\ No newline at end of file --- -2.20.1 - diff --git a/0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch b/0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch deleted file mode 100644 index 1b31c43..0000000 --- a/0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 46e39557221d5eec381c99b9002f9208f71f7128 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Mon, 21 Jan 2019 08:12:49 +0000 -Subject: [PATCH 2/2] brcm: Raspberry Pi: Update ccode to X2 - -As per the docs [1] the X2 ccode allows the use of channels above -11 if the firmware detects appropriate other traffic on those -channels. The ALL option appears to restrict the use to the US -channel options without passively checking so X2 is overall better. - -Also fix a trailling space in the config while we're at it. - -[1] https://wireless.wiki.kernel.org/en/users/Drivers/brcm80211#regulatory_implementation_for_brcmsmac - -Signed-off-by: Peter Robinson ---- - brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt | 4 ++-- - brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt b/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt -index 732c19b..38a99db 100644 ---- a/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt -+++ b/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt -@@ -15,7 +15,7 @@ btc_params1=0x7530 - btc_params8=0x4e20 - cckbw202gpo=0 - cckpwroffset0=5 --ccode=ALL -+ccode=X2 - # cldo_pwm is not set - deadman_to=0xffffffff - devid=0x43e2 -@@ -39,7 +39,7 @@ papdmode=1 - papdvalidtest=1 - prodid=0x0726 - propbw202gpo=0xdd --spurconfig=0x3 -+spurconfig=0x3 - sromrev=11 - txpwrbckof=6 - vendid=0x14e4 -diff --git a/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt -index ba94f54..8d01fcf 100644 ---- a/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt -+++ b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt -@@ -16,6 +16,7 @@ btc_params8=0x4e20 - cbfilttype=1 - cckPwrIdxCorr=3 - cckTssiDelay=150 -+ccode=X2 - deadman_to=481500000 - devid=0x43ab - dot11agofdmhrbw202gpo=0x4442 --- -2.20.1 - diff --git a/linux-firmware.spec b/linux-firmware.spec index 741e0cb..2dc4a80 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,6 +1,6 @@ %define _binaries_in_noarch_packages_terminate_build 0 -%global release 2 +%global release 3 %global _lib_path /usr/lib/firmware %global _license_path /usr/share/licenses @@ -13,8 +13,6 @@ URL: http://www.kernel.org/ BuildArch: noarch Source0: %{name}-%{version}.tar.gz -Patch1: 0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch -Patch2: 0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0 Provides: iwl100-firmware = 39.31.5.1-87 @@ -93,6 +91,9 @@ rm %{buildroot}/%{_lib_path}/{WHENCE,LICENCE.*,LICENSE.*} %{_lib_path}/* %changelog +* Thu Jan 9 2020 wangbin - 20190815-3 +- Remove some patches + * Thu Dec 19 2019 openEuler Buildteam - 20190815-2 - Fix upgrade problem -- Gitee From c57131c8612e8f395f5ba441e57cf8868f432452 Mon Sep 17 00:00:00 2001 From: wangbin Date: Fri, 21 Feb 2020 15:44:04 +0800 Subject: [PATCH 3/3] change python script shebang to python3 --- change-python-script-shebang-to-python3.patch | 24 +++++++++++++++++++ linux-firmware.spec | 6 ++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 change-python-script-shebang-to-python3.patch diff --git a/change-python-script-shebang-to-python3.patch b/change-python-script-shebang-to-python3.patch new file mode 100644 index 0000000..c9ec7c2 --- /dev/null +++ b/change-python-script-shebang-to-python3.patch @@ -0,0 +1,24 @@ +From 1dfd5bcbe726900519ee832d784f1e8b749def22 Mon Sep 17 00:00:00 2001 +From: yuxiangyang +Date: Thu, 20 Feb 2020 22:43:37 -0500 +Subject: [PATCH] change firmware python script shebang to python3 + +Signed-off-by: yuxiangyang +--- + check_whence.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/check_whence.py b/check_whence.py +index 662c609..66a2774 100755 +--- a/check_whence.py ++++ b/check_whence.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + import os, re, sys + +-- +1.8.3.1 + + diff --git a/linux-firmware.spec b/linux-firmware.spec index 2dc4a80..6a53377 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,6 +1,6 @@ %define _binaries_in_noarch_packages_terminate_build 0 -%global release 3 +%global release 4 %global _lib_path /usr/lib/firmware %global _license_path /usr/share/licenses @@ -13,6 +13,7 @@ URL: http://www.kernel.org/ BuildArch: noarch Source0: %{name}-%{version}.tar.gz +Patch1: change-python-script-shebang-to-python3.patch Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0 Provides: iwl100-firmware = 39.31.5.1-87 @@ -91,6 +92,9 @@ rm %{buildroot}/%{_lib_path}/{WHENCE,LICENCE.*,LICENSE.*} %{_lib_path}/* %changelog +* Fri Feb 21 2020 wangbin - 20190815-4 +- change python script shebang to python3 + * Thu Jan 9 2020 wangbin - 20190815-3 - Remove some patches -- Gitee