From: deraadt <deraadt@openbsd.org>
Date: Sun, 3 Oct 2021 00:49:20 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b1c80baf1b7d4bf6f528498fe67f3d1db4353371;p=openbsd

sync
---

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index dd806c8c114..0b89ffbdc78 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1,64 +1,4 @@
 ./etc/examples/wsconsctl.conf
-./etc/firmware/3c990
-./etc/firmware/3c990-license
-./etc/firmware/atu-at76c503-i3863-ext
-./etc/firmware/atu-at76c503-i3863-int
-./etc/firmware/atu-at76c503-rfmd-acc-ext
-./etc/firmware/atu-at76c503-rfmd-acc-int
-./etc/firmware/atu-at76c505-rfmd-ext
-./etc/firmware/atu-at76c505-rfmd-int
-./etc/firmware/atu-intersil-ext
-./etc/firmware/atu-intersil-int
-./etc/firmware/atu-license
-./etc/firmware/atu-rfmd-ext
-./etc/firmware/atu-rfmd-int
-./etc/firmware/atu-rfmd2958-ext
-./etc/firmware/atu-rfmd2958-int
-./etc/firmware/atu-rfmd2958smc-ext
-./etc/firmware/atu-rfmd2958smc-int
-./etc/firmware/bnx-b06
-./etc/firmware/bnx-b09
-./etc/firmware/bnx-license
-./etc/firmware/bnx-rv2p
-./etc/firmware/bnx-xi-rv2p
-./etc/firmware/bnx-xi90-rv2p
-./etc/firmware/fxp-d101a
-./etc/firmware/fxp-d101b0
-./etc/firmware/fxp-d101ma
-./etc/firmware/fxp-d101s
-./etc/firmware/fxp-d102
-./etc/firmware/fxp-d102c
-./etc/firmware/fxp-d102e
-./etc/firmware/fxp-license
-./etc/firmware/kue
-./etc/firmware/kue-license
-./etc/firmware/myx-eth_z8e
-./etc/firmware/myx-ethp_z8e
-./etc/firmware/myx-license
-./etc/firmware/ral-license
-./etc/firmware/ral-rt2561
-./etc/firmware/ral-rt2561s
-./etc/firmware/ral-rt2661
-./etc/firmware/ral-rt2860
-./etc/firmware/ral-rt3290
-./etc/firmware/rum-license
-./etc/firmware/rum-rt2573
-./etc/firmware/run-license
-./etc/firmware/run-rt2870
-./etc/firmware/run-rt3071
-./etc/firmware/tht
-./etc/firmware/tht-license
-./etc/firmware/tigon-license
-./etc/firmware/tigon1
-./etc/firmware/tigon2
-./etc/firmware/tusb3410
-./etc/firmware/tusb3410-license
-./etc/firmware/udl_huffman
-./etc/firmware/yds
-./etc/firmware/yds-license
-./etc/firmware/zd1211
-./etc/firmware/zd1211-license
-./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 0b02409eda2..c7b94f66c2f 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1,69 +1,7 @@
 ./etc/examples/wsconsctl.conf
