Mercurial > hg > aboriginal
changeset 155:ce1ca3d0f95b 0.2.1
Put zImage-$ARCH in build directory, not mini-native-$ARCH, and eliminate
run-mini-native.sh in favor of generating a run script per target.
| author | Rob Landley <rob@landley.net> |
|---|---|
| date | Mon, 09 Apr 2007 12:09:40 -0400 |
| parents | 47b14e5d6117 |
| children | ad6b2ba3ea2d |
| files | build.sh include.sh mini-native.sh run-mini-native.sh sources/configs/armv4l sources/configs/armv5l sources/configs/i586 sources/configs/i686 sources/configs/mipsel sources/configs/powerpc sources/configs/sparc sources/configs/x86_64 |
| diffstat | 12 files changed, 31 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/build.sh Mon Apr 09 12:06:12 2007 -0400 +++ b/build.sh Mon Apr 09 12:09:40 2007 -0400 @@ -19,6 +19,7 @@ do echo "=== Building ARCH $i" ./cross-compiler.sh $i || exit 1 + echo "=== native ($i)" ./mini-native.sh $i || exit 1 ./package-mini-native.sh $i || exit 1 done
--- a/include.sh Mon Apr 09 12:06:12 2007 -0400 +++ b/include.sh Mon Apr 09 12:09:40 2007 -0400 @@ -217,6 +217,11 @@ export NATIVE="${BUILD}/mini-native-$ARCH" export PATH="${CROSS}/bin:$PATH" export IMAGE="${BUILD}/image-${ARCH}.ext2" + + + emulator_command image-$ARCH.ext2 zImage-$ARCH \ + "rw init=/tools/bin/sh panic=1 PATH=/tools/bin" > "$BUILD/run-$ARCH.sh" && + chmod +x "$BUILD/run-$ARCH.sh" fi mkdir -p "${WORK}"
--- a/mini-native.sh Mon Apr 09 12:06:12 2007 -0400 +++ b/mini-native.sh Mon Apr 09 12:09:40 2007 -0400 @@ -24,7 +24,7 @@ # build bootable kernel for target make ARCH="${KARCH}" allnoconfig KCONFIG_ALLCONFIG="${WORK}/miniconfig-linux" && make ARCH="${KARCH}" CROSS_COMPILE="${ARCH}-" && -cp "${KERNEL_PATH}" "${NATIVE}/zImage-${ARCH}" && +cp "${KERNEL_PATH}" "${BUILD}/zImage-${ARCH}" && cd .. && $CLEANUP linux-*
--- a/run-mini-native.sh Mon Apr 09 12:06:12 2007 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -#!/bin/sh - -source include.sh - -INIT="$2" -[ -z "$INIT" ] && INIT=/tools/bin/sh -run_emulator build/image-"$1".ext2 build/mini-native-"$1"/zImage-"$1" \ - "rw init=$INIT panic=1 PATH=/tools/bin"
--- a/sources/configs/armv4l Mon Apr 09 12:06:12 2007 -0400 +++ b/sources/configs/armv4l Mon Apr 09 12:09:40 2007 -0400 @@ -3,10 +3,10 @@ GCC_FLAGS="--with-float=soft" BINUTILS_FLAGS= QEMU_TEST=$KARCH -run_emulator() +emulator_command() { - qemu-system-arm -M versatilepb -nographic -no-reboot -hda "$1" \ - -kernel "$2" -append "$3 root=/dev/sda console=ttyAMA0" + echo qemu-system-arm -M versatilepb -nographic -no-reboot -hda "$1" \ + -kernel "$2" -append "'$3 root=/dev/sda console=ttyAMA0'" } # Write out uClibc .config file.
--- a/sources/configs/armv5l Mon Apr 09 12:06:12 2007 -0400 +++ b/sources/configs/armv5l Mon Apr 09 12:09:40 2007 -0400 @@ -3,10 +3,10 @@ GCC_FLAGS= BINUTILS_FLAGS= QEMU_TEST=$KARCH -run_emulator() +emulator_command() { - qemu-system-arm -M versatilepb -nographic -no-reboot -hda "$1" \ - -kernel "$2" -append "$3 root=/dev/sda console=ttyAMA0" + echo qemu-system-arm -M versatilepb -nographic -no-reboot -hda "$1" \ + -kernel "$2" -append "'$3 root=/dev/sda console=ttyAMA0'" } # Write out uClibc .config file.
--- a/sources/configs/i586 Mon Apr 09 12:06:12 2007 -0400 +++ b/sources/configs/i586 Mon Apr 09 12:09:40 2007 -0400 @@ -4,6 +4,11 @@ GCC_FLAGS= QEMU_TEST=$KARCH +emulator_command() +{ + echo qemu -nographic -hda "$1" -kernel "$2" -append "'$3 root=/dev/hda console=ttyS0'" +} + # Write out uClibc .config file. cat > "${WORK}"/miniconfig-uClibc << 'EOF'
--- a/sources/configs/i686 Mon Apr 09 12:06:12 2007 -0400 +++ b/sources/configs/i686 Mon Apr 09 12:09:40 2007 -0400 @@ -4,9 +4,9 @@ GCC_FLAGS= QEMU_TEST=$KARCH -run_emulator() +emulator_command() { - qemu -nographic -hda "$1" -kernel "$2" -append "$3 root=/dev/hda console=ttyS0" + echo qemu -nographic -hda "$1" -kernel "$2" -append "'$3 root=/dev/hda console=ttyS0'" } # Write out uClibc .config file.
--- a/sources/configs/mipsel Mon Apr 09 12:06:12 2007 -0400 +++ b/sources/configs/mipsel Mon Apr 09 12:09:40 2007 -0400 @@ -4,10 +4,10 @@ GCC_FLAGS= QEMU_TEST=mipsel -run_emulator() +emulator_command() { - qemu-system-mipsel -M mips -no-reboot -nographic -hda "$1" -kernel "$2" \ - -append "$3 console=ttyS0 root=/dev/hda" + echo qemu-system-mipsel -M mips -no-reboot -nographic -hda "$1" -kernel "$2" \ + -append "'$3 console=ttyS0 root=/dev/hda'" } # Write out uClibc .config file.
--- a/sources/configs/powerpc Mon Apr 09 12:06:12 2007 -0400 +++ b/sources/configs/powerpc Mon Apr 09 12:09:40 2007 -0400 @@ -3,10 +3,10 @@ GCC_FLAGS= BINUTILS_FLAGS= QEMU_TEST= #ppc -run_emulator() +emulator_command() { - qemu-system-ppc -M prep -nographic -hda "$1" \ - -kernel "$2" -append "$3 root=/dev/hda console=/dev/ttyS0" + echo qemu-system-ppc -M prep -nographic -hda "$1" \ + -kernel "$2" -append "'$3 root=/dev/hda console=/dev/ttyS0'" } # Write out Linux kernel .config file
--- a/sources/configs/sparc Mon Apr 09 12:06:12 2007 -0400 +++ b/sources/configs/sparc Mon Apr 09 12:09:40 2007 -0400 @@ -5,10 +5,10 @@ BINUTILS_FLAGS= GCC_FLAGS= QEMU_TEST=$KARCH -run_emulator() +emulator_command() { - qemu-system-sparc -nographic -no-reboot -hda "$1" \ - -kernel "$2" -append "$3 root=/dev/sda console=ttyS0" + echo qemu-system-sparc -nographic -no-reboot -hda "$1" \ + -kernel "$2" -append "'$3 root=/dev/sda console=ttyS0'" }
--- a/sources/configs/x86_64 Mon Apr 09 12:06:12 2007 -0400 +++ b/sources/configs/x86_64 Mon Apr 09 12:09:40 2007 -0400 @@ -4,9 +4,9 @@ BINUTILS_FLAGS="--enable-64-bit-bfd" QEMU_TEST= -run_emulator() +emulator_command() { - qemu-system-x86_64 -nographic -hda "$1" -kernel "$2" -append "$3 root=/dev/hda console=ttyS0" + echo qemu-system-x86_64 -nographic -hda "$1" -kernel "$2" -append "'$3 root=/dev/hda console=ttyS0'" } # Write out uClibc .config file.