[src/trunk]: src/external use FIRMWAREDIR instead of hard coded /libdata/firm...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/34be5d1fd049
branches:  trunk
changeset: 362193:34be5d1fd049
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed May 30 20:54:06 2018 +0000

description:
use FIRMWAREDIR instead of hard coded /libdata/firmware.

diffstat:

 external/atheros/athn/Makefile                   |  4 ++--
 external/atheros/otus/Makefile                   |  4 ++--
 external/broadcom/bcm43xx/Makefile               |  4 ++--
 external/broadcom/bwfm/Makefile                  |  4 ++--
 external/intel-fw-eula/ipw2100/Makefile          |  4 ++--
 external/intel-fw-eula/ipw2200/Makefile          |  4 ++--
 external/intel-fw-public/ipw3945/Makefile        |  4 ++--
 external/intel-fw-public/iwl100/Makefile         |  4 ++--
 external/intel-fw-public/iwl1000/Makefile        |  4 ++--
 external/intel-fw-public/iwl105/Makefile         |  4 ++--
 external/intel-fw-public/iwl135/Makefile         |  4 ++--
 external/intel-fw-public/iwl2000/Makefile        |  4 ++--
 external/intel-fw-public/iwl2030/Makefile        |  4 ++--
 external/intel-fw-public/iwl3160/Makefile        |  4 ++--
 external/intel-fw-public/iwl3168/Makefile        |  4 ++--
 external/intel-fw-public/iwl4965/Makefile        |  4 ++--
 external/intel-fw-public/iwl5000/Makefile        |  4 ++--
 external/intel-fw-public/iwl5150/Makefile        |  4 ++--
 external/intel-fw-public/iwl6000/Makefile        |  4 ++--
 external/intel-fw-public/iwl6005/Makefile        |  4 ++--
 external/intel-fw-public/iwl6030/Makefile        |  4 ++--
 external/intel-fw-public/iwl6050/Makefile        |  4 ++--
 external/intel-fw-public/iwl7260/Makefile        |  4 ++--
 external/intel-fw-public/iwl7265/Makefile        |  4 ++--
 external/intel-fw-public/iwl8000/Makefile        |  4 ++--
 external/intel-fw-public/iwl8265/Makefile        |  4 ++--
 external/nvidia-firmware/tegra/tegra124/Makefile |  4 ++--
 external/nvidia-firmware/tegra/tegra210/Makefile |  4 ++--
 external/realtek/rtwn/Makefile                   |  4 ++--
 external/realtek/urtwn/Makefile                  |  4 ++--
 30 files changed, 60 insertions(+), 60 deletions(-)

diffs (truncated from 474 to 300 lines):

diff -r e1e4a15f8ead -r 34be5d1fd049 external/atheros/athn/Makefile
--- a/external/atheros/athn/Makefile    Wed May 30 18:02:40 2018 +0000
+++ b/external/atheros/athn/Makefile    Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/atheros/otus/Makefile
--- a/external/atheros/otus/Makefile    Wed May 30 18:02:40 2018 +0000
+++ b/external/atheros/otus/Makefile    Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/broadcom/bcm43xx/Makefile
--- a/external/broadcom/bcm43xx/Makefile        Wed May 30 18:02:40 2018 +0000
+++ b/external/broadcom/bcm43xx/Makefile        Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/broadcom/bwfm/Makefile
--- a/external/broadcom/bwfm/Makefile   Wed May 30 18:02:40 2018 +0000
+++ b/external/broadcom/bwfm/Makefile   Wed May 30 20:54:06 2018 +0000
@@ -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/brcmfmac4350c2-pcie.bin
 FILES+=        dist/brcmfmac43602-pcie.bin
 
-FILESDIR=      /libdata/firmware/if_bwfm
+FILESDIR=      ${FIRMWAREDIR}/if_bwfm
 
 .include <bsd.files.mk>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-eula/ipw2100/Makefile
--- a/external/intel-fw-eula/ipw2100/Makefile   Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-eula/ipw2100/Makefile   Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-eula/ipw2200/Makefile
--- a/external/intel-fw-eula/ipw2200/Makefile   Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-eula/ipw2200/Makefile   Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-public/ipw3945/Makefile
--- a/external/intel-fw-public/ipw3945/Makefile Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-public/ipw3945/Makefile Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-public/iwl100/Makefile
--- a/external/intel-fw-public/iwl100/Makefile  Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-public/iwl100/Makefile  Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-public/iwl1000/Makefile
--- a/external/intel-fw-public/iwl1000/Makefile Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-public/iwl1000/Makefile Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-public/iwl105/Makefile
--- a/external/intel-fw-public/iwl105/Makefile  Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-public/iwl105/Makefile  Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-public/iwl135/Makefile
--- a/external/intel-fw-public/iwl135/Makefile  Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-public/iwl135/Makefile  Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-public/iwl2000/Makefile
--- a/external/intel-fw-public/iwl2000/Makefile Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-public/iwl2000/Makefile Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-public/iwl2030/Makefile
--- a/external/intel-fw-public/iwl2030/Makefile Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-public/iwl2030/Makefile Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-public/iwl3160/Makefile
--- a/external/intel-fw-public/iwl3160/Makefile Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-public/iwl3160/Makefile Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-public/iwl3168/Makefile
--- a/external/intel-fw-public/iwl3168/Makefile Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-public/iwl3168/Makefile Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-public/iwl4965/Makefile
--- a/external/intel-fw-public/iwl4965/Makefile Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-public/iwl4965/Makefile Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-public/iwl5000/Makefile
--- a/external/intel-fw-public/iwl5000/Makefile Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-public/iwl5000/Makefile Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-public/iwl5150/Makefile
--- a/external/intel-fw-public/iwl5150/Makefile Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-public/iwl5150/Makefile Wed May 30 20:54:06 2018 +0000
@@ -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>
diff -r e1e4a15f8ead -r 34be5d1fd049 external/intel-fw-public/iwl6000/Makefile
--- a/external/intel-fw-public/iwl6000/Makefile Wed May 30 18:02:40 2018 +0000
+++ b/external/intel-fw-public/iwl6000/Makefile Wed May 30 20:54:06 2018 +0000
@@ -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>