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

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

details:   https://anonhg.NetBSD.org/src/rev/98e21f0e45cb
branches:  netbsd-9
changeset: 931253:98e21f0e45cb
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Apr 24 17:40:53 2020 +0000

description:
Pull up following revision(s) (requested by maya in ticket #849):

        distrib/vax/cdroms/installcd/Makefile: revision 1.19
        distrib/common/Makefile.bootcd: revision 1.43

Do not populate /dev on CD images by default, instead rely on init
doing the tmpfs / MAKEDEV magic.

On images for machines with serious ram shortage (where the additional
tmpfs hurts, like VAX) override this with CDDEV_POPULATE=true.

Should fix PR port-amd64/54776.

diffstat:

 distrib/common/Makefile.bootcd        |  13 +++++++++++--
 distrib/vax/cdroms/installcd/Makefile |   3 ++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diffs (62 lines):

diff -r 1965a6bc7d70 -r 98e21f0e45cb distrib/common/Makefile.bootcd
--- a/distrib/common/Makefile.bootcd    Fri Apr 24 17:29:15 2020 +0000
+++ b/distrib/common/Makefile.bootcd    Fri Apr 24 17:40:53 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bootcd,v 1.41 2018/09/28 15:03:34 martin Exp $
+#      $NetBSD: Makefile.bootcd,v 1.41.2.1 2020/04/24 17:40:54 martin Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -22,6 +22,8 @@
 #                      stuff to put on CD (use in Makefiles)
 #      CDEXTRA_SKIP    A list of file exclusion paths to exclude when copying
 #                      directories of extra stuff in CDEXTRA AND CDBUILDEXTRA
+#      CDDEV_POPULATE  Set to 'true' to fully populate /dev on the CD (and
+#                      safe a tmpfs union mount)
 #      BOOT            Defaults to $DESTDIR/usr/mdec/boot
 #      BOOTXX_CD9660   Defaults to $DESTDIR/usr/mdec/bootxx_cd9660
 #      CDBOOTOPTIONS   Options for installboot, eg -o console=com0,speed=9600
@@ -44,6 +46,7 @@
 BOOTXX_CD9660?=        ${DESTDIR}/usr/mdec/bootxx_cd9660
 CDRELEASE?=    false
 CDSOURCE?=     false
+CDDEV_POPULATE?=false
 .if ${CDRELEASE} == false
 CDROMS_RELEASEDIR?=    ${MACHINE}/installation/cdrom
 .else
@@ -269,15 +272,21 @@
        fi
 .endif
 
+.if ${CDDEV_POPULATE} != true
+DELDEV=-e '/^\.\/dev\/.*type=char/d'
+.endif
+
 image:
        @echo Preparing spec files for makefs...
        ${RM} -f ${WORKSPEC}
        if [ -d cdrom/etc/mtree ]; then                         \
                cat cdrom/etc/mtree/* |                         \
                    ${TOOL_SED} -e 's/ size=[0-9]*//'           \
+                    ${DELDEV}                                  \
                     -e '/^\.\/etc\/gettytab/d' > ${WORKSPEC};  \
        fi
-       if [ -r cdrom/dev/MAKEDEV ]; then                       \
+       if [ -r cdrom/dev/MAKEDEV ] &&                          \
+                ${CDDEV_POPULATE} == true; then                \
                ${HOST_SH} cdrom/dev/MAKEDEV -s init |          \
                    ${TOOL_SED} -e '/^\. type=dir/d'            \
                        -e 's,^\.,./dev,' >> ${WORKSPEC};       \
diff -r 1965a6bc7d70 -r 98e21f0e45cb distrib/vax/cdroms/installcd/Makefile
--- a/distrib/vax/cdroms/installcd/Makefile     Fri Apr 24 17:29:15 2020 +0000
+++ b/distrib/vax/cdroms/installcd/Makefile     Fri Apr 24 17:40:53 2020 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: Makefile,v 1.17 2018/09/28 15:05:23 martin Exp $
+#      $NetBSD: Makefile,v 1.17.2.1 2020/04/24 17:40:53 martin Exp $
 CDBASE=                vaxcd                   # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 CDRELEASE_NODEBUG=     true
+CDDEV_POPULATE=        true                    # populate /dev on the CD
 CDKERNELS=     ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz        netbsd.gz
 CDRELEASE_NOISOS=true
 CD_SETS=       base etc        # no modules for VAX