aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2020-02-05 15:31:34 +0100
committerJo-Philipp Wich <jo@mein.io>2020-02-05 15:31:39 +0100
commit5f5ec7660ca26d5637c77f45d88c2e2eb35d3bb1 (patch)
tree39109fd156ad4c4832c2c97ed39e890f504167a3
parentc0c988e179a75d33c82ed0621d954fc0ac2c0c14 (diff)
downloadupstream-5f5ec7660ca26d5637c77f45d88c2e2eb35d3bb1.tar.gz
upstream-5f5ec7660ca26d5637c77f45d88c2e2eb35d3bb1.tar.bz2
upstream-5f5ec7660ca26d5637c77f45d88c2e2eb35d3bb1.zip
Revert "iwinfo: update to latest Git HEAD"
This reverts commit 96424c143dd818b391d9b8da18249eca1d2e6c83. The commit changed libiwinfo's internal ABI which breaks a number of downstream projects, including LuCI and rpcd-mod-iwinfo. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--package/network/utils/iwinfo/Makefile6
-rw-r--r--package/network/utils/iwinfo/patches/000-brcm-hardware.patch9
2 files changed, 12 insertions, 3 deletions
diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile
index 72aca27d6e..c7548dee98 100644
--- a/package/network/utils/iwinfo/Makefile
+++ b/package/network/utils/iwinfo/Makefile
@@ -11,9 +11,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git
-PKG_SOURCE_DATE:=2020-02-04
-PKG_SOURCE_VERSION:=eba5a204f776f49b9948b41e41c03560dbd307c8
-PKG_MIRROR_HASH:=c63de01ce41a4e2621bfdcd75c8ab684af9e9676895d7af008400badd34c9c57
+PKG_SOURCE_DATE:=2020-01-05
+PKG_SOURCE_VERSION:=bf2c1069a7f14d1af1e02c8edd2b7338f0355ac8
+PKG_MIRROR_HASH:=b5f370e087005783e816866eb031952c4b37f8b6c649c1ac1dacfb0b95fd61a7
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
PKG_LICENSE:=GPL-2.0
diff --git a/package/network/utils/iwinfo/patches/000-brcm-hardware.patch b/package/network/utils/iwinfo/patches/000-brcm-hardware.patch
new file mode 100644
index 0000000000..009a6f985c
--- /dev/null
+++ b/package/network/utils/iwinfo/patches/000-brcm-hardware.patch
@@ -0,0 +1,9 @@
+Index: libiwinfo-2020-01-05-bf2c1069/hardware.txt
+===================================================================
+--- libiwinfo-2020-01-05-bf2c1069.orig/hardware.txt
++++ libiwinfo-2020-01-05-bf2c1069/hardware.txt
+@@ -180,3 +180,4 @@
+ 0x14c3 0x7650 0x14c3 0x7650 0 0 "MediaTek" "MT7610E"
+ 0x14c3 0x7662 0x14c3 0x7662 0 0 "MediaTek" "MT76x2E"
+ 0x1ae9 0x0310 0x1ae9 0x0000 0 0 "Wilocity" "Wil6210"
++0x14e4 0xaa52 0x14e4 0xaa52 0 0 "Broadcom" "BRCM43602"