Module Name: src
Committed By: martin
Date: Fri Aug 15 10:23:22 UTC 2014
Modified Files:
src/distrib/amd64/cdroms [netbsd-7]: Makefile.cdrom
src/distrib/i386/cdroms [netbsd-7]: Makefile.cdrom
src/distrib/sparc64/cdroms/installcd [netbsd-7]: Makefile
src/distrib/vax/cdroms/installcd [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #17):
distrib/vax/cdroms/installcd/Makefile: revision 1.9
distrib/amd64/cdroms/Makefile.cdrom: revision 1.11
distrib/i386/cdroms/Makefile.cdrom: revision 1.31
distrib/sparc64/cdroms/installcd/Makefile: revision 1.19
CD images need libarchive if MKBSDTAR is yes.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.30 -r1.30.2.1 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.18 -r1.18.2.1 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.8 -r1.8.2.1 src/distrib/vax/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.10 src/distrib/amd64/cdroms/Makefile.cdrom:1.10.2.1
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.10 Sat Jul 26 19:34:08 2014
+++ src/distrib/amd64/cdroms/Makefile.cdrom Fri Aug 15 10:23:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.10 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile.cdrom,v 1.10.2.1 2014/08/15 10:23:22 martin Exp $
.include <bsd.own.mk>
@@ -37,6 +37,9 @@ CDRUNTIME+= ./usr/bin/tip
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*
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.30 src/distrib/i386/cdroms/Makefile.cdrom:1.30.2.1
--- src/distrib/i386/cdroms/Makefile.cdrom:1.30 Sat Jul 26 19:34:08 2014
+++ src/distrib/i386/cdroms/Makefile.cdrom Fri Aug 15 10:23:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.30 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile.cdrom,v 1.30.2.1 2014/08/15 10:23:22 martin Exp $
.include <bsd.own.mk>
@@ -37,6 +37,9 @@ CDRUNTIME+= ./usr/bin/tip
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*
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.18 src/distrib/sparc64/cdroms/installcd/Makefile:1.18.2.1
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.18 Sat Jul 26 19:34:08 2014
+++ src/distrib/sparc64/cdroms/installcd/Makefile Fri Aug 15 10:23:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile,v 1.18.2.1 2014/08/15 10:23:22 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -38,6 +38,9 @@ CDRUNTIME+= ./usr/bin/tip
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*
Index: src/distrib/vax/cdroms/installcd/Makefile
diff -u src/distrib/vax/cdroms/installcd/Makefile:1.8 src/distrib/vax/cdroms/installcd/Makefile:1.8.2.1
--- src/distrib/vax/cdroms/installcd/Makefile:1.8 Sat Jul 26 19:34:08 2014
+++ src/distrib/vax/cdroms/installcd/Makefile Fri Aug 15 10:23:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2014/08/15 10:23:21 martin 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/tip
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*
