Module Name: src
Committed By: mrg
Date: Wed May 30 20:54:08 UTC 2018
Modified Files:
src/external/atheros/athn: Makefile
src/external/atheros/otus: Makefile
src/external/broadcom/bcm43xx: Makefile
src/external/broadcom/bwfm: Makefile
src/external/intel-fw-eula/ipw2100: Makefile
src/external/intel-fw-eula/ipw2200: Makefile
src/external/intel-fw-public/ipw3945: Makefile
src/external/intel-fw-public/iwl100: Makefile
src/external/intel-fw-public/iwl1000: Makefile
src/external/intel-fw-public/iwl105: Makefile
src/external/intel-fw-public/iwl135: Makefile
src/external/intel-fw-public/iwl2000: Makefile
src/external/intel-fw-public/iwl2030: Makefile
src/external/intel-fw-public/iwl3160: Makefile
src/external/intel-fw-public/iwl3168: Makefile
src/external/intel-fw-public/iwl4965: Makefile
src/external/intel-fw-public/iwl5000: Makefile
src/external/intel-fw-public/iwl5150: Makefile
src/external/intel-fw-public/iwl6000: Makefile
src/external/intel-fw-public/iwl6005: Makefile
src/external/intel-fw-public/iwl6030: Makefile
src/external/intel-fw-public/iwl6050: Makefile
src/external/intel-fw-public/iwl7260: Makefile
src/external/intel-fw-public/iwl7265: Makefile
src/external/intel-fw-public/iwl8000: Makefile
src/external/intel-fw-public/iwl8265: Makefile
src/external/nvidia-firmware/tegra/tegra124: Makefile
src/external/nvidia-firmware/tegra/tegra210: Makefile
src/external/realtek/rtwn: Makefile
src/external/realtek/urtwn: Makefile
Log Message:
use FIRMWAREDIR instead of hard coded /libdata/firmware.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/atheros/athn/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/atheros/otus/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/broadcom/bcm43xx/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/broadcom/bwfm/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-eula/ipw2100/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-eula/ipw2200/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/intel-fw-public/ipw3945/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/iwl100/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/iwl1000/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/iwl105/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/iwl135/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/iwl2000/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/iwl2030/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/intel-fw-public/iwl3160/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/iwl3168/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/intel-fw-public/iwl4965/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/intel-fw-public/iwl5000/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/iwl5150/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/iwl6000/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/iwl6005/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/iwl6030/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/iwl6050/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/intel-fw-public/iwl7260/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/intel-fw-public/iwl7265/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/intel-fw-public/iwl8000/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/iwl8265/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/nvidia-firmware/tegra/tegra124/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/nvidia-firmware/tegra/tegra210/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/realtek/rtwn/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/realtek/urtwn/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/atheros/athn/Makefile
diff -u src/external/atheros/athn/Makefile:1.1 src/external/atheros/athn/Makefile:1.2
--- src/external/atheros/athn/Makefile:1.1 Sat Mar 30 02:47:56 2013
+++ src/external/atheros/athn/Makefile Wed May 30 20:54:06 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2013/03/30 02:47:56 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:06 mrg Exp $
NOMAN= # define
FILES= dist/athn-ar7010 dist/athn-ar7010-11 dist/athn-ar9271 dist/athn-license
-FILESDIR= /libdata/firmware/if_athn
+FILESDIR= ${FIRMWAREDIR}/if_athn
.include <bsd.files.mk>
Index: src/external/atheros/otus/Makefile
diff -u src/external/atheros/otus/Makefile:1.1 src/external/atheros/otus/Makefile:1.2
--- src/external/atheros/otus/Makefile:1.1 Wed Nov 3 18:52:45 2010
+++ src/external/atheros/otus/Makefile Wed May 30 20:54:06 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2010/11/03 18:52:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:06 mrg Exp $
NOMAN= # define
FILES= dist/otus-init dist/otus-license dist/otus-main
-FILESDIR= /libdata/firmware/if_otus
+FILESDIR= ${FIRMWAREDIR}/if_otus
.include <bsd.files.mk>
Index: src/external/broadcom/bcm43xx/Makefile
diff -u src/external/broadcom/bcm43xx/Makefile:1.2 src/external/broadcom/bcm43xx/Makefile:1.3
--- src/external/broadcom/bcm43xx/Makefile:1.2 Thu Aug 10 19:42:53 2017
+++ src/external/broadcom/bcm43xx/Makefile Wed May 30 20:54:08 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2017/08/10 19:42:53 jakllsch Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/30 20:54:08 mrg Exp $
NOMAN= # define
FILES= LICENCE.broadcom_bcm43xx BCM43430A1.hcd
-FILESDIR= /usr/libdata/firmware/bcm43xx
+FILESDIR= /usr${FIRMWAREDIR}/bcm43xx
.include <bsd.files.mk>
Index: src/external/broadcom/bwfm/Makefile
diff -u src/external/broadcom/bwfm/Makefile:1.2 src/external/broadcom/bwfm/Makefile:1.3
--- src/external/broadcom/bwfm/Makefile:1.2 Fri May 11 07:43:42 2018
+++ src/external/broadcom/bwfm/Makefile Wed May 30 20:54:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/05/11 07:43:42 maya Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/30 20:54:08 mrg Exp $
NOMAN= # define
@@ -11,6 +11,6 @@ FILES+= dist/brcmfmac4350-pcie.bin
FILES+= dist/brcmfmac4350c2-pcie.bin
FILES+= dist/brcmfmac43602-pcie.bin
-FILESDIR= /libdata/firmware/if_bwfm
+FILESDIR= ${FIRMWAREDIR}/if_bwfm
.include <bsd.files.mk>
Index: src/external/intel-fw-eula/ipw2100/Makefile
diff -u src/external/intel-fw-eula/ipw2100/Makefile:1.1 src/external/intel-fw-eula/ipw2100/Makefile:1.2
--- src/external/intel-fw-eula/ipw2100/Makefile:1.1 Thu Oct 30 00:27:31 2008
+++ src/external/intel-fw-eula/ipw2100/Makefile Wed May 30 20:54:06 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2008/10/30 00:27:31 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:06 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE dist/ipw2100-1.2-i.fw dist/ipw2100-1.2-p.fw \
dist/ipw2100-1.2.fw
-FILESDIR= /libdata/firmware/if_ipw
+FILESDIR= ${FIRMWAREDIR}/if_ipw
.include <bsd.files.mk>
Index: src/external/intel-fw-eula/ipw2200/Makefile
diff -u src/external/intel-fw-eula/ipw2200/Makefile:1.1 src/external/intel-fw-eula/ipw2200/Makefile:1.2
--- src/external/intel-fw-eula/ipw2200/Makefile:1.1 Thu Oct 30 00:27:32 2008
+++ src/external/intel-fw-eula/ipw2200/Makefile Wed May 30 20:54:06 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2008/10/30 00:27:32 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:06 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.ipw2200-fw dist/ipw2200-bss.fw dist/ipw2200-ibss.fw \
dist/ipw2200-sniffer.fw
-FILESDIR= /libdata/firmware/if_iwi
+FILESDIR= ${FIRMWAREDIR}/if_iwi
.include <bsd.files.mk>
Index: src/external/intel-fw-public/ipw3945/Makefile
diff -u src/external/intel-fw-public/ipw3945/Makefile:1.2 src/external/intel-fw-public/ipw3945/Makefile:1.3
--- src/external/intel-fw-public/ipw3945/Makefile:1.2 Fri Nov 7 15:18:24 2008
+++ src/external/intel-fw-public/ipw3945/Makefile Wed May 30 20:54:06 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/11/07 15:18:24 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/30 20:54:06 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-3945-ucode dist/README.iwlwifi-3945-ucode dist/iwlwifi-3945.ucode
-FILESDIR= /libdata/firmware/if_wpi
+FILESDIR= ${FIRMWAREDIR}/if_wpi
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl100/Makefile
diff -u src/external/intel-fw-public/iwl100/Makefile:1.1 src/external/intel-fw-public/iwl100/Makefile:1.2
--- src/external/intel-fw-public/iwl100/Makefile:1.1 Thu Oct 30 13:05:58 2014
+++ src/external/intel-fw-public/iwl100/Makefile Wed May 30 20:54:07 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2014/10/30 13:05:58 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:07 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-100-ucode dist/README.iwlwifi-100-ucode \
dist/iwlwifi-100-5.ucode
-FILESDIR= /libdata/firmware/if_iwn
+FILESDIR= ${FIRMWAREDIR}/if_iwn
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl1000/Makefile
diff -u src/external/intel-fw-public/iwl1000/Makefile:1.1 src/external/intel-fw-public/iwl1000/Makefile:1.2
--- src/external/intel-fw-public/iwl1000/Makefile:1.1 Thu Jul 1 17:25:27 2010
+++ src/external/intel-fw-public/iwl1000/Makefile Wed May 30 20:54:06 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2010/07/01 17:25:27 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:06 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-1000-ucode dist/README.iwlwifi-1000-ucode \
dist/iwlwifi-1000-3.ucode
-FILESDIR= /libdata/firmware/if_iwn
+FILESDIR= ${FIRMWAREDIR}/if_iwn
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl105/Makefile
diff -u src/external/intel-fw-public/iwl105/Makefile:1.1 src/external/intel-fw-public/iwl105/Makefile:1.2
--- src/external/intel-fw-public/iwl105/Makefile:1.1 Thu Oct 30 13:05:58 2014
+++ src/external/intel-fw-public/iwl105/Makefile Wed May 30 20:54:07 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2014/10/30 13:05:58 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:07 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-105-ucode dist/README.iwlwifi-105-ucode \
dist/iwlwifi-105-6.ucode
-FILESDIR= /libdata/firmware/if_iwn
+FILESDIR= ${FIRMWAREDIR}/if_iwn
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl135/Makefile
diff -u src/external/intel-fw-public/iwl135/Makefile:1.1 src/external/intel-fw-public/iwl135/Makefile:1.2
--- src/external/intel-fw-public/iwl135/Makefile:1.1 Thu Oct 30 13:05:58 2014
+++ src/external/intel-fw-public/iwl135/Makefile Wed May 30 20:54:07 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2014/10/30 13:05:58 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:07 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-135-ucode dist/README.iwlwifi-135-ucode \
dist/iwlwifi-135-6.ucode
-FILESDIR= /libdata/firmware/if_iwn
+FILESDIR= ${FIRMWAREDIR}/if_iwn
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl2000/Makefile
diff -u src/external/intel-fw-public/iwl2000/Makefile:1.1 src/external/intel-fw-public/iwl2000/Makefile:1.2
--- src/external/intel-fw-public/iwl2000/Makefile:1.1 Thu Oct 30 13:05:59 2014
+++ src/external/intel-fw-public/iwl2000/Makefile Wed May 30 20:54:07 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2014/10/30 13:05:59 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:07 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-2000-ucode dist/README.iwlwifi-2000-ucode \
dist/iwlwifi-2000-6.ucode
-FILESDIR= /libdata/firmware/if_iwn
+FILESDIR= ${FIRMWAREDIR}/if_iwn
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl2030/Makefile
diff -u src/external/intel-fw-public/iwl2030/Makefile:1.1 src/external/intel-fw-public/iwl2030/Makefile:1.2
--- src/external/intel-fw-public/iwl2030/Makefile:1.1 Thu Oct 30 13:05:59 2014
+++ src/external/intel-fw-public/iwl2030/Makefile Wed May 30 20:54:07 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2014/10/30 13:05:59 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:07 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-2030-ucode dist/README.iwlwifi-2030-ucode \
dist/iwlwifi-2030-6.ucode
-FILESDIR= /libdata/firmware/if_iwn
+FILESDIR= ${FIRMWAREDIR}/if_iwn
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl3160/Makefile
diff -u src/external/intel-fw-public/iwl3160/Makefile:1.4 src/external/intel-fw-public/iwl3160/Makefile:1.5
--- src/external/intel-fw-public/iwl3160/Makefile:1.4 Tue Mar 14 23:59:25 2017
+++ src/external/intel-fw-public/iwl3160/Makefile Wed May 30 20:54:07 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2017/03/14 23:59:25 nonaka Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/30 20:54:07 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-3160-ucode dist/README.iwlwifi-3160-ucode \
dist/iwlwifi-3160-17.ucode
-FILESDIR= /libdata/firmware/if_iwm
+FILESDIR= ${FIRMWAREDIR}/if_iwm
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl3168/Makefile
diff -u src/external/intel-fw-public/iwl3168/Makefile:1.1 src/external/intel-fw-public/iwl3168/Makefile:1.2
--- src/external/intel-fw-public/iwl3168/Makefile:1.1 Tue Mar 14 23:59:25 2017
+++ src/external/intel-fw-public/iwl3168/Makefile Wed May 30 20:54:07 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2017/03/14 23:59:25 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:07 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-3168-ucode dist/README.iwlwifi-3168-ucode \
dist/iwlwifi-3168-22.ucode
-FILESDIR= /libdata/firmware/if_iwm
+FILESDIR= ${FIRMWAREDIR}/if_iwm
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl4965/Makefile
diff -u src/external/intel-fw-public/iwl4965/Makefile:1.2 src/external/intel-fw-public/iwl4965/Makefile:1.3
--- src/external/intel-fw-public/iwl4965/Makefile:1.2 Fri Apr 16 01:43:08 2010
+++ src/external/intel-fw-public/iwl4965/Makefile Wed May 30 20:54:06 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/04/16 01:43:08 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/30 20:54:06 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-4965-ucode dist/README.iwlwifi-4965-ucode \
dist/iwlwifi-4965-2.ucode
-FILESDIR= /libdata/firmware/if_iwn
+FILESDIR= ${FIRMWAREDIR}/if_iwn
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl5000/Makefile
diff -u src/external/intel-fw-public/iwl5000/Makefile:1.3 src/external/intel-fw-public/iwl5000/Makefile:1.4
--- src/external/intel-fw-public/iwl5000/Makefile:1.3 Fri Apr 16 01:43:08 2010
+++ src/external/intel-fw-public/iwl5000/Makefile Wed May 30 20:54:06 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/04/16 01:43:08 christos Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/30 20:54:06 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-5000-ucode dist/README.iwlwifi-5000-ucode \
dist/iwlwifi-5000-2.ucode
-FILESDIR= /libdata/firmware/if_iwn
+FILESDIR= ${FIRMWAREDIR}/if_iwn
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl5150/Makefile
diff -u src/external/intel-fw-public/iwl5150/Makefile:1.1 src/external/intel-fw-public/iwl5150/Makefile:1.2
--- src/external/intel-fw-public/iwl5150/Makefile:1.1 Fri Apr 16 01:43:08 2010
+++ src/external/intel-fw-public/iwl5150/Makefile Wed May 30 20:54:06 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2010/04/16 01:43:08 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:06 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-5150-ucode dist/README.iwlwifi-5150-ucode \
dist/iwlwifi-5150-2.ucode
-FILESDIR= /libdata/firmware/if_iwn
+FILESDIR= ${FIRMWAREDIR}/if_iwn
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl6000/Makefile
diff -u src/external/intel-fw-public/iwl6000/Makefile:1.1 src/external/intel-fw-public/iwl6000/Makefile:1.2
--- src/external/intel-fw-public/iwl6000/Makefile:1.1 Sat Apr 17 15:55:07 2010
+++ src/external/intel-fw-public/iwl6000/Makefile Wed May 30 20:54:06 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2010/04/17 15:55:07 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:06 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-6000-ucode dist/README.iwlwifi-6000-ucode \
dist/iwlwifi-6000-4.ucode
-FILESDIR= /libdata/firmware/if_iwn
+FILESDIR= ${FIRMWAREDIR}/if_iwn
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl6005/Makefile
diff -u src/external/intel-fw-public/iwl6005/Makefile:1.1 src/external/intel-fw-public/iwl6005/Makefile:1.2
--- src/external/intel-fw-public/iwl6005/Makefile:1.1 Fri May 20 01:59:14 2011
+++ src/external/intel-fw-public/iwl6005/Makefile Wed May 30 20:54:06 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2011/05/20 01:59:14 msaitoh Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:06 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-6000g2a-ucode dist/README.iwlwifi-6000g2a-ucode \
dist/iwlwifi-6000g2a-5.ucode
-FILESDIR= /libdata/firmware/if_iwn
+FILESDIR= ${FIRMWAREDIR}/if_iwn
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl6030/Makefile
diff -u src/external/intel-fw-public/iwl6030/Makefile:1.1 src/external/intel-fw-public/iwl6030/Makefile:1.2
--- src/external/intel-fw-public/iwl6030/Makefile:1.1 Sun Jul 28 11:46:24 2013
+++ src/external/intel-fw-public/iwl6030/Makefile Wed May 30 20:54:07 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2013/07/28 11:46:24 prlw1 Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:07 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-6000g2b-ucode dist/README.iwlwifi-6000g2b-ucode \
dist/iwlwifi-6000g2b-6.ucode
-FILESDIR= /libdata/firmware/if_iwn
+FILESDIR= ${FIRMWAREDIR}/if_iwn
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl6050/Makefile
diff -u src/external/intel-fw-public/iwl6050/Makefile:1.1 src/external/intel-fw-public/iwl6050/Makefile:1.2
--- src/external/intel-fw-public/iwl6050/Makefile:1.1 Fri May 20 01:59:14 2011
+++ src/external/intel-fw-public/iwl6050/Makefile Wed May 30 20:54:06 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2011/05/20 01:59:14 msaitoh Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:06 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-6050-ucode dist/README.iwlwifi-6050-ucode \
dist/iwlwifi-6050-5.ucode
-FILESDIR= /libdata/firmware/if_iwn
+FILESDIR= ${FIRMWAREDIR}/if_iwn
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl7260/Makefile
diff -u src/external/intel-fw-public/iwl7260/Makefile:1.4 src/external/intel-fw-public/iwl7260/Makefile:1.5
--- src/external/intel-fw-public/iwl7260/Makefile:1.4 Tue Mar 14 23:59:25 2017
+++ src/external/intel-fw-public/iwl7260/Makefile Wed May 30 20:54:07 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2017/03/14 23:59:25 nonaka Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/30 20:54:07 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-7260-ucode dist/README.iwlwifi-7260-ucode \
dist/iwlwifi-7260-17.ucode
-FILESDIR= /libdata/firmware/if_iwm
+FILESDIR= ${FIRMWAREDIR}/if_iwm
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl7265/Makefile
diff -u src/external/intel-fw-public/iwl7265/Makefile:1.5 src/external/intel-fw-public/iwl7265/Makefile:1.6
--- src/external/intel-fw-public/iwl7265/Makefile:1.5 Tue Mar 14 23:59:25 2017
+++ src/external/intel-fw-public/iwl7265/Makefile Wed May 30 20:54:07 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2017/03/14 23:59:25 nonaka Exp $
+# $NetBSD: Makefile,v 1.6 2018/05/30 20:54:07 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-7265-ucode dist/README.iwlwifi-7265-ucode \
dist/iwlwifi-7265-17.ucode dist/iwlwifi-7265D-22.ucode
-FILESDIR= /libdata/firmware/if_iwm
+FILESDIR= ${FIRMWAREDIR}/if_iwm
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl8000/Makefile
diff -u src/external/intel-fw-public/iwl8000/Makefile:1.2 src/external/intel-fw-public/iwl8000/Makefile:1.3
--- src/external/intel-fw-public/iwl8000/Makefile:1.2 Tue Mar 14 23:59:26 2017
+++ src/external/intel-fw-public/iwl8000/Makefile Wed May 30 20:54:07 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2017/03/14 23:59:26 nonaka Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/30 20:54:07 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-8000-ucode dist/README.iwlwifi-8000-ucode \
dist/iwlwifi-8000C-22.ucode
-FILESDIR= /libdata/firmware/if_iwm
+FILESDIR= ${FIRMWAREDIR}/if_iwm
.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl8265/Makefile
diff -u src/external/intel-fw-public/iwl8265/Makefile:1.1 src/external/intel-fw-public/iwl8265/Makefile:1.2
--- src/external/intel-fw-public/iwl8265/Makefile:1.1 Tue Mar 14 23:59:26 2017
+++ src/external/intel-fw-public/iwl8265/Makefile Wed May 30 20:54:07 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2017/03/14 23:59:26 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:07 mrg Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-8265-ucode dist/README.iwlwifi-8265-ucode \
dist/iwlwifi-8265-22.ucode
-FILESDIR= /libdata/firmware/if_iwm
+FILESDIR= ${FIRMWAREDIR}/if_iwm
.include <bsd.files.mk>
Index: src/external/nvidia-firmware/tegra/tegra124/Makefile
diff -u src/external/nvidia-firmware/tegra/tegra124/Makefile:1.1 src/external/nvidia-firmware/tegra/tegra124/Makefile:1.2
--- src/external/nvidia-firmware/tegra/tegra124/Makefile:1.1 Sun Jan 7 20:59:25 2018
+++ src/external/nvidia-firmware/tegra/tegra124/Makefile Wed May 30 20:54:08 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2018/01/07 20:59:25 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:08 mrg Exp $
NOMAN= # defined
FILES= ${.CURDIR}/../dist/LICENCE.nvidia ${.CURDIR}/../dist/tegra124/xusb.bin
-FILESDIR= /libdata/firmware/nvidia/tegra124
+FILESDIR= ${FIRMWAREDIR}/nvidia/tegra124
.include <bsd.files.mk>
Index: src/external/nvidia-firmware/tegra/tegra210/Makefile
diff -u src/external/nvidia-firmware/tegra/tegra210/Makefile:1.1 src/external/nvidia-firmware/tegra/tegra210/Makefile:1.2
--- src/external/nvidia-firmware/tegra/tegra210/Makefile:1.1 Sun Jan 7 20:59:25 2018
+++ src/external/nvidia-firmware/tegra/tegra210/Makefile Wed May 30 20:54:08 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2018/01/07 20:59:25 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:08 mrg Exp $
NOMAN= # defined
FILES= ${.CURDIR}/../dist/LICENCE.nvidia ${.CURDIR}/../dist/tegra210/xusb.bin
-FILESDIR= /libdata/firmware/nvidia/tegra210
+FILESDIR= ${FIRMWAREDIR}/nvidia/tegra210
.include <bsd.files.mk>
Index: src/external/realtek/rtwn/Makefile
diff -u src/external/realtek/rtwn/Makefile:1.1 src/external/realtek/rtwn/Makefile:1.2
--- src/external/realtek/rtwn/Makefile:1.1 Thu Aug 27 14:04:07 2015
+++ src/external/realtek/rtwn/Makefile Wed May 30 20:54:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/08/27 14:04:07 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:08 mrg Exp $
NOMAN= # define
@@ -7,6 +7,6 @@ FILES+= dist/rtl8192cfw.bin
FILES+= dist/rtl8192cfwU.bin
FILES+= dist/rtl8192cfwU_B.bin
-FILESDIR= /libdata/firmware/if_rtwn
+FILESDIR= ${FIRMWAREDIR}/if_rtwn
.include <bsd.files.mk>
Index: src/external/realtek/urtwn/Makefile
diff -u src/external/realtek/urtwn/Makefile:1.3 src/external/realtek/urtwn/Makefile:1.4
--- src/external/realtek/urtwn/Makefile:1.3 Wed Oct 12 06:49:40 2016
+++ src/external/realtek/urtwn/Makefile Wed May 30 20:54:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/10/12 06:49:40 nat Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/30 20:54:08 mrg Exp $
NOMAN= # define
@@ -8,6 +8,6 @@ FILES+= dist/rtl8192cfw.bin
FILES+= dist/rtl8192cfwU.bin
FILES+= dist/rtl8192eefw.bin
-FILESDIR= /libdata/firmware/if_urtwn
+FILESDIR= ${FIRMWAREDIR}/if_urtwn
.include <bsd.files.mk>
