comparison root-filesystem.sh @ 1332:42496ee2815f

Fix regression: make #!/bin/sh point to bash instead of busybox shell for dev environment. (Oops.)
author Rob Landley <rob@landley.net>
date Mon, 14 Mar 2011 18:46:08 -0500
parents 78e786334c5b
children c7dfe0e54a80
comparison
equal deleted inserted replaced
1331:29e1df07e99a 1332:42496ee2815f
14 echo "No $BUILD/native-compiler-$ARCH" >&2 && 14 echo "No $BUILD/native-compiler-$ARCH" >&2 &&
15 exit 1 15 exit 1
16 16
17 cp -a "$BUILD/simple-root-filesystem-$ARCH/." "$STAGE_DIR" || dienow 17 cp -a "$BUILD/simple-root-filesystem-$ARCH/." "$STAGE_DIR" || dienow
18 18
19 # Remove shared libraries copied from cross compiler. 19 # Remove shared libraries copied from cross compiler, and let /bin/sh point
20 # to bash out of native compiler instead of busybox shell.
20 21
21 rm -rf "$BUILD/root-filesystem-$ARCH/usr/lib" 2>/dev/null 22 rm -rf "$BUILD/root-filesystem-$ARCH/"{usr/lib,bin/sh} 2>/dev/null
22 23
23 # Copy native compiler, but do not overwrite existing files (which could 24 # Copy native compiler, but do not overwrite existing files (which could
24 # do bad things to busybox). 25 # do bad things to busybox).
25 26
26 [ -z "$ROOT_NODIRS" ] && USRDIR="/usr" || USRDIR="" 27 [ -z "$ROOT_NODIRS" ] && USRDIR="/usr" || USRDIR=""