Mercurial > hg > aboriginal
changeset 1070:aff60442c494
Don't overwrite existing files when collating root filesystem and native compiler. (It lobomizes busybox due to "strings" and such.)
author | Rob Landley <rob@landley.net> |
---|---|
date | Sat, 08 May 2010 01:00:01 -0500 |
parents | 3df307ef6007 |
children | 52a1b6c88128 |
files | build.sh |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/build.sh Thu May 06 00:06:30 2010 -0500 +++ b/build.sh Sat May 08 01:00:01 2010 -0500 @@ -108,11 +108,11 @@ rm -rf "$BUILD/root-filesystem-$ARCH/usr/lib" 2>/dev/null - # Copy native compiler + # Copy native compiler, but do not overwrite existing files (which could + # do bad things to busybox). - [ -z "$ROOT_NODIRS" ] && USRDIR="/usr" || USRDIR="" - - cp -a "$BUILD/native-compiler-$ARCH/." \ + [ -z "$ROOT_NODIRS" ] && USRDIR="/usr" || USRDIR="" + yes 'n' | cp -ia "$BUILD/native-compiler-$ARCH/." \ "$BUILD/root-filesystem-$ARCH$USRDIR" || dienow fi