From cb7a20f2ba86497c0695bd8c798c8d15988cd03e Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Mon, 26 May 2008 19:19:58 +0000 Subject: [PATCH] Connect bsdcpio up to the build. Starting now, there are two cpio programs in the base system: /usr/bin/gcpio - GNU cpio /usr/bin/bsdcpio - bsdcpio In addition, there is a symlink: /usr/bin/cpio -> /usr/bin/gcpio (default) /usr/bin/cpio -> /usr/bin/bsdcpio (WITH_BSDCPIO) In particular, WITH_BSDCPIO only controls the symlink; bsdcpio is always built regardless. Unless there are objections or problems, I intend: * to make /usr/bin/bsdcpio available in 7.1 * to have /usr/bin/cpio default to bsdcpio in 8.0 (WITH_GCPIO will be an option instead of WITH_BSDCPIO) * to leave /usr/bin/gcpio in the tree until 9.0 --- usr.bin/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index e43d055db86..241d3eb4cf8 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -43,6 +43,7 @@ SUBDIR= alias \ comm \ compile_et \ compress \ + cpio \ cpuset \ csplit \ ${_csup} \