Module Name: src
Committed By: msaitoh
Date: Mon May 25 09:11:46 UTC 2015
Modified Files:
src/distrib/amd64/cdroms [netbsd-7]: Makefile.cdrom
src/distrib/i386/cdroms [netbsd-7]: Makefile.cdrom
Log Message:
Pull up following revision(s) (requested by martin in ticket #801):
distrib/amd64/cdroms/Makefile.cdrom: revision 1.16
distrib/i386/cdroms/Makefile.cdrom: revision 1.36
Add full libexec contents to the CD image - this makes dhcpcd happy.
To generate a diff of this commit:
cvs rdiff -u -r1.10.2.2 -r1.10.2.3 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.30.2.2 -r1.30.2.3 src/distrib/i386/cdroms/Makefile.cdrom
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.2.2 src/distrib/amd64/cdroms/Makefile.cdrom:1.10.2.3
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.10.2.2 Thu May 14 07:11:53 2015
+++ src/distrib/amd64/cdroms/Makefile.cdrom Mon May 25 09:11:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.10.2.2 2015/05/14 07:11:53 snj Exp $
+# $NetBSD: Makefile.cdrom,v 1.10.2.3 2015/05/25 09:11:46 msaitoh Exp $
.include <bsd.own.mk>
@@ -16,10 +16,7 @@ CDRUNTIME+= ./dev/MAKEDEV
CDRUNTIME+= ./etc
CDRUNTIME+= ./lib
CDRUNTIME+= ./libdata
-CDRUNTIME+= ./libexec/ld.elf_so
-CDRUNTIME+= ./libexec/lfs_cleanerd
-CDRUNTIME+= ./libexec/dhcpcd-run-hooks
-CDRUNTIME+= ./libexec/resolvconf/
+CDRUNTIME+= ./libexec
CDRUNTIME+= ./mnt
CDRUNTIME+= ./sbin
CDRUNTIME+= ./stand
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.30.2.2 src/distrib/i386/cdroms/Makefile.cdrom:1.30.2.3
--- src/distrib/i386/cdroms/Makefile.cdrom:1.30.2.2 Thu May 14 07:11:53 2015
+++ src/distrib/i386/cdroms/Makefile.cdrom Mon May 25 09:11:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.30.2.2 2015/05/14 07:11:53 snj Exp $
+# $NetBSD: Makefile.cdrom,v 1.30.2.3 2015/05/25 09:11:46 msaitoh Exp $
.include <bsd.own.mk>
@@ -16,10 +16,7 @@ CDRUNTIME+= ./dev/MAKEDEV
CDRUNTIME+= ./etc
CDRUNTIME+= ./lib
CDRUNTIME+= ./libdata
-CDRUNTIME+= ./libexec/ld.elf_so
-CDRUNTIME+= ./libexec/lfs_cleanerd
-CDRUNTIME+= ./libexec/dhcpcd-run-hooks
-CDRUNTIME+= ./libexec/resolvconf/
+CDRUNTIME+= ./libexec
CDRUNTIME+= ./mnt
CDRUNTIME+= ./sbin
CDRUNTIME+= ./stand