Mercurial > hg > aboriginal
changeset 1274:b41dbea3ba14
When building control images, the working directory should be in build/control-images.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sun, 07 Nov 2010 15:54:37 -0600 |
parents | dadbb8873a36 |
children | a4cb2ed0a551 |
files | sources/native-builds/bootstrap-skeleton/control-image-wrapper.sh sources/native-builds/busybox-test.sh sources/native-builds/hello-world.sh sources/native-builds/lfs-bootstrap/mnt/build/inetutils.sh sources/native-builds/static-tools.sh |
diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/sources/native-builds/bootstrap-skeleton/control-image-wrapper.sh Sun Nov 07 13:59:42 2010 -0600 +++ b/sources/native-builds/bootstrap-skeleton/control-image-wrapper.sh Sun Nov 07 15:54:37 2010 -0600 @@ -20,12 +20,12 @@ # versions, and we don't want our cleanup_oldfiles to overlap.) PATCHDIR="$MYDIR/patches" -SRCDIR="$SRCDIR/$IMAGENAME" && mkdir -p "$SRCDIR" || dienow +SRCDIR="$SRCDIR/control-images/$IMAGENAME" && mkdir -p "$SRCDIR" || dienow # Include package cache in the control image, so the target system image can # build from this source. -WORK="$WORK/$IMAGENAME" && +WORK="$BUILD/control-images/$IMAGENAME" && blank_tempdir "$WORK" && SRCTREE="$WORK/packages" && mkdir "$SRCTREE" &&
--- a/sources/native-builds/busybox-test.sh Sun Nov 07 13:59:42 2010 -0600 +++ b/sources/native-builds/busybox-test.sh Sun Nov 07 15:54:37 2010 -0600 @@ -7,7 +7,7 @@ [ $# -ne 1 ] && echo "usage: $0 FILENAME" >&2 && exit 1 [ -e "$1" ] && echo "$1" exists && exit 0 -WORK="$WORK"/busybox-test && blank_tempdir "$WORK" +WORK="$BUILD/control-images/busybox-test" && blank_tempdir "$WORK" # Don't download busybox, it's got to already be there in standard sources.
--- a/sources/native-builds/hello-world.sh Sun Nov 07 13:59:42 2010 -0600 +++ b/sources/native-builds/hello-world.sh Sun Nov 07 15:54:37 2010 -0600 @@ -12,7 +12,7 @@ # Set up working directories -WORK="$WORK"/hello-world +WORK="$BUILD/control-images/hello-world" blank_tempdir "$WORK" cat > "$WORK"/init << 'EOF' || dienow
--- a/sources/native-builds/static-tools.sh Sun Nov 07 13:59:42 2010 -0600 +++ b/sources/native-builds/static-tools.sh Sun Nov 07 15:54:37 2010 -0600 @@ -12,7 +12,7 @@ PATCHDIR="$SOURCES/native-builds/static-tools-patches" SRCDIR="$SRCDIR/native" && mkdir -p "$SRCDIR" || dienow -WORK="$WORK"/static-tools && blank_tempdir "$WORK" +WORK="$BUILD/control-images/static-tools" && blank_tempdir "$WORK" SRCTREE="$WORK" EXTRACT_ALL=1