git: 7aa0e0a09cfa - main - comms/iwmbt-firmware: Update to 20221109
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 23 Dec 2022 22:52:59 UTC
The branch main has been updated by wulf (src committer):
URL: https://cgit.FreeBSD.org/ports/commit/?id=7aa0e0a09cfad876f9a5a1ff70e31c9614e88fb6
commit 7aa0e0a09cfad876f9a5a1ff70e31c9614e88fb6
Author: Vladimir Kondratyev <wulf@FreeBSD.org>
AuthorDate: 2022-12-23 22:52:03 +0000
Commit: Vladimir Kondratyev <wulf@FreeBSD.org>
CommitDate: 2022-12-23 22:52:03 +0000
comms/iwmbt-firmware: Update to 20221109
And downgrade ibt-hw-37.8.10-fw-22.50.19.14.f.bseq to fw_patch_num 36
as last version working good with our BT stack. See PR/267581.
PR: 268022
Approved by: arrowd
---
comms/iwmbt-firmware/Makefile | 20 +++++++++++++++-----
comms/iwmbt-firmware/distinfo | 8 +++++---
comms/iwmbt-firmware/pkg-plist | 2 ++
3 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/comms/iwmbt-firmware/Makefile b/comms/iwmbt-firmware/Makefile
index 64d25fe8e960..05e91cc00ae1 100644
--- a/comms/iwmbt-firmware/Makefile
+++ b/comms/iwmbt-firmware/Makefile
@@ -1,10 +1,12 @@
PORTNAME= iwmbt-firmware
-PORTVERSION= 20210315
-DEB_REVISION= 3
+PORTVERSION= 20221109
+DEB_REVISION= 2
CATEGORIES= comms
-MASTER_SITES= DEBIAN/pool/non-free/f/firmware-nonfree/
-DISTNAME= firmware-iwlwifi_${PORTVERSION}-${DEB_REVISION}_all
-EXTRACT_SUFX= .deb
+MASTER_SITES= DEBIAN/pool/non-free/f/firmware-nonfree/:main \
+ https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/intel/:old
+DISTFILES= ${MAINFW_FILE}:main \
+ ${OLDFW_FILE}${OLDFW_SUFX}:old
+EXTRACT_ONLY= ${MAINFW_FILE}
MAINTAINER= wulf@FreeBSD.org
COMMENT= Intel Wireless 8260 bluetooth adaptor firmwares used by iwmbtfw(8)
@@ -18,12 +20,20 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
NO_BUILD= yes
NO_ARCH= yes
+MAINFW_FILE= firmware-iwlwifi_${PORTVERSION}-${DEB_REVISION}_all.deb
+OLDFW_FILE= ibt-hw-37.8.10-fw-22.50.19.14.f.bseq
+OLDFW_SUFX= ?id=6be4747ea1d731f661c5320acf3f1273a459d6da
+
EXTRACT_CMD= ${AR}
EXTRACT_BEFORE_ARGS= -p
EXTRACT_AFTER_ARGS= data.tar.xz | ${TAR} -xf - ${EXTRACT_FILES}
EXTRACT_FILES= lib/firmware/intel \
usr/share/doc/firmware-iwlwifi/copyright
+# PR/267581: Downgrade ibt-hw-37.8.10-fw-22.50.19.14.f.bseq to fw_patch_num 36
+post-extract:
+ ${CP} ${DISTDIR}/${OLDFW_FILE}${OLDFW_SUFX} ${WRKDIR}/lib/firmware/intel/${OLDFW_FILE}
+
do-install:
cd ${WRKDIR}/lib/firmware/intel && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
diff --git a/comms/iwmbt-firmware/distinfo b/comms/iwmbt-firmware/distinfo
index a5024c09d165..f4a1130c9e01 100644
--- a/comms/iwmbt-firmware/distinfo
+++ b/comms/iwmbt-firmware/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1630838383
-SHA256 (firmware-iwlwifi_20210315-3_all.deb) = b822a5a623037c20e85d865c8d55351b33c809b9157c35a9519aecb95fcdb568
-SIZE (firmware-iwlwifi_20210315-3_all.deb) = 13448168
+TIMESTAMP = 1669462817
+SHA256 (firmware-iwlwifi_20221109-2_all.deb) = 593f01beec59fd4de2f76a907a32798bac4f4658ff5b22624f4eb8528e8c2370
+SIZE (firmware-iwlwifi_20221109-2_all.deb) = 20085936
+SHA256 (ibt-hw-37.8.10-fw-22.50.19.14.f.bseq?id=6be4747ea1d731f661c5320acf3f1273a459d6da) = d1d25082ee30e971454e512e6a07af9c093bb8086f3b56f6afcc22de8e63d59a
+SIZE (ibt-hw-37.8.10-fw-22.50.19.14.f.bseq?id=6be4747ea1d731f661c5320acf3f1273a459d6da) = 47463
diff --git a/comms/iwmbt-firmware/pkg-plist b/comms/iwmbt-firmware/pkg-plist
index 684ec12e813b..18b7bf471cd4 100644
--- a/comms/iwmbt-firmware/pkg-plist
+++ b/comms/iwmbt-firmware/pkg-plist
@@ -1,3 +1,5 @@
+%%DATADIR%%/ibt-0040-0041.ddc
+%%DATADIR%%/ibt-0040-0041.sfi
%%DATADIR%%/ibt-0041-0041.ddc
%%DATADIR%%/ibt-0041-0041.sfi
%%DATADIR%%/ibt-11-5.ddc