Module Name: src
Committed By: mrg
Date: Thu May 31 05:27:46 UTC 2018
Modified Files:
src/distrib/sets: mkvars.mk
src/distrib/sets/lists/base: mi
src/external/atheros: Makefile
src/external/broadcom: Makefile
src/external/intel-fw-eula: Makefile
src/external/intel-fw-public: Makefile
src/external/realtek: Makefile
src/share/mk: bsd.README bsd.own.mk
src/sys/dev/microcode/ral: Makefile
src/sys/dev/microcode/rum: Makefile
src/sys/dev/microcode/run: Makefile
src/sys/dev/microcode/zyd: Makefile
Log Message:
introduce MKFIRMWARE that controls where (most) of the contents
of /libdata/firmware and /usr/libdata/firmware are not installed
if set to "no". from the bsd.README:
MKFIRMWARE If "no", install the /libdata/firmware directory,
which is necessary for several drivers: athn(4), bwfm(4),
ipw(4), iwi(4), iwm(4), iwn(4), otus(4), rtwn(4), urtwn(4),
wpi(4), ral(4), rum(4), run(4), zyd(4), bcm43xx(4), and
the Tegra 124 SoC.
Default: yes on amd64, cobalt, evbarm evbmips, evbppc, hpcarm,
hppa, i386, mac68k, macppc, sandpoint, and sparc64, no
elsewhere.
convert MKRADEONFIRMWARE and MKTEGRAFIRMWARE into FOO.arch lists,
and move their defaults above the general defaults setting.
saves about 12MB in a normal installation for other platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.1176 -r1.1177 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.2 -r1.3 src/external/atheros/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/broadcom/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-eula/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/intel-fw-public/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/realtek/Makefile
cvs rdiff -u -r1.371 -r1.372 src/share/mk/bsd.README
cvs rdiff -u -r1.1061 -r1.1062 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/microcode/ral/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/microcode/rum/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/microcode/run/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/microcode/zyd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.34 src/distrib/sets/mkvars.mk:1.35
--- src/distrib/sets/mkvars.mk:1.34 Thu Feb 8 03:27:50 2018
+++ src/distrib/sets/mkvars.mk Thu May 31 05:27:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.34 2018/02/08 03:27:50 christos Exp $
+# $NetBSD: mkvars.mk,v 1.35 2018/05/31 05:27:45 mrg Exp $
MKEXTRAVARS= \
MACHINE \
@@ -21,6 +21,7 @@ MKEXTRAVARS= \
MKCOMPATMODULES \
MKDTC \
MKDYNAMICROOT \
+ MKFIRMWARE \
MKMANPAGES \
MKSLJIT \
MKSOFTFLOAT \
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1176 src/distrib/sets/lists/base/mi:1.1177
--- src/distrib/sets/lists/base/mi:1.1176 Mon May 28 13:22:34 2018
+++ src/distrib/sets/lists/base/mi Thu May 31 05:27:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1176 2018/05/28 13:22:34 christos Exp $
+# $NetBSD: mi,v 1.1177 2018/05/31 05:27:45 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -135,122 +135,122 @@
./libdata base-sys-root
./libdata/firmware base-firmware-root
./libdata/firmware/if_athn base-firmware-root
-./libdata/firmware/if_athn/athn-ar7010 base-firmware-root
-./libdata/firmware/if_athn/athn-ar7010-11 base-firmware-root
-./libdata/firmware/if_athn/athn-ar9271 base-firmware-root
-./libdata/firmware/if_athn/athn-license base-firmware-root
+./libdata/firmware/if_athn/athn-ar7010 base-firmware-root firmware
+./libdata/firmware/if_athn/athn-ar7010-11 base-firmware-root firmware
+./libdata/firmware/if_athn/athn-ar9271 base-firmware-root firmware
+./libdata/firmware/if_athn/athn-license base-firmware-root firmware
./libdata/firmware/if_bwfm base-firmware-root
-./libdata/firmware/if_bwfm/LICENCE.broadcom_bcm43xx base-firmware-root
-./libdata/firmware/if_bwfm/brcmfmac43143.bin base-firmware-root
-./libdata/firmware/if_bwfm/brcmfmac43236b.bin base-firmware-root
-./libdata/firmware/if_bwfm/brcmfmac43242a.bin base-firmware-root
-./libdata/firmware/if_bwfm/brcmfmac43569.bin base-firmware-root
-./libdata/firmware/if_bwfm/brcmfmac4350-pcie.bin base-firmware-root
-./libdata/firmware/if_bwfm/brcmfmac4350c2-pcie.bin base-firmware-root
-./libdata/firmware/if_bwfm/brcmfmac43602-pcie.bin base-firmware-root
+./libdata/firmware/if_bwfm/LICENCE.broadcom_bcm43xx base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43143.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43236b.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43242a.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43569.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac4350-pcie.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac4350c2-pcie.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43602-pcie.bin base-firmware-root firmware
./libdata/firmware/if_ipw base-firmware-root
-./libdata/firmware/if_ipw/LICENSE base-firmware-root
-./libdata/firmware/if_ipw/ipw2100-1.2-i.fw base-firmware-root
-./libdata/firmware/if_ipw/ipw2100-1.2-p.fw base-firmware-root
-./libdata/firmware/if_ipw/ipw2100-1.2.fw base-firmware-root
+./libdata/firmware/if_ipw/LICENSE base-firmware-root firmware
+./libdata/firmware/if_ipw/ipw2100-1.2-i.fw base-firmware-root firmware
+./libdata/firmware/if_ipw/ipw2100-1.2-p.fw base-firmware-root firmware
+./libdata/firmware/if_ipw/ipw2100-1.2.fw base-firmware-root firmware
./libdata/firmware/if_iwi base-firmware-root
-./libdata/firmware/if_iwi/LICENSE.ipw2200-fw base-firmware-root
-./libdata/firmware/if_iwi/ipw2200-bss.fw base-firmware-root
-./libdata/firmware/if_iwi/ipw2200-ibss.fw base-firmware-root
-./libdata/firmware/if_iwi/ipw2200-sniffer.fw base-firmware-root
+./libdata/firmware/if_iwi/LICENSE.ipw2200-fw base-firmware-root firmware
+./libdata/firmware/if_iwi/ipw2200-bss.fw base-firmware-root firmware
+./libdata/firmware/if_iwi/ipw2200-ibss.fw base-firmware-root firmware
+./libdata/firmware/if_iwi/ipw2200-sniffer.fw base-firmware-root firmware
./libdata/firmware/if_iwm base-firmware-root
-./libdata/firmware/if_iwm/LICENSE.iwlwifi-3160-ucode base-firmware-root
-./libdata/firmware/if_iwm/LICENSE.iwlwifi-3168-ucode base-firmware-root
-./libdata/firmware/if_iwm/LICENSE.iwlwifi-7260-ucode base-firmware-root
-./libdata/firmware/if_iwm/LICENSE.iwlwifi-7265-ucode base-firmware-root
-./libdata/firmware/if_iwm/LICENSE.iwlwifi-8000-ucode base-firmware-root
-./libdata/firmware/if_iwm/LICENSE.iwlwifi-8265-ucode base-firmware-root
-./libdata/firmware/if_iwm/README.iwlwifi-3160-ucode base-firmware-root
-./libdata/firmware/if_iwm/README.iwlwifi-3168-ucode base-firmware-root
-./libdata/firmware/if_iwm/README.iwlwifi-7260-ucode base-firmware-root
-./libdata/firmware/if_iwm/README.iwlwifi-7265-ucode base-firmware-root
-./libdata/firmware/if_iwm/README.iwlwifi-8000-ucode base-firmware-root
-./libdata/firmware/if_iwm/README.iwlwifi-8265-ucode base-firmware-root
+./libdata/firmware/if_iwm/LICENSE.iwlwifi-3160-ucode base-firmware-root firmware
+./libdata/firmware/if_iwm/LICENSE.iwlwifi-3168-ucode base-firmware-root firmware
+./libdata/firmware/if_iwm/LICENSE.iwlwifi-7260-ucode base-firmware-root firmware
+./libdata/firmware/if_iwm/LICENSE.iwlwifi-7265-ucode base-firmware-root firmware
+./libdata/firmware/if_iwm/LICENSE.iwlwifi-8000-ucode base-firmware-root firmware
+./libdata/firmware/if_iwm/LICENSE.iwlwifi-8265-ucode base-firmware-root firmware
+./libdata/firmware/if_iwm/README.iwlwifi-3160-ucode base-firmware-root firmware
+./libdata/firmware/if_iwm/README.iwlwifi-3168-ucode base-firmware-root firmware
+./libdata/firmware/if_iwm/README.iwlwifi-7260-ucode base-firmware-root firmware
+./libdata/firmware/if_iwm/README.iwlwifi-7265-ucode base-firmware-root firmware
+./libdata/firmware/if_iwm/README.iwlwifi-8000-ucode base-firmware-root firmware
+./libdata/firmware/if_iwm/README.iwlwifi-8265-ucode base-firmware-root firmware
./libdata/firmware/if_iwm/iwlwifi-3160-16.ucode base-obsolete obsolete
-./libdata/firmware/if_iwm/iwlwifi-3160-17.ucode base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-3160-17.ucode base-firmware-root firmware
./libdata/firmware/if_iwm/iwlwifi-3160-9.ucode base-obsolete obsolete
-./libdata/firmware/if_iwm/iwlwifi-3168-22.ucode base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-3168-22.ucode base-firmware-root firmware
./libdata/firmware/if_iwm/iwlwifi-7260-16.ucode base-obsolete obsolete
-./libdata/firmware/if_iwm/iwlwifi-7260-17.ucode base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-7260-17.ucode base-firmware-root firmware
./libdata/firmware/if_iwm/iwlwifi-7260-9.ucode base-obsolete obsolete
./libdata/firmware/if_iwm/iwlwifi-7265-16.ucode base-obsolete obsolete
-./libdata/firmware/if_iwm/iwlwifi-7265-17.ucode base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-7265-17.ucode base-firmware-root firmware
./libdata/firmware/if_iwm/iwlwifi-7265-9.ucode base-obsolete obsolete
./libdata/firmware/if_iwm/iwlwifi-7265D-16.ucode base-obsolete obsolete
./libdata/firmware/if_iwm/iwlwifi-7265D-17.ucode base-obsolete obsolete
-./libdata/firmware/if_iwm/iwlwifi-7265D-22.ucode base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-7265D-22.ucode base-firmware-root firmware
./libdata/firmware/if_iwm/iwlwifi-8000C-16.ucode base-obsolete obsolete
-./libdata/firmware/if_iwm/iwlwifi-8000C-22.ucode base-firmware-root
-./libdata/firmware/if_iwm/iwlwifi-8265-22.ucode base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-8000C-22.ucode base-firmware-root firmware
+./libdata/firmware/if_iwm/iwlwifi-8265-22.ucode base-firmware-root firmware
./libdata/firmware/if_iwn base-firmware-root
-./libdata/firmware/if_iwn/LICENSE.iwlwifi-100-ucode base-firmware-root
-./libdata/firmware/if_iwn/LICENSE.iwlwifi-1000-ucode base-firmware-root
-./libdata/firmware/if_iwn/LICENSE.iwlwifi-105-ucode base-firmware-root
-./libdata/firmware/if_iwn/LICENSE.iwlwifi-135-ucode base-firmware-root
-./libdata/firmware/if_iwn/LICENSE.iwlwifi-2000-ucode base-firmware-root
-./libdata/firmware/if_iwn/LICENSE.iwlwifi-2030-ucode base-firmware-root
-./libdata/firmware/if_iwn/LICENSE.iwlwifi-4965-ucode base-firmware-root
-./libdata/firmware/if_iwn/LICENSE.iwlwifi-5000-ucode base-firmware-root
-./libdata/firmware/if_iwn/LICENSE.iwlwifi-5150-ucode base-firmware-root
-./libdata/firmware/if_iwn/LICENSE.iwlwifi-6000-ucode base-firmware-root
-./libdata/firmware/if_iwn/LICENSE.iwlwifi-6000g2a-ucode base-firmware-root
-./libdata/firmware/if_iwn/LICENSE.iwlwifi-6000g2b-ucode base-firmware-root
-./libdata/firmware/if_iwn/LICENSE.iwlwifi-6050-ucode base-firmware-root
-./libdata/firmware/if_iwn/README.iwlwifi-100-ucode base-firmware-root
-./libdata/firmware/if_iwn/README.iwlwifi-1000-ucode base-firmware-root
-./libdata/firmware/if_iwn/README.iwlwifi-105-ucode base-firmware-root
-./libdata/firmware/if_iwn/README.iwlwifi-135-ucode base-firmware-root
-./libdata/firmware/if_iwn/README.iwlwifi-2000-ucode base-firmware-root
-./libdata/firmware/if_iwn/README.iwlwifi-2030-ucode base-firmware-root
-./libdata/firmware/if_iwn/README.iwlwifi-4965-ucode base-firmware-root
-./libdata/firmware/if_iwn/README.iwlwifi-5000-ucode base-firmware-root
-./libdata/firmware/if_iwn/README.iwlwifi-5150-ucode base-firmware-root
-./libdata/firmware/if_iwn/README.iwlwifi-6000-ucode base-firmware-root
-./libdata/firmware/if_iwn/README.iwlwifi-6000g2a-ucode base-firmware-root
-./libdata/firmware/if_iwn/README.iwlwifi-6000g2b-ucode base-firmware-root
-./libdata/firmware/if_iwn/README.iwlwifi-6050-ucode base-firmware-root
-./libdata/firmware/if_iwn/iwlwifi-100-5.ucode base-firmware-root
-./libdata/firmware/if_iwn/iwlwifi-1000-3.ucode base-firmware-root
-./libdata/firmware/if_iwn/iwlwifi-105-6.ucode base-firmware-root
-./libdata/firmware/if_iwn/iwlwifi-135-6.ucode base-firmware-root
-./libdata/firmware/if_iwn/iwlwifi-2000-6.ucode base-firmware-root
-./libdata/firmware/if_iwn/iwlwifi-2030-6.ucode base-firmware-root
+./libdata/firmware/if_iwn/LICENSE.iwlwifi-100-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/LICENSE.iwlwifi-1000-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/LICENSE.iwlwifi-105-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/LICENSE.iwlwifi-135-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/LICENSE.iwlwifi-2000-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/LICENSE.iwlwifi-2030-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/LICENSE.iwlwifi-4965-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/LICENSE.iwlwifi-5000-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/LICENSE.iwlwifi-5150-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/LICENSE.iwlwifi-6000-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/LICENSE.iwlwifi-6000g2a-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/LICENSE.iwlwifi-6000g2b-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/LICENSE.iwlwifi-6050-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/README.iwlwifi-100-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/README.iwlwifi-1000-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/README.iwlwifi-105-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/README.iwlwifi-135-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/README.iwlwifi-2000-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/README.iwlwifi-2030-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/README.iwlwifi-4965-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/README.iwlwifi-5000-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/README.iwlwifi-5150-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/README.iwlwifi-6000-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/README.iwlwifi-6000g2a-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/README.iwlwifi-6000g2b-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/README.iwlwifi-6050-ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/iwlwifi-100-5.ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/iwlwifi-1000-3.ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/iwlwifi-105-6.ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/iwlwifi-135-6.ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/iwlwifi-2000-6.ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/iwlwifi-2030-6.ucode base-firmware-root firmware
./libdata/firmware/if_iwn/iwlwifi-4965-1.ucode base-obsolete obsolete
-./libdata/firmware/if_iwn/iwlwifi-4965-2.ucode base-firmware-root
+./libdata/firmware/if_iwn/iwlwifi-4965-2.ucode base-firmware-root firmware
./libdata/firmware/if_iwn/iwlwifi-5000-1.ucode base-obsolete obsolete
-./libdata/firmware/if_iwn/iwlwifi-5000-2.ucode base-firmware-root
-./libdata/firmware/if_iwn/iwlwifi-5150-2.ucode base-firmware-root
-./libdata/firmware/if_iwn/iwlwifi-6000-4.ucode base-firmware-root
-./libdata/firmware/if_iwn/iwlwifi-6000g2a-5.ucode base-firmware-root
-./libdata/firmware/if_iwn/iwlwifi-6000g2b-6.ucode base-firmware-root
-./libdata/firmware/if_iwn/iwlwifi-6050-5.ucode base-firmware-root
+./libdata/firmware/if_iwn/iwlwifi-5000-2.ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/iwlwifi-5150-2.ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/iwlwifi-6000-4.ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/iwlwifi-6000g2a-5.ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/iwlwifi-6000g2b-6.ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/iwlwifi-6050-5.ucode base-firmware-root firmware
./libdata/firmware/if_otus base-firmware-root
-./libdata/firmware/if_otus/otus-init base-firmware-root
-./libdata/firmware/if_otus/otus-license base-firmware-root
-./libdata/firmware/if_otus/otus-main base-firmware-root
+./libdata/firmware/if_otus/otus-init base-firmware-root firmware
+./libdata/firmware/if_otus/otus-license base-firmware-root firmware
+./libdata/firmware/if_otus/otus-main base-firmware-root firmware
./libdata/firmware/if_rtwn base-firmware-root
-./libdata/firmware/if_rtwn/Realtek-Firmware-License.txt base-firmware-root
-./libdata/firmware/if_rtwn/rtl8192cfw.bin base-firmware-root
-./libdata/firmware/if_rtwn/rtl8192cfwU.bin base-firmware-root
-./libdata/firmware/if_rtwn/rtl8192cfwU_B.bin base-firmware-root
+./libdata/firmware/if_rtwn/Realtek-Firmware-License.txt base-firmware-root firmware
+./libdata/firmware/if_rtwn/rtl8192cfw.bin base-firmware-root firmware
+./libdata/firmware/if_rtwn/rtl8192cfwU.bin base-firmware-root firmware
+./libdata/firmware/if_rtwn/rtl8192cfwU_B.bin base-firmware-root firmware
./libdata/firmware/if_urtwn base-firmware-root
-./libdata/firmware/if_urtwn/Realtek-Firmware-License.txt base-firmware-root
-./libdata/firmware/if_urtwn/rtl8188eufw.bin base-firmware-root
-./libdata/firmware/if_urtwn/rtl8192cfw.bin base-firmware-root
-./libdata/firmware/if_urtwn/rtl8192cfwU.bin base-firmware-root
-./libdata/firmware/if_urtwn/rtl8192eefw.bin base-firmware-root
+./libdata/firmware/if_urtwn/Realtek-Firmware-License.txt base-firmware-root firmware
+./libdata/firmware/if_urtwn/rtl8188eufw.bin base-firmware-root firmware
+./libdata/firmware/if_urtwn/rtl8192cfw.bin base-firmware-root firmware
+./libdata/firmware/if_urtwn/rtl8192cfwU.bin base-firmware-root firmware
+./libdata/firmware/if_urtwn/rtl8192eefw.bin base-firmware-root firmware
./libdata/firmware/if_wpi base-firmware-root
-./libdata/firmware/if_wpi/LICENSE.ipw3945-ucode base-obsolete obsolete
-./libdata/firmware/if_wpi/LICENSE.iwlwifi-3945-ucode base-firmware-root
-./libdata/firmware/if_wpi/README.ipw3945-ucode base-obsolete obsolete
-./libdata/firmware/if_wpi/README.iwlwifi-3945-ucode base-firmware-root
-./libdata/firmware/if_wpi/ipw3945.ucode base-obsolete obsolete
-./libdata/firmware/if_wpi/iwlwifi-3945.ucode base-firmware-root
+./libdata/firmware/if_wpi/LICENSE.ipw3945-ucode base-obsolete obsolete firmware
+./libdata/firmware/if_wpi/LICENSE.iwlwifi-3945-ucode base-firmware-root firmware
+./libdata/firmware/if_wpi/README.ipw3945-ucode base-obsolete obsolete firmware
+./libdata/firmware/if_wpi/README.iwlwifi-3945-ucode base-firmware-root firmware
+./libdata/firmware/if_wpi/ipw3945.ucode base-obsolete obsolete firmware
+./libdata/firmware/if_wpi/iwlwifi-3945.ucode base-firmware-root firmware
./libdata/firmware/nvidia base-firmware-root
./libdata/firmware/nvidia/tegra124 base-firmware-root
./libdata/firmware/nvidia/tegra124/LICENCE.nvidia base-firmware-root tegrafirmware
@@ -414,27 +414,27 @@
./libdata/firmware/radeon/VERDE_rlc.bin base-firmware-usr radeonfirmware
./libdata/firmware/radeon/VERDE_smc.bin base-firmware-usr radeonfirmware
./libdata/firmware/ral base-firmware-root
-./libdata/firmware/ral/ral-license base-firmware-root
-./libdata/firmware/ral/ral-rt2561 base-firmware-root
-./libdata/firmware/ral/ral-rt2561s base-firmware-root
-./libdata/firmware/ral/ral-rt2661 base-firmware-root
-./libdata/firmware/ral/ral-rt2860 base-firmware-root
+./libdata/firmware/ral/ral-license base-firmware-root firmware
+./libdata/firmware/ral/ral-rt2561 base-firmware-root firmware
+./libdata/firmware/ral/ral-rt2561s base-firmware-root firmware
+./libdata/firmware/ral/ral-rt2661 base-firmware-root firmware
+./libdata/firmware/ral/ral-rt2860 base-firmware-root firmware
./libdata/firmware/rum base-firmware-root
-./libdata/firmware/rum/rum-license base-firmware-root
-./libdata/firmware/rum/rum-rt2573 base-firmware-root
-./libdata/firmware/rum/run-rt2870 base-obsolete obsolete
-./libdata/firmware/rum/run-rt3071 base-obsolete obsolete
+./libdata/firmware/rum/rum-license base-firmware-root firmware
+./libdata/firmware/rum/rum-rt2573 base-firmware-root firmware
+./libdata/firmware/rum/run-rt2870 base-obsolete obsolete firmware
+./libdata/firmware/rum/run-rt3071 base-obsolete obsolete firmware
./libdata/firmware/run base-firmware-root
-./libdata/firmware/run/run-license base-firmware-root
-./libdata/firmware/run/run-rt2870 base-firmware-root
-./libdata/firmware/run/run-rt3071 base-firmware-root
+./libdata/firmware/run/run-license base-firmware-root firmware
+./libdata/firmware/run/run-rt2870 base-firmware-root firmware
+./libdata/firmware/run/run-rt3071 base-firmware-root firmware
./libdata/firmware/upgt base-firmware-root
./libdata/firmware/urtwn base-obsolete obsolete
./libdata/firmware/zyd base-firmware-root
./libdata/firmware/zyd/zd1211-licence base-obsolete obsolete
-./libdata/firmware/zyd/zd1211-license base-firmware-root
-./libdata/firmware/zyd/zyd-zd1211 base-firmware-root
-./libdata/firmware/zyd/zyd-zd1211b base-firmware-root
+./libdata/firmware/zyd/zd1211-license base-firmware-root firmware
+./libdata/firmware/zyd/zyd-zd1211 base-firmware-root firmware
+./libdata/firmware/zyd/zyd-zd1211b base-firmware-root firmware
./libexec base-sys-root
./libexec/blacklistd-helper base-sysutil-root
./libexec/devpubd-hooks base-sysutil-root
@@ -1314,8 +1314,8 @@
./usr/libdata/debug/usr/sbin base-sys-usr
./usr/libdata/firmware base-firmware-usr
./usr/libdata/firmware/bcm43xx base-firmware-usr
-./usr/libdata/firmware/bcm43xx/BCM43430A1.hcd base-firmware-usr
-./usr/libdata/firmware/bcm43xx/LICENCE.broadcom_bcm43xx base-firmware-usr
+./usr/libdata/firmware/bcm43xx/BCM43430A1.hcd base-firmware-usr firmware
+./usr/libdata/firmware/bcm43xx/LICENCE.broadcom_bcm43xx base-firmware-usr firmware
./usr/libdata/firmware/radeon base-obsolete obsolete
./usr/libdata/firmware/radeon/ARUBA_me.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/ARUBA_pfp.bin base-obsolete obsolete
Index: src/external/atheros/Makefile
diff -u src/external/atheros/Makefile:1.2 src/external/atheros/Makefile:1.3
--- src/external/atheros/Makefile:1.2 Sat Mar 30 02:47:30 2013
+++ src/external/atheros/Makefile Thu May 31 05:27:45 2018
@@ -1,5 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2013/03/30 02:47:30 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/31 05:27:45 mrg Exp $
+.include <bsd.own.mk>
+
+.if ${MKFIRMWARE} != "no"
SUBDIR+= athn otus
+.endif
.include <bsd.subdir.mk>
Index: src/external/broadcom/Makefile
diff -u src/external/broadcom/Makefile:1.2 src/external/broadcom/Makefile:1.3
--- src/external/broadcom/Makefile:1.2 Sat Oct 21 02:05:38 2017
+++ src/external/broadcom/Makefile Thu May 31 05:27:45 2018
@@ -1,6 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2017/10/21 02:05:38 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/31 05:27:45 mrg Exp $
+.include <bsd.own.mk>
+
+.if ${MKFIRMWARE} != "no"
SUBDIR+= bcm43xx
SUBDIR+= bwfm
+.endif
.include <bsd.subdir.mk>
Index: src/external/intel-fw-eula/Makefile
diff -u src/external/intel-fw-eula/Makefile:1.1 src/external/intel-fw-eula/Makefile:1.2
--- src/external/intel-fw-eula/Makefile:1.1 Thu Oct 30 00:27:31 2008
+++ src/external/intel-fw-eula/Makefile Thu May 31 05:27:46 2018
@@ -1,5 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2008/10/30 00:27:31 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/31 05:27:46 mrg Exp $
+.include <bsd.own.mk>
+
+.if ${MKFIRMWARE} != "no"
SUBDIR+= ipw2100 ipw2200
+.endif
.include <bsd.subdir.mk>
Index: src/external/intel-fw-public/Makefile
diff -u src/external/intel-fw-public/Makefile:1.11 src/external/intel-fw-public/Makefile:1.12
--- src/external/intel-fw-public/Makefile:1.11 Tue Mar 14 23:59:24 2017
+++ src/external/intel-fw-public/Makefile Thu May 31 05:27:46 2018
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2017/03/14 23:59:24 nonaka Exp $
+# $NetBSD: Makefile,v 1.12 2018/05/31 05:27:46 mrg Exp $
+.include <bsd.own.mk>
+
+.if ${MKFIRMWARE} != "no"
SUBDIR+= ipw3945 iwl100 iwl105 iwl135 iwl1000 iwl2000 iwl2030 \
iwl3160 iwl3168 \
iwl4965 iwl5000 iwl5150 iwl6000 iwl6005 iwl6030 iwl6050 \
iwl7260 iwl7265 iwl8000 iwl8265
+.endif
.include <bsd.subdir.mk>
Index: src/external/realtek/Makefile
diff -u src/external/realtek/Makefile:1.2 src/external/realtek/Makefile:1.3
--- src/external/realtek/Makefile:1.2 Thu Aug 27 14:04:07 2015
+++ src/external/realtek/Makefile Thu May 31 05:27:46 2018
@@ -1,5 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/08/27 14:04:07 nonaka Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/31 05:27:46 mrg Exp $
+.include <bsd.own.mk>
+
+.if ${MKFIRMWARE} != "no"
SUBDIR+= rtwn urtwn
+.endif
.include <bsd.subdir.mk>
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.371 src/share/mk/bsd.README:1.372
--- src/share/mk/bsd.README:1.371 Wed May 9 22:24:01 2018
+++ src/share/mk/bsd.README Thu May 31 05:27:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.371 2018/05/09 22:24:01 joerg Exp $
+# $NetBSD: bsd.README,v 1.372 2018/05/31 05:27:46 mrg Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -194,6 +194,14 @@ MKEXTSRC If not "no", 'make build
users, and automatically enables creation of those sets.
Default: no
+MKFIRMWARE If "no", install the /libdata/firmware directory,
+ which is necessary for several drivers: athn(4), bwfm(4),
+ ipw(4), iwi(4), iwm(4), iwn(4), otus(4), rtwn(4), urtwn(4),
+ wpi(4), ral(4), rum(4), run(4), zyd(4), bcm43xx(4), and
+ the Tegra 124 SoC.
+ Default: yes on amd64, cobalt, evbarm evbmips, evbppc, hpcarm,
+ hppa, i386, mac68k, macppc, sandpoint, and sparc64, no elsewhere.
+
MKGCC If "no", don't build gcc(1) or any of the GCC-related
libraries (libgcc, libobjc, libstdc++).
Default: yes
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1061 src/share/mk/bsd.own.mk:1.1062
--- src/share/mk/bsd.own.mk:1.1061 Wed May 9 21:26:59 2018
+++ src/share/mk/bsd.own.mk Thu May 31 05:27:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1061 2018/05/09 21:26:59 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.1062 2018/05/31 05:27:46 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1123,6 +1123,27 @@ MKDYNAMICROOT= no
MKARZERO ?= ${MKREPRO}
.endif
+# Only install the general firmware on some systems
+MKFIRMWARE.amd64= yes
+MKFIRMWARE.cobalt= yes
+MKFIRMWARE.evbarm= yes
+MKFIRMWARE.evbmips= yes
+MKFIRMWARE.evbppc= yes
+MKFIRMWARE.hpcarm= yes
+MKFIRMWARE.hppa= yes
+MKFIRMWARE.i386= yes
+MKFIRMWARE.mac68k= yes
+MKFIRMWARE.macppc= yes
+MKFIRMWARE.sandpoint= yes
+MKFIRMWARE.sparc64= yes
+
+# Only install the radeon firmware on DRM-happy systems.
+MKRADEONFIRMWARE.x86_64= yes
+MKRADEONFIRMWARE.i386= yes
+
+# Only install the tegra firmware on evbarm.
+MKTEGRAFIRMWARE.evbarm= yes
+
#
# MK* options which default to "no". Note that MKZFS has a different
# default for some platforms, see above. Please keep alphabetically
@@ -1134,6 +1155,7 @@ _MKVARS.no= \
MKCATPAGES MKCOMPATTESTS MKCOMPATX11 MKCTF \
MKDEBUG MKDEBUGLIB MKDTRACE \
MKEXTSRC \
+ MKFIRMWARE \
MKGROFFHTMLDOC \
MKKYUA \
MKLIBCXX MKLLD MKLLDB MKLLVM MKLINT \
@@ -1190,17 +1212,6 @@ MKSLJIT= yes
${MACHINE} == "vax" || \
${MACHINE} == "zaurus"
MKXORG_SERVER=yes
-.else
-.endif
-
-# Only install the radeon firmware on DRM-happy systems.
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
-MKRADEONFIRMWARE= yes
-.endif
-
-# Only install the tegra firmware on evbarm.
-.if ${MACHINE} == "evbarm"
-MKTEGRAFIRMWARE= yes
.endif
#
Index: src/sys/dev/microcode/ral/Makefile
diff -u src/sys/dev/microcode/ral/Makefile:1.6 src/sys/dev/microcode/ral/Makefile:1.7
--- src/sys/dev/microcode/ral/Makefile:1.6 Wed Apr 27 19:50:06 2016
+++ src/sys/dev/microcode/ral/Makefile Thu May 31 05:27:46 2018
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2016/04/27 19:50:06 christos Exp $
+# $NetBSD: Makefile,v 1.7 2018/05/31 05:27:46 mrg Exp $
NOMAN= # defined
+.include <bsd.own.mk>
+
+.if ${MKFIRMWARE} != "no"
FILES= ral-rt2561 ral-rt2561s ral-rt2661 ral-rt2860 ral-license
+.endif
# XXX
includes:
Index: src/sys/dev/microcode/rum/Makefile
diff -u src/sys/dev/microcode/rum/Makefile:1.3 src/sys/dev/microcode/rum/Makefile:1.4
--- src/sys/dev/microcode/rum/Makefile:1.3 Fri Jun 1 13:19:39 2012
+++ src/sys/dev/microcode/rum/Makefile Thu May 31 05:27:46 2018
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2012/06/01 13:19:39 nonaka Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/31 05:27:46 mrg Exp $
NOMAN= # defined
+.include <bsd.own.mk>
+
+.if ${MKFIRMWARE} != "no"
FILES= rum-rt2573 rum-license
+.endif
# XXX
includes:
Index: src/sys/dev/microcode/run/Makefile
diff -u src/sys/dev/microcode/run/Makefile:1.1 src/sys/dev/microcode/run/Makefile:1.2
--- src/sys/dev/microcode/run/Makefile:1.1 Fri Jun 1 13:19:39 2012
+++ src/sys/dev/microcode/run/Makefile Thu May 31 05:27:46 2018
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2012/06/01 13:19:39 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/31 05:27:46 mrg Exp $
NOMAN= # defined
+.include <bsd.own.mk>
+
+.if ${MKFIRMWARE} != "no"
FILES= run-rt2870 run-rt3071 run-license
+.endif
# XXX
includes:
Index: src/sys/dev/microcode/zyd/Makefile
diff -u src/sys/dev/microcode/zyd/Makefile:1.2 src/sys/dev/microcode/zyd/Makefile:1.3
--- src/sys/dev/microcode/zyd/Makefile:1.2 Wed Feb 18 10:51:17 2009
+++ src/sys/dev/microcode/zyd/Makefile Thu May 31 05:27:46 2018
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2009/02/18 10:51:17 hira Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/31 05:27:46 mrg Exp $
NOMAN= # defined
+.include <bsd.own.mk>
+
+.if ${MKFIRMWARE} != "no"
FILES= zyd-zd1211 zyd-zd1211b zd1211-license
+.endif
# XXX
includes:
