Sat Jun 10 23:26:32 2017 UTC ()
add the tests set.


(christos)
diff -r1.64 -r1.65 src/distrib/utils/embedded/mkimage
cvs diff -r1.64 -r1.65 src/distrib/utils/embedded/mkimage (expand / switch to unified diff)

--- src/distrib/utils/embedded/mkimage 2017/04/11 21:06:30 1.64
+++ src/distrib/utils/embedded/mkimage 2017/06/10 23:26:32 1.65
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#!/bin/sh 1#!/bin/sh
2# $NetBSD: mkimage,v 1.64 2017/04/11 21:06:30 jmcneill Exp $ 2# $NetBSD: mkimage,v 1.65 2017/06/10 23:26:32 christos Exp $
3# 3#
4# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc. 4# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
5# All rights reserved. 5# All rights reserved.
6# 6#
7# This code is derived from software contributed to The NetBSD Foundation 7# This code is derived from software contributed to The NetBSD Foundation
8# by Christos Zoulas. 8# by Christos Zoulas.
9# 9#
10# Redistribution and use in source and binary forms, with or without 10# Redistribution and use in source and binary forms, with or without
11# modification, are permitted provided that the following conditions 11# modification, are permitted provided that the following conditions
12# are met: 12# are met:
13# 1. Redistributions of source code must retain the above copyright 13# 1. Redistributions of source code must retain the above copyright
14# notice, this list of conditions and the following disclaimer. 14# notice, this list of conditions and the following disclaimer.
15# 2. Redistributions in binary form must reproduce the above copyright 15# 2. Redistributions in binary form must reproduce the above copyright
@@ -50,27 +50,27 @@ set -e @@ -50,27 +50,27 @@ set -e
50 50
51DIR="$(cd "$(dirname "$0")" && pwd)" 51DIR="$(cd "$(dirname "$0")" && pwd)"
52PROG="$(basename "$0")" 52PROG="$(basename "$0")"
53 53
54DISKLABEL=${TOOL_DISKLABEL:-disklabel} 54DISKLABEL=${TOOL_DISKLABEL:-disklabel}
55FDISK=${TOOL_FDISK:-fdisk} 55FDISK=${TOOL_FDISK:-fdisk}
56MAKEFS=${TOOL_MAKEFS:-makefs} 56MAKEFS=${TOOL_MAKEFS:-makefs}
57MTREE=${TOOL_MTREE:-mtree} 57MTREE=${TOOL_MTREE:-mtree}
58INSTALLBOOT=${TOOL_INSTALLBOOT:-installboot} 58INSTALLBOOT=${TOOL_INSTALLBOOT:-installboot}
59MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE:-mkubootimage} 59MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE:-mkubootimage}
60GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1) 60GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
61 61
62src="/usr/src" 62src="/usr/src"
63sets="base comp etc games man misc modules text" 63sets="base comp etc games man misc modules tests text"
64xsets="xbase xcomp xetc xfont xserver"  64xsets="xbase xcomp xetc xfont xserver"
65minfree="10%" 65minfree="10%"
66bar="===" 66bar="==="
67 67
68tmp="$(mktemp -d "/tmp/$PROG.XXXXXX")" 68tmp="$(mktemp -d "/tmp/$PROG.XXXXXX")"
69mnt="${tmp}/mnt" 69mnt="${tmp}/mnt"
70mkdir -p "${mnt}/etc" "${mnt}/dev" 70mkdir -p "${mnt}/etc" "${mnt}/dev"
71 71
72trap "cleanup" 0 1 2 3 15 72trap "cleanup" 0 1 2 3 15
73 73
74cleanup() { 74cleanup() {
75 case "$tmp" in 75 case "$tmp" in
76 /tmp/$PROG.*) rm -fr "$tmp";; 76 /tmp/$PROG.*) rm -fr "$tmp";;