Module Name: src
Committed By: wiz
Date: Mon Jul 22 14:47:51 UTC 2019
Modified Files:
src/distrib/sets/lists/base: mi
src/etc/mtree: NetBSD.dist.base
src/external/broadcom/bcm43xx: Makefile
Log Message:
Move bcm43xx to /libdata/firmware, where all the other firmwares live.
Deprecate /usr/libdata/firmware.
To generate a diff of this commit:
cvs rdiff -u -r1.1207 -r1.1208 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.198 -r1.199 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.3 -r1.4 src/external/broadcom/bcm43xx/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/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1207 src/distrib/sets/lists/base/mi:1.1208
--- src/distrib/sets/lists/base/mi:1.1207 Sat Jul 20 19:09:21 2019
+++ src/distrib/sets/lists/base/mi Mon Jul 22 14:47:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1207 2019/07/20 19:09:21 wiz Exp $
+# $NetBSD: mi,v 1.1208 2019/07/22 14:47:51 wiz Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -134,6 +134,9 @@
./lib/npf base-sys-root compatfile
./libdata base-sys-root
./libdata/firmware base-firmware-root
+./libdata/firmware/bcm43xx base-firmware-usr
+./libdata/firmware/bcm43xx/BCM43430A1.hcd base-firmware-usr firmware
+./libdata/firmware/bcm43xx/LICENCE.broadcom_bcm43xx base-firmware-usr firmware
./libdata/firmware/if_athn base-firmware-root
./libdata/firmware/if_athn/athn-ar7010 base-firmware-root firmware
./libdata/firmware/if_athn/athn-ar7010-11 base-firmware-root firmware
@@ -1327,10 +1330,10 @@
./usr/libdata/debug/usr/libexec/uucp base-obsolete obsolete
./usr/libdata/debug/usr/mdec base-sys-usr
./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 firmware
-./usr/libdata/firmware/bcm43xx/LICENCE.broadcom_bcm43xx base-firmware-usr firmware
+./usr/libdata/firmware base-obsolete obsolete
+./usr/libdata/firmware/bcm43xx base-obsolete obsolete
+./usr/libdata/firmware/bcm43xx/BCM43430A1.hcd base-obsolete obsolete
+./usr/libdata/firmware/bcm43xx/LICENCE.broadcom_bcm43xx base-obsolete obsolete
./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/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.198 src/etc/mtree/NetBSD.dist.base:1.199
--- src/etc/mtree/NetBSD.dist.base:1.198 Sat Jul 20 19:09:21 2019
+++ src/etc/mtree/NetBSD.dist.base Mon Jul 22 14:47:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.198 2019/07/20 19:09:21 wiz Exp $
+# $NetBSD: NetBSD.dist.base,v 1.199 2019/07/22 14:47:51 wiz Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -65,6 +65,7 @@
./lib/npf
./libdata
./libdata/firmware
+./libdata/firmware/bcm43xx
./libdata/firmware/if_athn
./libdata/firmware/if_bwfm
./libdata/firmware/if_ipw
@@ -281,8 +282,6 @@
./usr/libdata/debug/usr/libexec/postfix
./usr/libdata/debug/usr/mdec
./usr/libdata/debug/usr/sbin
-./usr/libdata/firmware
-./usr/libdata/firmware/bcm43xx
./usr/libdata/ldscripts
./usr/libdata/lint
./usr/libexec
Index: src/external/broadcom/bcm43xx/Makefile
diff -u src/external/broadcom/bcm43xx/Makefile:1.3 src/external/broadcom/bcm43xx/Makefile:1.4
--- src/external/broadcom/bcm43xx/Makefile:1.3 Wed May 30 20:54:08 2018
+++ src/external/broadcom/bcm43xx/Makefile Mon Jul 22 14:47:51 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/30 20:54:08 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2019/07/22 14:47:51 wiz Exp $
NOMAN= # define
FILES= LICENCE.broadcom_bcm43xx BCM43430A1.hcd
-FILESDIR= /usr${FIRMWAREDIR}/bcm43xx
+FILESDIR= ${FIRMWAREDIR}/bcm43xx
.include <bsd.files.mk>