-./etc/firmware/3c990
-./etc/firmware/3c990-license
-./etc/firmware/atu-at76c503-i3863-ext
-./etc/firmware/atu-at76c503-i3863-int
-./etc/firmware/atu-at76c503-rfmd-acc-ext
-./etc/firmware/atu-at76c503-rfmd-acc-int
-./etc/firmware/atu-at76c505-rfmd-ext
-./etc/firmware/atu-at76c505-rfmd-int
-./etc/firmware/atu-intersil-ext
-./etc/firmware/atu-intersil-int
-./etc/firmware/atu-license
-./etc/firmware/atu-rfmd-ext
-./etc/firmware/atu-rfmd-int
-./etc/firmware/atu-rfmd2958-ext
-./etc/firmware/atu-rfmd2958-int
-./etc/firmware/atu-rfmd2958smc-ext
-./etc/firmware/atu-rfmd2958smc-int
-./etc/firmware/bnx-b06
-./etc/firmware/bnx-b09
-./etc/firmware/bnx-license
-./etc/firmware/bnx-rv2p
-./etc/firmware/bnx-xi-rv2p
-./etc/firmware/bnx-xi90-rv2p
-./etc/firmware/cs4280
-./etc/firmware/cs4280-license
-./etc/firmware/fxp-d101a
-./etc/firmware/fxp-d101b0
-./etc/firmware/fxp-d101ma
-./etc/firmware/fxp-d101s
-./etc/firmware/fxp-d102
-./etc/firmware/fxp-d102c
-./etc/firmware/fxp-d102e
-./etc/firmware/fxp-license
-./etc/firmware/kue
-./etc/firmware/kue-license
-./etc/firmware/myx-eth_z8e
-./etc/firmware/myx-ethp_z8e
-./etc/firmware/myx-license
-./etc/firmware/ral-license
-./etc/firmware/ral-rt2561
-./etc/firmware/ral-rt2561s
-./etc/firmware/ral-rt2661
-./etc/firmware/ral-rt2860
-./etc/firmware/ral-rt3290
-./etc/firmware/rum-license
-./etc/firmware/rum-rt2573
-./etc/firmware/run-license
-./etc/firmware/run-rt2870
-./etc/firmware/run-rt3071
 ./etc/firmware/symbol-eprim
 ./etc/firmware/symbol-esec
 ./etc/firmware/symbol-license
-./etc/firmware/tht
-./etc/firmware/tht-license
-./etc/firmware/tigon-license
-./etc/firmware/tigon1
-./etc/firmware/tigon2
-./etc/firmware/tusb3410
-./etc/firmware/tusb3410-license
-./etc/firmware/udl_huffman
-./etc/firmware/yds
-./etc/firmware/yds-license
-./etc/firmware/zd1211
-./etc/firmware/zd1211-license
-./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
diff --git a/distrib/sets/lists/base/md.arm64 b/distrib/sets/lists/base/md.arm64
index 8c7d3bd6919..a5a82d1d05d 100644
--- a/distrib/sets/lists/base/md.arm64
+++ b/distrib/sets/lists/base/md.arm64
@@ -1,32 +1,4 @@
 ./etc/examples/wsconsctl.conf
-./etc/firmware/atu-at76c503-i3863-ext
-./etc/firmware/atu-at76c503-i3863-int
-./etc/firmware/atu-at76c503-rfmd-acc-ext
-./etc/firmware/atu-at76c503-rfmd-acc-int
-./etc/firmware/atu-at76c505-rfmd-ext
-./etc/firmware/atu-at76c505-rfmd-int
-./etc/firmware/atu-intersil-ext
-./etc/firmware/atu-intersil-int
-./etc/firmware/atu-license
-./etc/firmware/atu-rfmd-ext
-./etc/firmware/atu-rfmd-int
-./etc/firmware/atu-rfmd2958-ext
-./etc/firmware/atu-rfmd2958-int
-./etc/firmware/atu-rfmd2958smc-ext
-./etc/firmware/atu-rfmd2958smc-int
-./etc/firmware/kue
-./etc/firmware/kue-license
-./etc/firmware/rum-license
-./etc/firmware/rum-rt2573
-./etc/firmware/run-license
-./etc/firmware/run-rt2870
-./etc/firmware/run-rt3071
-./etc/firmware/tusb3410
-./etc/firmware/tusb3410-license
-./etc/firmware/udl_huffman
-./etc/firmware/zd1211
-./etc/firmware/zd1211-license
-./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/bin/clang
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index 70ab16e4fec..4c303285c85 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -1,32 +1,4 @@
 ./etc/examples/wsconsctl.conf
