On 2020/05/18 21:30, Stefan Sperling wrote: > On Mon, May 18, 2020 at 08:41:27PM +0200, Klemens Nanni wrote: > > We're "after 6.7". > > > > OK? > > Looks OK to me. Please check with Stuart, too.
OK > > Index: Makefile > > =================================================================== > > RCS file: /cvs/ports/sysutils/firmware/iwm/Makefile,v > > retrieving revision 1.13 > > diff -u -p -r1.13 Makefile > > --- Makefile 18 Nov 2019 11:36:56 -0000 1.13 > > +++ Makefile 18 May 2020 18:40:04 -0000 > > @@ -2,21 +2,12 @@ > > > > FW_DRIVER= iwm > > FW_VER= 20191022 > > -REVISION= 0 > > +REVISION= 1 > > DISTNAME= linux-firmware-${FW_VER} > > EXTRACT_SUFX= .tar.xz > > > > HOMEPAGE= https://wireless.wiki.kernel.org/en/users/Drivers/iwlwifi > > MASTER_SITES= https://cdn.kernel.org/pub/linux/kernel/firmware/ > > - > > -# old ones for people bisecting kernels, remove after 6.7 > > -FW+= 3160 16 \ > > - 7260 16 \ > > - 7265 16 \ > > - 7265D 16 \ > > - 8000C 16 \ > > - 3168 22 \ > > - 8265 22 > > > > FW+= 3160 17 \ > > 7260 17 \ > > Index: pkg/PLIST > > =================================================================== > > RCS file: /cvs/ports/sysutils/firmware/iwm/pkg/PLIST,v > > retrieving revision 1.9 > > diff -u -p -r1.9 PLIST > > --- pkg/PLIST 18 Nov 2019 11:36:56 -0000 1.9 > > +++ pkg/PLIST 18 May 2020 18:39:58 -0000 > > @@ -1,17 +1,10 @@ > > @comment $OpenBSD: PLIST,v 1.9 2019/11/18 11:36:56 sthen Exp $ > > -firmware/iwm-3160-16 > > firmware/iwm-3160-17 > > -firmware/iwm-3168-22 > > firmware/iwm-3168-29 > > -firmware/iwm-7260-16 > > firmware/iwm-7260-17 > > -firmware/iwm-7265-16 > > firmware/iwm-7265-17 > > -firmware/iwm-7265D-16 > > firmware/iwm-7265D-29 > > -firmware/iwm-8000C-16 > > firmware/iwm-8000C-34 > > -firmware/iwm-8265-22 > > firmware/iwm-8265-34 > > firmware/iwm-9000-34 > > firmware/iwm-9260-34 > > > > >