 @@ -1,15 +1,15 @@
 #!/bin/sh
-# $NetBSD: mkimage,v 1.68 2017/11/28 00:24:08 kre Exp $
+# $NetBSD: mkimage,v 1.69 2017/11/28 02:56:44 kre Exp $
+#
 # Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Christos Zoulas.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -68,26 +68,32 @@ bar="==="
 tmp="$(mktemp -d "${TMPDIR:-/tmp}/$PROG.XXXXXX")"
 mnt="${tmp}/mnt"
 mkdir -p "${mnt}/etc" "${mnt}/dev"
 trap "cleanup" 0 1 2 3 15
 cleanup() {
 	case "$tmp" in
 	"${TMPDIR:-/tmp}/$PROG."*)	rm -fr "$tmp";;
 	esac
+}
 fail() {
 	IFS=' '
 	echo >&2 "${PROG}: $*"
 	exit 1
+}
 getsize() {
 	set -- $(ls -l $1)
 	echo $5
+}
 getsectors() {
 	case "$1" in
 	*g)
 		m=1073741824
 		v=${1%g}
 		;;
 	*m)
 		m=1048576

 @@ -1,14 +1,14 @@
-# $NetBSD: armv7.conf,v 1.19 2017/11/09 21:36:46 skrll Exp $
+# $NetBSD: armv7.conf,v 1.20 2017/11/28 02:56:44 kre Exp $
 # ARMv7 customization script used by mkimage
+#
 board=armv7
 console=fb
 resize=true
 . ${DIR}/conf/evbarm.conf
 kernels_beagle="BEAGLEBOARD BEAGLEBONE"
 kernels_awin="BPI CUBIEBOARD CUBIETRUCK"
 kernels_rpi="RPI2"
 kernels_amlogic="ODROID-C1"
 kernels_tegra="TEGRA"
 @@ -140,27 +140,28 @@ populate() {
 	done
 	# install kernels to /boot partition
 	for k in ${kernels}; do
 		tgt="$(basename ${k} | sed 's/\.gz$//')"
 		echo "${bar} installing ${k} to /boot/${tgt} ${bar}"
 		case "${k}" in
 		*.gz)
 			${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
 			;;
 		*)
 			cp "${k}" "${mnt}/boot/${tgt}"
 			;;
-		esac
+		esac ||
 			fail "Copy of ${k} to ${mnt}/boot/${tgt} failed"
 	done
 	# board specific configuration
 	populate_beagle
 	populate_awin
 	populate_rpi
 	populate_amlogic
 	populate_tegra
 	populate_sunxi
 	# common configuration
 	populate_common
+}

 @@ -1,14 +1,14 @@
-# $NetBSD: rpi.conf,v 1.31 2017/11/09 21:36:46 skrll Exp $
+# $NetBSD: rpi.conf,v 1.32 2017/11/28 02:56:44 kre Exp $
 # Raspberry Pi customization script used by mkimage
+#
 board=rpi
 kernel=$src/sys/arch/evbarm/compile/RPI/netbsd-RPI.bin
 resize=true
 . ${DIR}/conf/evbarm.conf
 firmwaredir=$src/external/broadcom/rpi-firmware/dist
 firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
 make_fstab() {
 @@ -62,34 +62,34 @@ EOF
 	if [ ! -f ${kernel} ]; then
 		echo ${PROG}: Missing ${kernel} 1>&2
 		exit 1
 	fi
 	echo "${bar} installing RPI kernel ${bar}"
 	case ${kernel} in
 	*.gz)
 		gzip -dc ${kernel} > ${mnt}/boot/kernel.img
 		;;
 	*)
 		cp ${kernel} ${mnt}/boot/kernel.img
 		;;
-	esac
+	esac || fail "copy of ${kernel} to ${mnt}/boot/kernel.img failed"
 	echo "${bar} installing RPI2 kernel ${bar}"
 	case ${rpi2_kernel} in
 	*.gz)
 		gzip -dc ${rpi2_kernel} > ${mnt}/boot/kernel7.img
 		;;
 	*)