-./etc/firmware/atu-at76c503-i3863-ext
-./etc/firmware/atu-at76c503-i3863-int
-./etc/firmware/atu-at76c503-rfmd-acc-ext
-./etc/firmware/atu-at76c503-rfmd-acc-int
-./etc/firmware/atu-at76c505-rfmd-ext
-./etc/firmware/atu-at76c505-rfmd-int
-./etc/firmware/atu-intersil-ext
-./etc/firmware/atu-intersil-int
-./etc/firmware/atu-license
-./etc/firmware/atu-rfmd-ext
-./etc/firmware/atu-rfmd-int
-./etc/firmware/atu-rfmd2958-ext
-./etc/firmware/atu-rfmd2958-int
-./etc/firmware/atu-rfmd2958smc-ext
-./etc/firmware/atu-rfmd2958smc-int
-./etc/firmware/kue
-./etc/firmware/kue-license
-./etc/firmware/rum-license
-./etc/firmware/rum-rt2573
-./etc/firmware/run-license
-./etc/firmware/run-rt2870
-./etc/firmware/run-rt3071
-./etc/firmware/tusb3410
-./etc/firmware/tusb3410-license
-./etc/firmware/udl_huffman
-./etc/firmware/zd1211
-./etc/firmware/zd1211-license
-./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/bin/clang
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 1bf3482d8a5..fa35d66bea5 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1,67 +1,4 @@
 ./etc/examples/wsconsctl.conf
-./etc/firmware/3c990
-./etc/firmware/3c990-license
-./etc/firmware/atu-at76c503-i3863-ext
-./etc/firmware/atu-at76c503-i3863-int
-./etc/firmware/atu-at76c503-rfmd-acc-ext
-./etc/firmware/atu-at76c503-rfmd-acc-int
-./etc/firmware/atu-at76c505-rfmd-ext
-./etc/firmware/atu-at76c505-rfmd-int
-./etc/firmware/atu-intersil-ext
-./etc/firmware/atu-intersil-int
-./etc/firmware/atu-license
-./etc/firmware/atu-rfmd-ext
-./etc/firmware/atu-rfmd-int
-./etc/firmware/atu-rfmd2958-ext
-./etc/firmware/atu-rfmd2958-int
-./etc/firmware/atu-rfmd2958smc-ext
-./etc/firmware/atu-rfmd2958smc-int
-./etc/firmware/bnx-b06
-./etc/firmware/bnx-b09
-./etc/firmware/bnx-license
-./etc/firmware/bnx-rv2p
-./etc/firmware/bnx-xi-rv2p
-./etc/firmware/bnx-xi90-rv2p
-./etc/firmware/fxp-d101a
-./etc/firmware/fxp-d101b0
-./etc/firmware/fxp-d101ma
-./etc/firmware/fxp-d101s
-./etc/firmware/fxp-d102
-./etc/firmware/fxp-d102c
-./etc/firmware/fxp-d102e
-./etc/firmware/fxp-license
-./etc/firmware/kue
-./etc/firmware/kue-license
-./etc/firmware/myx-eth_z8e
-./etc/firmware/myx-ethp_z8e
-./etc/firmware/myx-license
-./etc/firmware/ral-license
-./etc/firmware/ral-rt2561
-./etc/firmware/ral-rt2561s
-./etc/firmware/ral-rt2661
-./etc/firmware/ral-rt2860
-./etc/firmware/ral-rt3290
-./etc/firmware/rum-license
-./etc/firmware/rum-rt2573
-./etc/firmware/run-license
-./etc/firmware/run-rt2870
-./etc/firmware/run-rt3071
-./etc/firmware/symbol-eprim
-./etc/firmware/symbol-esec
-./etc/firmware/symbol-license
-./etc/firmware/tht
-./etc/firmware/tht-license
-./etc/firmware/tigon-license
-./etc/firmware/tigon1
-./etc/firmware/tigon2
-./etc/firmware/tusb3410
-./etc/firmware/tusb3410-license
-./etc/firmware/udl_huffman
-./etc/firmware/yds
-./etc/firmware/yds-license
-./etc/firmware/zd1211
-./etc/firmware/zd1211-license
-./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/bin/ld.bfd
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 5a751bb1226..701d989c15e 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1,71 +1,9 @@
 ./etc/examples/wsconsctl.conf
