Module Name: src
Committed By: martin
Date: Mon Aug 2 10:03:13 UTC 2010
Modified Files:
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Add /libdata/firmware and /usr/lib/libintl* to install CDROMs with
root on iso9660; fixes PR install/43692 and install/43693.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.7 -r1.8 src/distrib/sparc64/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/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.20 src/distrib/i386/cdroms/Makefile.cdrom:1.21
--- src/distrib/i386/cdroms/Makefile.cdrom:1.20 Fri Apr 23 14:10:19 2010
+++ src/distrib/i386/cdroms/Makefile.cdrom Mon Aug 2 10:03:12 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.20 2010/04/23 14:10:19 he Exp $
+# $NetBSD: Makefile.cdrom,v 1.21 2010/08/02 10:03:12 martin Exp $
.include <bsd.own.mk>
@@ -15,6 +15,7 @@
CDRUNTIME+= ./dev/MAKEDEV
CDRUNTIME+= ./etc
CDRUNTIME+= ./lib
+CDRUNTIME+= ./libdata
CDRUNTIME+= ./libexec/ld.elf_so
CDRUNTIME+= ./libexec/lfs_cleanerd
CDRUNTIME+= ./libexec/dhcpcd-run-hooks
@@ -38,6 +39,7 @@
CDRUNTIME+= ./usr/lib/libc.so*
CDRUNTIME+= ./usr/lib/libcurses.so*
CDRUNTIME+= ./usr/lib/libedit.so*
+CDRUNTIME+= ./usr/lib/libintl.so*
CDRUNTIME+= ./usr/lib/libkvm.so*
CDRUNTIME+= ./usr/lib/libterminfo.so*
CDRUNTIME+= ./usr/lib/libutil.so*
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.7 src/distrib/sparc64/cdroms/installcd/Makefile:1.8
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.7 Fri Apr 23 14:10:19 2010
+++ src/distrib/sparc64/cdroms/installcd/Makefile Mon Aug 2 10:03:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/04/23 14:10:19 he Exp $
+# $NetBSD: Makefile,v 1.8 2010/08/02 10:03:13 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -16,6 +16,7 @@
CDRUNTIME+= ./dev/MAKEDEV
CDRUNTIME+= ./etc
CDRUNTIME+= ./lib
+CDRUNTIME+= ./libdata
CDRUNTIME+= ./libexec
CDRUNTIME+= ./mnt
CDRUNTIME+= ./sbin
@@ -38,6 +39,7 @@
CDRUNTIME+= ./usr/lib/libc.so*
CDRUNTIME+= ./usr/lib/libcurses.so*
CDRUNTIME+= ./usr/lib/libedit.so*
+CDRUNTIME+= ./usr/lib/libintl.so*
CDRUNTIME+= ./usr/lib/libkvm.so*
CDRUNTIME+= ./usr/lib/libterminfo.so*
CDRUNTIME+= ./usr/lib/libutil.so*
