[src/trunk]: src Add sanity checks for live-image and install-image targets

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

details:   https://anonhg.NetBSD.org/src/rev/cf7a322fbf07
branches:  trunk
changeset: 777630:cf7a322fbf07
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Feb 26 20:32:40 2012 +0000

description:
Add sanity checks for live-image and install-image targets
(which require mtree spec files built with MKUNPRIVED=yes)
to avoid unexpected makefs(8) error during image builds:
 - if release op is specified with live-image or install-image
   at the same time, make sure -U is also specified for the image builds
 - before perform live-image and install-image ops check METALOG file
   in DESTDIR to see if the build have been performed with MKUNPRIVED

XXX: Probably toolchain should create consistent spec files in
XXX: DESTDIR/etc/mtree dir regardless of MKUNPRIVED settings.

diffstat:

 build.sh |  30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diffs (66 lines):

diff -r cb16532ff2b1 -r cf7a322fbf07 build.sh
--- a/build.sh  Sun Feb 26 17:27:46 2012 +0000
+++ b/build.sh  Sun Feb 26 20:32:40 2012 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#      $NetBSD: build.sh,v 1.253 2012/01/22 03:53:32 tsutsui Exp $
+#      $NetBSD: build.sh,v 1.254 2012/02/26 20:32:40 tsutsui Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -503,6 +503,8 @@
        do_syspkgs=false
        do_iso_image=false
        do_iso_image_source=false
+       do_live_image=false
+       do_install_image=false
        do_params=false
        do_rump=false
 
@@ -1577,6 +1579,16 @@
                fi
                ;;
        esac
+
+       # live-image and install-image targets require binary sets
+       # (actually DESTDIR/etc/mtree/set.* files) built with MKUNPRIVED.
+       # If release operation is specified with live-image or install-image,
+       # the release op should be performed with -U for later image ops.
+       #
+       if ${do_release} && ( ${do_live_image} || ${do_install_image} ) && \
+           [ "${MKUNPRIVED}" = "no" ] ; then
+               bomb "-U must be specified on building release to create images later."
+       fi
 }
 
 
@@ -1644,7 +1656,7 @@
        eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.253 2012/01/22 03:53:32 tsutsui Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.254 2012/02/26 20:32:40 tsutsui Exp $
 # with these arguments: ${_args}
 #
 
@@ -1972,13 +1984,13 @@
                        statusmsg "Successful make ${op}"
                        ;;
 
-               live-image)
-                       ${runcmd} "${makewrapper}" ${parallel} ${op} ||
-                           bomb "Failed to make ${op}"
-                       statusmsg "Successful make ${op}"
-                       ;;
-
-               install-image)
+               live-image|install-image)
+                       # install-image and live-image require mtree spec files
+                       # built with UNPRIVED.  Assume UNPRIVED build has been
+                       # performed if METALOG file is created in DESTDIR.
+                       if [ ! -e "${DESTDIR}/METALOG" ] ; then
+                               bomb "The release binaries must have been built with -U to create images."
+                       fi
                        ${runcmd} "${makewrapper}" ${parallel} ${op} ||
                            bomb "Failed to make ${op}"
                        statusmsg "Successful make ${op}"