-./etc/firmware/3c990
-./etc/firmware/3c990-license
-./etc/firmware/atu-at76c503-i3863-ext
-./etc/firmware/atu-at76c503-i3863-int
-./etc/firmware/atu-at76c503-rfmd-acc-ext
-./etc/firmware/atu-at76c503-rfmd-acc-int
-./etc/firmware/atu-at76c505-rfmd-ext
-./etc/firmware/atu-at76c505-rfmd-int
-./etc/firmware/atu-intersil-ext
-./etc/firmware/atu-intersil-int
-./etc/firmware/atu-license
-./etc/firmware/atu-rfmd-ext
-./etc/firmware/atu-rfmd-int
-./etc/firmware/atu-rfmd2958-ext
-./etc/firmware/atu-rfmd2958-int
-./etc/firmware/atu-rfmd2958smc-ext
-./etc/firmware/atu-rfmd2958smc-int
-./etc/firmware/bnx-b06
-./etc/firmware/bnx-b09
-./etc/firmware/bnx-license
-./etc/firmware/bnx-rv2p
-./etc/firmware/bnx-xi-rv2p
-./etc/firmware/bnx-xi90-rv2p
-./etc/firmware/cs4280
-./etc/firmware/cs4280-license
-./etc/firmware/fxp-d101a
-./etc/firmware/fxp-d101b0
-./etc/firmware/fxp-d101ma
-./etc/firmware/fxp-d101s
-./etc/firmware/fxp-d102
-./etc/firmware/fxp-d102c
-./etc/firmware/fxp-d102e
-./etc/firmware/fxp-license
-./etc/firmware/kue
-./etc/firmware/kue-license
-./etc/firmware/myx-eth_z8e
-./etc/firmware/myx-ethp_z8e
-./etc/firmware/myx-license
 ./etc/firmware/neo-coefficients
 ./etc/firmware/neo-license
-./etc/firmware/ral-license
-./etc/firmware/ral-rt2561
-./etc/firmware/ral-rt2561s
-./etc/firmware/ral-rt2661
-./etc/firmware/ral-rt2860
-./etc/firmware/ral-rt3290
-./etc/firmware/rum-license
-./etc/firmware/rum-rt2573
-./etc/firmware/run-license
-./etc/firmware/run-rt2870
-./etc/firmware/run-rt3071
 ./etc/firmware/symbol-eprim
 ./etc/firmware/symbol-esec
 ./etc/firmware/symbol-license
-./etc/firmware/tht
-./etc/firmware/tht-license
-./etc/firmware/tigon-license
-./etc/firmware/tigon1
-./etc/firmware/tigon2
-./etc/firmware/tusb3410
-./etc/firmware/tusb3410-license
-./etc/firmware/udl_huffman
-./etc/firmware/yds
-./etc/firmware/yds-license
-./etc/firmware/zd1211
-./etc/firmware/zd1211-license
-./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 751220f662e..b036e4a1244 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -1,32 +1,4 @@
 ./etc/examples/wsconsctl.conf
-./etc/firmware/atu-at76c503-i3863-ext
-./etc/firmware/atu-at76c503-i3863-int
-./etc/firmware/atu-at76c503-rfmd-acc-ext
-./etc/firmware/atu-at76c503-rfmd-acc-int
-./etc/firmware/atu-at76c505-rfmd-ext
-./etc/firmware/atu-at76c505-rfmd-int
-./etc/firmware/atu-intersil-ext
-./etc/firmware/atu-intersil-int
-./etc/firmware/atu-license
-./etc/firmware/atu-rfmd-ext
-./etc/firmware/atu-rfmd-int
-./etc/firmware/atu-rfmd2958-ext
-./etc/firmware/atu-rfmd2958-int
-./etc/firmware/atu-rfmd2958smc-ext
-./etc/firmware/atu-rfmd2958smc-int
-./etc/firmware/kue
-./etc/firmware/kue-license
-./etc/firmware/rum-license
-./etc/firmware/rum-rt2573
-./etc/firmware/run-license
-./etc/firmware/run-rt2870
-./etc/firmware/run-rt3071
-./etc/firmware/tusb3410
-./etc/firmware/tusb3410-license
-./etc/firmware/udl_huffman
-./etc/firmware/zd1211
-./etc/firmware/zd1211-license
-./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/bin/ld.bfd
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 4e196528b43..18d8395cb6b 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -1,38 +1,4 @@
 ./etc/examples/wsconsctl.conf
