diff --git a/external/atheros/athn/Makefile b/external/atheros/athn/Makefile index cef7357336cf..e5815adfd323 100644 --- a/external/atheros/athn/Makefile +++ b/external/atheros/athn/Makefile @@ -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 diff --git a/external/atheros/otus/Makefile b/external/atheros/otus/Makefile index bd28c1a3b95f..a2dcc4227140 100644 --- a/external/atheros/otus/Makefile +++ b/external/atheros/otus/Makefile @@ -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 diff --git a/external/broadcom/bcm43xx/Makefile b/external/broadcom/bcm43xx/Makefile index 477fc073c438..f026471dc622 100644 --- a/external/broadcom/bcm43xx/Makefile +++ b/external/broadcom/bcm43xx/Makefile @@ -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 diff --git a/external/broadcom/bwfm/Makefile b/external/broadcom/bwfm/Makefile index 578fba1f63c2..2acad0303f2e 100644 --- a/external/broadcom/bwfm/Makefile +++ b/external/broadcom/bwfm/Makefile @@ -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 diff --git a/external/intel-fw-eula/ipw2100/Makefile b/external/intel-fw-eula/ipw2100/Makefile index 8afcf7c84fe4..26ba60938b57 100644 --- a/external/intel-fw-eula/ipw2100/Makefile +++ b/external/intel-fw-eula/ipw2100/Makefile @@ -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 diff --git a/external/intel-fw-eula/ipw2200/Makefile b/external/intel-fw-eula/ipw2200/Makefile index 44ffbcf2ecbf..103670b89e73 100644 --- a/external/intel-fw-eula/ipw2200/Makefile +++ b/external/intel-fw-eula/ipw2200/Makefile @@ -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 diff --git a/external/intel-fw-public/ipw3945/Makefile b/external/intel-fw-public/ipw3945/Makefile index c04592d13e05..7b476b204d5b 100644 --- a/external/intel-fw-public/ipw3945/Makefile +++ b/external/intel-fw-public/ipw3945/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl100/Makefile b/external/intel-fw-public/iwl100/Makefile index 96f9c937795a..dcfdea401578 100644 --- a/external/intel-fw-public/iwl100/Makefile +++ b/external/intel-fw-public/iwl100/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl1000/Makefile b/external/intel-fw-public/iwl1000/Makefile index 13ccb4e3d6e2..686600bd91fa 100644 --- a/external/intel-fw-public/iwl1000/Makefile +++ b/external/intel-fw-public/iwl1000/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl105/Makefile b/external/intel-fw-public/iwl105/Makefile index 7b405142dc3c..473dba6925f9 100644 --- a/external/intel-fw-public/iwl105/Makefile +++ b/external/intel-fw-public/iwl105/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl135/Makefile b/external/intel-fw-public/iwl135/Makefile index 3a0ac339f70a..f20db8406fef 100644 --- a/external/intel-fw-public/iwl135/Makefile +++ b/external/intel-fw-public/iwl135/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl2000/Makefile b/external/intel-fw-public/iwl2000/Makefile index f698c8223700..7c09ea143359 100644 --- a/external/intel-fw-public/iwl2000/Makefile +++ b/external/intel-fw-public/iwl2000/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl2030/Makefile b/external/intel-fw-public/iwl2030/Makefile index 739c54ffc194..db77bf163159 100644 --- a/external/intel-fw-public/iwl2030/Makefile +++ b/external/intel-fw-public/iwl2030/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl3160/Makefile b/external/intel-fw-public/iwl3160/Makefile index 5b24972f68e7..4d57927810d8 100644 --- a/external/intel-fw-public/iwl3160/Makefile +++ b/external/intel-fw-public/iwl3160/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl3168/Makefile b/external/intel-fw-public/iwl3168/Makefile index 76fe824dd283..84aa7706cc16 100644 --- a/external/intel-fw-public/iwl3168/Makefile +++ b/external/intel-fw-public/iwl3168/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl4965/Makefile b/external/intel-fw-public/iwl4965/Makefile index 5777ebd1925a..0d7ad25b1ad0 100644 --- a/external/intel-fw-public/iwl4965/Makefile +++ b/external/intel-fw-public/iwl4965/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl5000/Makefile b/external/intel-fw-public/iwl5000/Makefile index ce991a3a8e1a..41a2910047a0 100644 --- a/external/intel-fw-public/iwl5000/Makefile +++ b/external/intel-fw-public/iwl5000/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl5150/Makefile b/external/intel-fw-public/iwl5150/Makefile index a7c28e9c67d5..7407ac8ed5fa 100644 --- a/external/intel-fw-public/iwl5150/Makefile +++ b/external/intel-fw-public/iwl5150/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl6000/Makefile b/external/intel-fw-public/iwl6000/Makefile index 6ce90d1c68b9..541d1ab31917 100644 --- a/external/intel-fw-public/iwl6000/Makefile +++ b/external/intel-fw-public/iwl6000/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl6005/Makefile b/external/intel-fw-public/iwl6005/Makefile index c19a0a5dae28..7e6ebf5170ac 100644 --- a/external/intel-fw-public/iwl6005/Makefile +++ b/external/intel-fw-public/iwl6005/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl6030/Makefile b/external/intel-fw-public/iwl6030/Makefile index 097789abeba5..c2ec85376973 100644 --- a/external/intel-fw-public/iwl6030/Makefile +++ b/external/intel-fw-public/iwl6030/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl6050/Makefile b/external/intel-fw-public/iwl6050/Makefile index 148b4658b377..d7656a4f8296 100644 --- a/external/intel-fw-public/iwl6050/Makefile +++ b/external/intel-fw-public/iwl6050/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl7260/Makefile b/external/intel-fw-public/iwl7260/Makefile index ecf0125b225d..cc2792bcdf9f 100644 --- a/external/intel-fw-public/iwl7260/Makefile +++ b/external/intel-fw-public/iwl7260/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl7265/Makefile b/external/intel-fw-public/iwl7265/Makefile index b0d1bead9191..0c924a166b95 100644 --- a/external/intel-fw-public/iwl7265/Makefile +++ b/external/intel-fw-public/iwl7265/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl8000/Makefile b/external/intel-fw-public/iwl8000/Makefile index 5474cc9b1ddb..85e8c8125405 100644 --- a/external/intel-fw-public/iwl8000/Makefile +++ b/external/intel-fw-public/iwl8000/Makefile @@ -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 diff --git a/external/intel-fw-public/iwl8265/Makefile b/external/intel-fw-public/iwl8265/Makefile index 184d26f9e072..af6d6f16f355 100644 --- a/external/intel-fw-public/iwl8265/Makefile +++ b/external/intel-fw-public/iwl8265/Makefile @@ -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 diff --git a/external/nvidia-firmware/tegra/tegra124/Makefile b/external/nvidia-firmware/tegra/tegra124/Makefile index 8a32ca93c991..bd7e67d7c2cd 100644 --- a/external/nvidia-firmware/tegra/tegra124/Makefile +++ b/external/nvidia-firmware/tegra/tegra124/Makefile @@ -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 diff --git a/external/nvidia-firmware/tegra/tegra210/Makefile b/external/nvidia-firmware/tegra/tegra210/Makefile index 417e0fa1ae31..aa5a7c8c70e2 100644 --- a/external/nvidia-firmware/tegra/tegra210/Makefile +++ b/external/nvidia-firmware/tegra/tegra210/Makefile @@ -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 diff --git a/external/realtek/rtwn/Makefile b/external/realtek/rtwn/Makefile index 4acabdb355ce..e6f1f385ebac 100644 --- a/external/realtek/rtwn/Makefile +++ b/external/realtek/rtwn/Makefile @@ -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 diff --git a/external/realtek/urtwn/Makefile b/external/realtek/urtwn/Makefile index cf3d09a1dc01..719c6eac4a36 100644 --- a/external/realtek/urtwn/Makefile +++ b/external/realtek/urtwn/Makefile @@ -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