[src/netbsd-7]: src/distrib Pull up following revision(s) (requested by marti...

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

details:   https://anonhg.NetBSD.org/src/rev/f9bbcaac5b41
branches:  netbsd-7
changeset: 799371:f9bbcaac5b41
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon May 25 09:11:46 2015 +0000

description:
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.

diffstat:

 distrib/amd64/cdroms/Makefile.cdrom |  7 ++-----
 distrib/i386/cdroms/Makefile.cdrom  |  7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (42 lines):

diff -r 5374ae5f7787 -r f9bbcaac5b41 distrib/amd64/cdroms/Makefile.cdrom
--- a/distrib/amd64/cdroms/Makefile.cdrom       Mon May 25 09:10:48 2015 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom       Mon May 25 09:11:46 2015 +0000
@@ -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+=    ./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
diff -r 5374ae5f7787 -r f9bbcaac5b41 distrib/i386/cdroms/Makefile.cdrom
--- a/distrib/i386/cdroms/Makefile.cdrom        Mon May 25 09:10:48 2015 +0000
+++ b/distrib/i386/cdroms/Makefile.cdrom        Mon May 25 09:11:46 2015 +0000
@@ -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+=    ./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