-./etc/firmware/atu-at76c503-i3863-ext
-./etc/firmware/atu-at76c503-i3863-int
-./etc/firmware/atu-at76c503-rfmd-acc-ext
-./etc/firmware/atu-at76c503-rfmd-acc-int
-./etc/firmware/atu-at76c505-rfmd-ext
-./etc/firmware/atu-at76c505-rfmd-int
-./etc/firmware/atu-intersil-ext
-./etc/firmware/atu-intersil-int
-./etc/firmware/atu-license
-./etc/firmware/atu-rfmd-ext
-./etc/firmware/atu-rfmd-int
-./etc/firmware/atu-rfmd2958-ext
-./etc/firmware/atu-rfmd2958-int
-./etc/firmware/atu-rfmd2958smc-ext
-./etc/firmware/atu-rfmd2958smc-int
-./etc/firmware/kue
-./etc/firmware/kue-license
-./etc/firmware/ral-license
-./etc/firmware/ral-rt2561
-./etc/firmware/ral-rt2561s
-./etc/firmware/ral-rt2661
-./etc/firmware/ral-rt2860
-./etc/firmware/ral-rt3290
-./etc/firmware/rum-license
-./etc/firmware/rum-rt2573
-./etc/firmware/run-license
-./etc/firmware/run-rt2870
-./etc/firmware/run-rt3071
-./etc/firmware/tusb3410
-./etc/firmware/tusb3410-license
-./etc/firmware/udl_huffman
-./etc/firmware/zd1211
-./etc/firmware/zd1211-license
-./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/bin/clang
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 5ea61bd296c..ce528c58a7f 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1,67 +1,4 @@
 ./etc/examples/wsconsctl.conf
-./etc/firmware/3c990
-./etc/firmware/3c990-license
-./etc/firmware/atu-at76c503-i3863-ext
-./etc/firmware/atu-at76c503-i3863-int
-./etc/firmware/atu-at76c503-rfmd-acc-ext
-./etc/firmware/atu-at76c503-rfmd-acc-int
-./etc/firmware/atu-at76c505-rfmd-ext
-./etc/firmware/atu-at76c505-rfmd-int
-./etc/firmware/atu-intersil-ext
-./etc/firmware/atu-intersil-int
-./etc/firmware/atu-license
-./etc/firmware/atu-rfmd-ext
-./etc/firmware/atu-rfmd-int
-./etc/firmware/atu-rfmd2958-ext
-./etc/firmware/atu-rfmd2958-int
-./etc/firmware/atu-rfmd2958smc-ext
-./etc/firmware/atu-rfmd2958smc-int
-./etc/firmware/bnx-b06
-./etc/firmware/bnx-b09
-./etc/firmware/bnx-license
-./etc/firmware/bnx-rv2p
-./etc/firmware/bnx-xi-rv2p
-./etc/firmware/bnx-xi90-rv2p
-./etc/firmware/fxp-d101a
-./etc/firmware/fxp-d101b0
-./etc/firmware/fxp-d101ma
-./etc/firmware/fxp-d101s
-./etc/firmware/fxp-d102
-./etc/firmware/fxp-d102c
-./etc/firmware/fxp-d102e
-./etc/firmware/fxp-license
-./etc/firmware/kue
-./etc/firmware/kue-license
-./etc/firmware/myx-eth_z8e
-./etc/firmware/myx-ethp_z8e
-./etc/firmware/myx-license
-./etc/firmware/ral-license
-./etc/firmware/ral-rt2561
-./etc/firmware/ral-rt2561s
-./etc/firmware/ral-rt2661
-./etc/firmware/ral-rt2860
-./etc/firmware/ral-rt3290
-./etc/firmware/rum-license
-./etc/firmware/rum-rt2573
-./etc/firmware/run-license
-./etc/firmware/run-rt2870
-./etc/firmware/run-rt3071
-./etc/firmware/symbol-eprim
-./etc/firmware/symbol-esec
-./etc/firmware/symbol-license
-./etc/firmware/tht
-./etc/firmware/tht-license
-./etc/firmware/tigon-license
-./etc/firmware/tigon1
-./etc/firmware/tigon2
-./etc/firmware/tusb3410
-./etc/firmware/tusb3410-license
-./etc/firmware/udl_huffman
-./etc/firmware/yds
-./etc/firmware/yds-license
-./etc/firmware/zd1211
-./etc/firmware/zd1211-license
-./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/pdisk
 ./sbin/wsconsctl
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index c56c4b981a0..86fe373b093 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -1,38 +1,4 @@
 ./etc/examples/wsconsctl.conf
