Recent work on the gnu cpio seems to have introduced some bugs, it

complains about "Malformed numbers" while unpacking the dists and
what winds up on the disk isn't correct.  Use this as an opportunity
to switch over to bsdcpio since at this point we don't even build
and install the gnu cpio by default.  Note sysinstall needed to be
tweaked a bit (dropping tape block size setting) because it seems
bsdcpio doesn't do anything with block sizes, at least as far as
reading from archives goes.  That wasn't really a problem since
installations from tape have been broken for a while and the rest
of sysinstall's tape support code will be removed shortly.

release/amd64/boot_crunch.conf

@@ -11,9 +11,6 @@ progs test
 ln sh -sh
 ln test [
 
-srcdirs /usr/src/gnu/usr.bin
-progs cpio
-
 srcdirs /usr/src/sbin
 progs camcontrol
 progs dhclient
@@ -29,6 +26,7 @@ ln fsck_ffs fsck_4.2bsd
 ln fsck_ffs fsck_ufs
 
 srcdirs /usr/src/usr.bin
+progs cpio
 progs find
 progs minigzip
 progs sed
@@ -44,4 +42,4 @@ progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
-libs -lbsdxml
+libs -lbsdxml -larchive -lbz2

release/i386/boot_crunch.conf

@@ -11,9 +11,6 @@ progs test
 ln sh -sh
 ln test [
 
-srcdirs /usr/src/gnu/usr.bin
-progs cpio
-
 srcdirs /usr/src/sbin
 progs camcontrol
 progs dhclient
@@ -29,6 +26,7 @@ ln fsck_ffs fsck_4.2bsd
 ln fsck_ffs fsck_ufs
 
 srcdirs /usr/src/usr.bin
+progs cpio
 progs find
 progs minigzip
 progs sed
@@ -44,4 +42,4 @@ progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
-libs -lbsdxml
+libs -lbsdxml -larchive -lbz2

release/ia64/boot_crunch.conf

@@ -11,9 +11,6 @@ progs test
 ln sh -sh
 ln test [
 
-srcdirs /usr/src/gnu/usr.bin
-progs cpio
-
 srcdirs /usr/src/sbin
 progs camcontrol
 progs dhclient
@@ -33,6 +30,7 @@ ln geom glabel
 ln geom gpart
 
 srcdirs /usr/src/usr.bin
+progs cpio
 progs find
 progs minigzip
 progs sed
@@ -48,4 +46,4 @@ progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -ldevinfo
-libs -lgeom -lbsdxml
+libs -lgeom -lbsdxml -larchive -lbz2

release/pc98/boot_crunch.conf

@@ -11,9 +11,6 @@ progs test
 ln sh -sh
 ln test [
 
-srcdirs /usr/src/gnu/usr.bin
-progs cpio
-
 srcdirs /usr/src/sbin
 progs camcontrol
 progs dhclient
@@ -29,6 +26,7 @@ ln fsck_ffs fsck_4.2bsd
 ln fsck_ffs fsck_ufs
 
 srcdirs /usr/src/usr.bin
+progs cpio
 progs find
 progs minigzip
 progs sed
@@ -43,3 +41,4 @@ progs sysinstall
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
+libs -larchive -lbz2

release/powerpc/boot_crunch.conf

@@ -11,9 +11,6 @@ progs test
 ln sh -sh
 ln test [
 
-srcdirs /usr/src/gnu/usr.bin
-progs cpio
-
 srcdirs /usr/src/sbin
 progs camcontrol
 progs dhclient
@@ -31,6 +28,7 @@ ln fsck_ffs fsck_4.2bsd
 ln fsck_ffs fsck_ufs
 
 srcdirs /usr/src/usr.bin
+progs cpio
 progs find
 progs minigzip
 progs sed
@@ -46,4 +44,4 @@ progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs
-libs -lbsdxml
+libs -lbsdxml -larchive -lbz2

release/sparc64/boot_crunch.conf

@@ -11,9 +11,6 @@ progs test
 ln sh -sh
 ln test [
 
-srcdirs /usr/src/gnu/usr.bin
-progs cpio
-
 srcdirs /usr/src/sbin
 progs camcontrol
 progs dhclient
@@ -29,6 +26,7 @@ ln fsck_ffs fsck_4.2bsd
 ln fsck_ffs fsck_ufs
 
 srcdirs /usr/src/usr.bin
+progs cpio
 progs find
 progs minigzip
 progs sed
@@ -44,3 +42,4 @@ progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
+libs -larchive -lbz2

release/sun4v/boot_crunch.conf

@@ -11,9 +11,6 @@ progs test
 ln sh -sh
 ln test [
 
-srcdirs /usr/src/gnu/usr.bin
-progs cpio
-
 srcdirs /usr/src/sbin
 progs camcontrol
 progs dhclient
@@ -29,6 +26,7 @@ ln fsck_ffs fsck_4.2bsd
 ln fsck_ffs fsck_ufs
 
 srcdirs /usr/src/usr.bin
+progs cpio
 progs find
 progs minigzip
 progs sed
@@ -44,3 +42,4 @@ progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
+libs -larchive -lbz2