-		cp ${rpi_kernel} ${mnt}/boot/kernel7.img
+		cp ${rpi2_kernel} ${mnt}/boot/kernel7.img
 		;;
-	esac
+	esac || fail "Copy of ${rpi2_kernel} to ${mnt}/boot/kernel7.img failed"
 	echo "${bar} installing firmware files ${bar}"
 	(cd ${mnt}/boot &&
 		for f in ${firmwarefiles}; do
 			echo " $f"
-			cp ${firmwaredir}/${f} .
+			cp ${firmwaredir}/${f} . || exit 1
 		done
 	) || fail "Copy of firmeware into ${mnt}/boot failed"
+}

 @@ -1,14 +1,14 @@
-# $NetBSD: rpi_inst.conf,v 1.9 2017/07/31 16:34:22 jmcneill Exp $
+# $NetBSD: rpi_inst.conf,v 1.10 2017/11/28 02:56:44 kre Exp $
 # Raspberry Pi customization script used by mkimage
+#
 board=rpi_inst
 kernel=$src/sys/arch/evbarm/compile/RPI/netbsd-RPI_INSTALL.bin
 . ${DIR}/conf/evbarm.conf
 image=$HOME/${board}.img
 swap=8
 extra=8		# spare space
 boot=112
 @@ -92,24 +92,24 @@ EOF
 	if [ ! -f ${kernel} ]; then
 		echo ${PROG}: Missing ${kernel} 1>&2
 		exit 1
 	fi
 	echo "${bar} installing kernel ${bar}"
 	case ${kernel} in
 	*.gz)
 		${GZIP_CMD} -dc ${kernel} > ${mnt}/boot/kernel.img
 		;;
 	*)
 		cp ${kernel} ${mnt}/boot/kernel.img
 		;;
-	esac
+	esac || fail "copy of ${kernel} to  ${mnt}/boot/kernel.img failed"
 	echo "${bar} installing firmware files ${bar}"
 	(cd ${mnt}/boot &&
 		for f in ${firmwarefiles}; do
 			echo " $f"
-			cp ${firmwaredir}/${f} .
+			cp ${firmwaredir}/${f} . || exit 1
 		done
 	) || fail "Copy of firmware to ${mnt}/boot failed"
+}

 @@ -1,14 +1,14 @@
-# $NetBSD: x86.conf,v 1.7 2015/01/29 14:54:06 skrll Exp $
+# $NetBSD: x86.conf,v 1.8 2017/11/28 02:56:44 kre Exp $
 # x86 shared config
+#
 image=$HOME/${board}.img
 MACHINE=${board}
 kernel=$src/sys/arch/${board}/compile/GENERIC/netbsd
 bootfile=$release/usr/mdec/boot
 extra=8		# spare space
 size=0		# autocompute
 netbsdid=169
 init=63
 ffsoffset=${init}b
 @@ -130,20 +130,21 @@ EOF
 populate() {
 	if [ ! -f ${kernel} ]; then
 		echo ${PROG}: Missing ${kernel} 1>&2
 		exit 1
 	fi
 	echo "${bar} installing kernel ${bar}"
 	cp ${kernel} ${mnt}/netbsd
 	if [ ! -f ${bootfile} ]; then
 		echo ${PROG}: Missing ${bootfile} 1>&2
 		exit 1
 	fi
-	cp ${bootfile} ${mnt}/boot
+	cp ${bootfile} ${mnt}/boot ||
 	    fail "copy of ${bootfile} to ${mnt}/boot failed"
 	echo "./netbsd type=file uname=root gname=wheel mode=0755" \
 	    >> "$tmp/selected_sets"
 	echo "./boot type=file uname=root gname=wheel mode=0444" \
 	    >> "$tmp/selected_sets"
+}