-./etc/firmware/atu-at76c503-i3863-ext
-./etc/firmware/atu-at76c503-i3863-int
-./etc/firmware/atu-at76c503-rfmd-acc-ext
-./etc/firmware/atu-at76c503-rfmd-acc-int
-./etc/firmware/atu-at76c505-rfmd-ext
-./etc/firmware/atu-at76c505-rfmd-int
-./etc/firmware/atu-intersil-ext
-./etc/firmware/atu-intersil-int
-./etc/firmware/atu-license
-./etc/firmware/atu-rfmd-ext
-./etc/firmware/atu-rfmd-int
-./etc/firmware/atu-rfmd2958-ext
-./etc/firmware/atu-rfmd2958-int
-./etc/firmware/atu-rfmd2958smc-ext
-./etc/firmware/atu-rfmd2958smc-int
-./etc/firmware/kue
-./etc/firmware/kue-license
-./etc/firmware/ral-license
-./etc/firmware/ral-rt2561
-./etc/firmware/ral-rt2561s
-./etc/firmware/ral-rt2661
-./etc/firmware/ral-rt2860
-./etc/firmware/ral-rt3290
-./etc/firmware/rum-license
-./etc/firmware/rum-rt2573
-./etc/firmware/run-license
-./etc/firmware/run-rt2870
-./etc/firmware/run-rt3071
-./etc/firmware/tusb3410
-./etc/firmware/tusb3410-license
-./etc/firmware/udl_huffman
-./etc/firmware/zd1211
-./etc/firmware/zd1211-license
-./etc/firmware/zd1211b
 ./usr/bin/clang
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index f333378ef1a..48084f76225 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1,69 +1,6 @@
 ./etc/examples/wsconsctl.conf
-./etc/firmware/3c990
-./etc/firmware/3c990-license
 ./etc/firmware/afb
 ./etc/firmware/afb-license
-./etc/firmware/atu-at76c503-i3863-ext
-./etc/firmware/atu-at76c503-i3863-int
-./etc/firmware/atu-at76c503-rfmd-acc-ext
-./etc/firmware/atu-at76c503-rfmd-acc-int
-./etc/firmware/atu-at76c505-rfmd-ext
-./etc/firmware/atu-at76c505-rfmd-int
-./etc/firmware/atu-intersil-ext
-./etc/firmware/atu-intersil-int
-./etc/firmware/atu-license
-./etc/firmware/atu-rfmd-ext
-./etc/firmware/atu-rfmd-int
-./etc/firmware/atu-rfmd2958-ext
-./etc/firmware/atu-rfmd2958-int
-./etc/firmware/atu-rfmd2958smc-ext
-./etc/firmware/atu-rfmd2958smc-int
-./etc/firmware/bnx-b06
-./etc/firmware/bnx-b09
-./etc/firmware/bnx-license
-./etc/firmware/bnx-rv2p
-./etc/firmware/bnx-xi-rv2p
-./etc/firmware/bnx-xi90-rv2p
-./etc/firmware/fxp-d101a
-./etc/firmware/fxp-d101b0
-./etc/firmware/fxp-d101ma
-./etc/firmware/fxp-d101s
-./etc/firmware/fxp-d102
-./etc/firmware/fxp-d102c
-./etc/firmware/fxp-d102e
-./etc/firmware/fxp-license
-./etc/firmware/kue
-./etc/firmware/kue-license
-./etc/firmware/myx-eth_z8e
-./etc/firmware/myx-ethp_z8e
-./etc/firmware/myx-license
-./etc/firmware/ral-license
-./etc/firmware/ral-rt2561
-./etc/firmware/ral-rt2561s
-./etc/firmware/ral-rt2661
-./etc/firmware/ral-rt2860
-./etc/firmware/ral-rt3290
-./etc/firmware/rum-license
-./etc/firmware/rum-rt2573
-./etc/firmware/run-license
-./etc/firmware/run-rt2870
-./etc/firmware/run-rt3071
-./etc/firmware/symbol-eprim
-./etc/firmware/symbol-esec
-./etc/firmware/symbol-license
-./etc/firmware/tht
-./etc/firmware/tht-license
-./etc/firmware/tigon-license
-./etc/firmware/tigon1
-./etc/firmware/tigon2
-./etc/firmware/tusb3410
-./etc/firmware/tusb3410-license
-./etc/firmware/udl_huffman
-./etc/firmware/yds
-./etc/firmware/yds-license
-./etc/firmware/zd1211
-./etc/firmware/zd1211-license
-./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/bin/clang
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index c811248bfcc..528b483d971 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -93,6 +93,68 @@
 ./etc/examples/vm.conf
 ./etc/examples/ypldap.conf
 ./etc/firmware
