[src/trunk]: src/distrib CD images need libarchive if MKBSDTAR is yes.

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

details:   https://anonhg.NetBSD.org/src/rev/3ed42aca5b2d
branches:  trunk
changeset: 331568:3ed42aca5b2d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Aug 14 16:27:17 2014 +0000

description:
CD images need libarchive if MKBSDTAR is yes.

diffstat:

 distrib/amd64/cdroms/Makefile.cdrom       |  5 ++++-
 distrib/i386/cdroms/Makefile.cdrom        |  5 ++++-
 distrib/sparc64/cdroms/installcd/Makefile |  5 ++++-
 distrib/vax/cdroms/installcd/Makefile     |  5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diffs (76 lines):

diff -r cdfab02d9199 -r 3ed42aca5b2d distrib/amd64/cdroms/Makefile.cdrom
--- a/distrib/amd64/cdroms/Makefile.cdrom       Thu Aug 14 16:26:21 2014 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom       Thu Aug 14 16:27:17 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.10 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile.cdrom,v 1.11 2014/08/14 16:27:17 riastradh Exp $
 
 .include <bsd.own.mk>
 
@@ -37,6 +37,9 @@
 CDRUNTIME+=    ./usr/bin/tput
 CDRUNTIME+=    ./usr/bin/vi
 CDRUNTIME+=    ./usr/bin/vmstat
+.if ${MKBSDTAR} != "no"
+CDRUNTIME+=    ./usr/lib/libarchive.so*
+.endif
 CDRUNTIME+=    ./usr/lib/libbz2.so*
 CDRUNTIME+=    ./usr/lib/libc.so*
 CDRUNTIME+=    ./usr/lib/libcurses.so*
diff -r cdfab02d9199 -r 3ed42aca5b2d distrib/i386/cdroms/Makefile.cdrom
--- a/distrib/i386/cdroms/Makefile.cdrom        Thu Aug 14 16:26:21 2014 +0000
+++ b/distrib/i386/cdroms/Makefile.cdrom        Thu Aug 14 16:27:17 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.30 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile.cdrom,v 1.31 2014/08/14 16:27:18 riastradh Exp $
 
 .include <bsd.own.mk>
 
@@ -37,6 +37,9 @@
 CDRUNTIME+=    ./usr/bin/tput
 CDRUNTIME+=    ./usr/bin/vi
 CDRUNTIME+=    ./usr/bin/vmstat
+.if ${MKBSDTAR} != "no"
+CDRUNTIME+=    ./usr/lib/libarchive.so*
+.endif
 CDRUNTIME+=    ./usr/lib/libbz2.so*
 CDRUNTIME+=    ./usr/lib/libc.so*
 CDRUNTIME+=    ./usr/lib/libcurses.so*
diff -r cdfab02d9199 -r 3ed42aca5b2d distrib/sparc64/cdroms/installcd/Makefile
--- a/distrib/sparc64/cdroms/installcd/Makefile Thu Aug 14 16:26:21 2014 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile Thu Aug 14 16:27:17 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2014/07/26 19:34:08 dholland Exp $
+#      $NetBSD: Makefile,v 1.19 2014/08/14 16:27:18 riastradh Exp $
 CDBASE=                sparc64cd               # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 
@@ -38,6 +38,9 @@
 CDRUNTIME+=    ./usr/bin/tput
 CDRUNTIME+=    ./usr/bin/vi
 CDRUNTIME+=    ./usr/bin/vmstat
+.if ${MKBSDTAR} != "no"
+CDRUNTIME+=    ./usr/lib/libarchive.so*
+.endif
 CDRUNTIME+=    ./usr/lib/libbz2.so*
 CDRUNTIME+=    ./usr/lib/libc.so*
 CDRUNTIME+=    ./usr/lib/libcurses.so*
diff -r cdfab02d9199 -r 3ed42aca5b2d distrib/vax/cdroms/installcd/Makefile
--- a/distrib/vax/cdroms/installcd/Makefile     Thu Aug 14 16:26:21 2014 +0000
+++ b/distrib/vax/cdroms/installcd/Makefile     Thu Aug 14 16:27:17 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2014/07/26 19:34:08 dholland Exp $
+#      $NetBSD: Makefile,v 1.9 2014/08/14 16:27:18 riastradh Exp $
 CDBASE=                vaxcd                   # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 CDKERNELS=     ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz        netbsd.gz
@@ -68,6 +68,9 @@
 CDRUNTIME+=    ./usr/bin/tput
 CDRUNTIME+=    ./usr/bin/vi
 CDRUNTIME+=    ./usr/bin/vmstat
+.if ${MKBSDTAR} != "no"
+CDRUNTIME+=    ./usr/lib/libarchive.so*
+.endif
 CDRUNTIME+=    ./usr/lib/libbz2.so*
 CDRUNTIME+=    ./usr/lib/libc.so*
 CDRUNTIME+=    ./usr/lib/libcurses.so*