Mercurial > hg > aboriginal
changeset 1188:13c22a46b1c9
Now that extract_packages is separate from setupfor, EXTRACT_ALL=1 should be less brittle. (If not, needs to be fixed, so remove workarounds.)
| author | Rob Landley <rob@landley.net> |
|---|---|
| date | Sun, 01 Aug 2010 15:20:00 -0500 |
| parents | 878dbfe76341 |
| children | 9cf24282eecf |
| files | sources/native-builds/gentoo-stage1.sh sources/native-builds/static-tools.sh |
| diffstat | 2 files changed, 10 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/sources/native-builds/gentoo-stage1.sh Sun Aug 01 15:19:00 2010 -0500 +++ b/sources/native-builds/gentoo-stage1.sh Sun Aug 01 15:20:00 2010 -0500 @@ -24,10 +24,17 @@ [ $# -ne 1 ] && echo "usage: $0 FILENAME" >&2 && exit 1 [ -e "$1" ] && echo "$1" exists && exit 0 +# We use a lot of our own directories because we may have the same packages +# as the aboriginal build, but use different versions. So keep things separate +# so they don't interfere. + NATIVE_BUILDS="$SOURCES/native-builds" PATCHDIR="$NATIVE_BUILDS/gentoo-stage1-patches" SRCDIR="$SRCDIR/gentoo-stage1" && mkdir -p "$SRCDIR" || dienow WORK="$WORK"/gentoo-stage1 && blank_tempdir "$WORK" +SRCTREE="$WORK" + +EXTRACT_ALL=1 echo "=== Download source code." @@ -57,16 +64,6 @@ cleanup_oldfiles -# The reason this is isn't grouped together with the downloads above is when -# you download a new version but haven't deleted the old one yet, setupfor -# gets confused. - -setupfor zlib -setupfor ncurses -setupfor Python -setupfor bash -setupfor portage - cp -a "$NATIVE_BUILDS/gentoo-stage1-files/." "$WORK" && cd "$TOP" && mksquashfs "$WORK" "$1" -noappend -all-root || dienow
--- a/sources/native-builds/static-tools.sh Sun Aug 01 15:19:00 2010 -0500 +++ b/sources/native-builds/static-tools.sh Sun Aug 01 15:20:00 2010 -0500 @@ -11,9 +11,11 @@ [ -e "$1" ] && echo "$1" exists && exit 0 PATCHDIR="$SOURCES/native-builds/static-tools-patches" -ls $PATCHDIR SRCDIR="$SRCDIR/native" && mkdir -p "$SRCDIR" || dienow WORK="$WORK"/static-tools && blank_tempdir "$WORK" +SRCTREE="$WORK" + +EXTRACT_ALL=1 echo "=== Download source code." @@ -35,10 +37,6 @@ cleanup_oldfiles -setupfor strace -setupfor zlib -setupfor dropbear - cat > "$WORK"/init << 'EOF' || dienow #!/bin/bash