+./etc/firmware/3c990
+./etc/firmware/3c990-license
+./etc/firmware/atu-at76c503-i3863-ext
+./etc/firmware/atu-at76c503-i3863-int
+./etc/firmware/atu-at76c503-rfmd-acc-ext
+./etc/firmware/atu-at76c503-rfmd-acc-int
+./etc/firmware/atu-at76c505-rfmd-ext
+./etc/firmware/atu-at76c505-rfmd-int
+./etc/firmware/atu-intersil-ext
+./etc/firmware/atu-intersil-int
+./etc/firmware/atu-license
+./etc/firmware/atu-rfmd-ext
+./etc/firmware/atu-rfmd-int
+./etc/firmware/atu-rfmd2958-ext
+./etc/firmware/atu-rfmd2958-int
+./etc/firmware/atu-rfmd2958smc-ext
+./etc/firmware/atu-rfmd2958smc-int
+./etc/firmware/bnx-b06
+./etc/firmware/bnx-b09
+./etc/firmware/bnx-license
+./etc/firmware/bnx-rv2p
+./etc/firmware/bnx-xi-rv2p
+./etc/firmware/bnx-xi90-rv2p
+./etc/firmware/cs4280
+./etc/firmware/cs4280-license
+./etc/firmware/fxp-d101a
+./etc/firmware/fxp-d101b0
+./etc/firmware/fxp-d101ma
+./etc/firmware/fxp-d101s
+./etc/firmware/fxp-d102
+./etc/firmware/fxp-d102c
+./etc/firmware/fxp-d102e
+./etc/firmware/fxp-license
+./etc/firmware/kue
+./etc/firmware/kue-license
+./etc/firmware/myx-eth_z8e
+./etc/firmware/myx-ethp_z8e
+./etc/firmware/myx-license
+./etc/firmware/ral-license
+./etc/firmware/ral-rt2561
+./etc/firmware/ral-rt2561s
+./etc/firmware/ral-rt2661
+./etc/firmware/ral-rt2860
+./etc/firmware/ral-rt3290
+./etc/firmware/rum-license
+./etc/firmware/rum-rt2573
+./etc/firmware/run-license
+./etc/firmware/run-rt2870
+./etc/firmware/run-rt3071
+./etc/firmware/tht
+./etc/firmware/tht-license
+./etc/firmware/tigon-license
+./etc/firmware/tigon1
+./etc/firmware/tigon2
+./etc/firmware/tusb3410
+./etc/firmware/tusb3410-license
+./etc/firmware/udl_huffman
+./etc/firmware/yds
+./etc/firmware/yds-license
+./etc/firmware/zd1211
+./etc/firmware/zd1211-license
+./etc/firmware/zd1211b
 ./etc/hotplug
 ./etc/iked
 ./etc/iked/ca