comparison system-image.sh @ 764:dc34da83204d

Cosmetic fix: don't announce system-image.sh stage twice.
author Rob Landley <rob@landley.net>
date Sat, 27 Jun 2009 23:57:54 -0500
parents c8eb04cdc4d8
children 2b9e8af90917
comparison
equal deleted inserted replaced
763:221b0e3cd8fd 764:dc34da83204d
14 then 14 then
15 [ -z "$FAIL_QUIET" ] && echo No "$NATIVE_ROOT" >&2 15 [ -z "$FAIL_QUIET" ] && echo No "$NATIVE_ROOT" >&2
16 exit 1 16 exit 1
17 fi 17 fi
18 18
19 # Announce start of stage.
20
21 echo -e "$PACKAGE_COLOR"
22 echo "=== Packaging system image from root-filesystem"
23
24 SYSIMAGE="${BUILD}/system-image-${ARCH_NAME}"
25 blank_tempdir "$SYSIMAGE"
26 blank_tempdir "$WORK" 19 blank_tempdir "$WORK"
27 20
28 # A little song and dance so we run in our own session, to prevent the "kill 0" 21 # A little song and dance so we run in our own session, to prevent the "kill 0"
29 # below from taking down the shell that called us. 22 # below from taking down the shell that called us.
30 23
37 # ctrl-c won't work. This little C program does it right. 30 # ctrl-c won't work. This little C program does it right.
38 31
39 $CC -s -Os "$SOURCES/toys/mysetsid.c" -o "$WORK/mysetsid" && 32 $CC -s -Os "$SOURCES/toys/mysetsid.c" -o "$WORK/mysetsid" &&
40 exec "$WORK/mysetsid" "$0" "$@" 33 exec "$WORK/mysetsid" "$0" "$@"
41 fi 34 fi
35
36 # Announce start of stage.
37
38 echo -e "$PACKAGE_COLOR"
39 echo "=== Packaging system image from root-filesystem"
40
41 SYSIMAGE="${BUILD}/system-image-${ARCH_NAME}"
42 blank_tempdir "$SYSIMAGE"
43
42 44
43 [ -z "$SYSIMAGE_TYPE" ] && SYSIMAGE_TYPE=squashfs 45 [ -z "$SYSIMAGE_TYPE" ] && SYSIMAGE_TYPE=squashfs
44 46
45 TOOLSDIR=tools 47 TOOLSDIR=tools
46 [ -z "$NATIVE_TOOLSDIR" ] && TOOLSDIR=usr 48 [ -z "$NATIVE_TOOLSDIR" ] && TOOLSDIR=usr