[src/trunk]: src Move bcm43xx firmware back to /usr/libdata/firmware.

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

details:   https://anonhg.NetBSD.org/src/rev/0e5f9f221d4b
branches:  trunk
changeset: 842769:0e5f9f221d4b
user:      wiz <wiz%NetBSD.org@localhost>
date:      Wed Jul 24 06:53:42 2019 +0000

description:
Move bcm43xx firmware back to /usr/libdata/firmware.

On popular request.

diffstat:

 distrib/sets/lists/base/mi         |  16 ++++++++--------
 etc/mtree/NetBSD.dist.base         |   5 +++--
 external/broadcom/bcm43xx/Makefile |   4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diffs (78 lines):

diff -r d67254794629 -r 0e5f9f221d4b distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Wed Jul 24 06:35:04 2019 +0000
+++ b/distrib/sets/lists/base/mi        Wed Jul 24 06:53:42 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1208 2019/07/22 14:47:51 wiz Exp $
+# $NetBSD: mi,v 1.1209 2019/07/24 06:53:42 wiz Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -134,9 +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/bcm43xx                     base-obsolete           obsolete
+./libdata/firmware/bcm43xx/BCM43430A1.hcd      base-obsolete           obsolete
+./libdata/firmware/bcm43xx/LICENCE.broadcom_bcm43xx    base-obsolete           obsolete
 ./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
@@ -1330,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-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                         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/radeon                  base-obsolete   obsolete
 ./usr/libdata/firmware/radeon/ARUBA_me.bin     base-obsolete   obsolete
 ./usr/libdata/firmware/radeon/ARUBA_pfp.bin    base-obsolete   obsolete
diff -r d67254794629 -r 0e5f9f221d4b etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base        Wed Jul 24 06:35:04 2019 +0000
+++ b/etc/mtree/NetBSD.dist.base        Wed Jul 24 06:53:42 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.base,v 1.199 2019/07/22 14:47:51 wiz Exp $
+#      $NetBSD: NetBSD.dist.base,v 1.200 2019/07/24 06:53:42 wiz Exp $
 #      @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -65,7 +65,6 @@
 ./lib/npf
 ./libdata
 ./libdata/firmware
-./libdata/firmware/bcm43xx
 ./libdata/firmware/if_athn
 ./libdata/firmware/if_bwfm
 ./libdata/firmware/if_ipw
@@ -282,6 +281,8 @@
 ./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
diff -r d67254794629 -r 0e5f9f221d4b external/broadcom/bcm43xx/Makefile
--- a/external/broadcom/bcm43xx/Makefile        Wed Jul 24 06:35:04 2019 +0000
+++ b/external/broadcom/bcm43xx/Makefile        Wed Jul 24 06:53:42 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2019/07/22 14:47:51 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2019/07/24 06:53:42 wiz Exp $
 
 NOMAN= # define
 
 FILES= LICENCE.broadcom_bcm43xx BCM43430A1.hcd
 
-FILESDIR=      ${FIRMWAREDIR}/bcm43xx
+FILESDIR=      /usr${FIRMWAREDIR}/bcm43xx
 
 .include <bsd.files.mk>