diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-09-22 20:10:35 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-09-22 20:10:35 +0000 |
commit | ce4244c8afe4f83252b7776b40e5d47765fb7008 (patch) | |
tree | 44ea4ea6417cb20f0750b0aeaf48600aacbf80ad | |
parent | 6c02dd2b042ed9bd09a3a9899f4661bf13d82741 (diff) | |
download | master-31e0f0ae-ce4244c8afe4f83252b7776b40e5d47765fb7008.tar.gz master-31e0f0ae-ce4244c8afe4f83252b7776b40e5d47765fb7008.tar.bz2 master-31e0f0ae-ce4244c8afe4f83252b7776b40e5d47765fb7008.zip |
x86: split generic image building into a separate script
SVN-Revision: 33511
-rwxr-xr-x | target/linux/x86/image/gen_image_generic.sh | 39 | ||||
-rwxr-xr-x | target/linux/x86/image/gen_image_grub.sh | 37 |
2 files changed, 40 insertions, 36 deletions
diff --git a/target/linux/x86/image/gen_image_generic.sh b/target/linux/x86/image/gen_image_generic.sh new file mode 100755 index 0000000000..9d11efbb05 --- /dev/null +++ b/target/linux/x86/image/gen_image_generic.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +# Copyright (C) 2006-2012 OpenWrt.org +set -x +[ $# == 5 -o $# == 6 ] || { + echo "SYNTAX: $0 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image> [<align>]" + exit 1 +} + +OUTPUT="$1" +KERNELSIZE="$2" +KERNELDIR="$3" +ROOTFSSIZE="$4" +ROOTFSIMAGE="$5" +ALIGN="$6" + +rm -f "$OUTPUT" + +head=16 +sect=63 +cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512))) + +# create partition table +set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN}` + +KERNELOFFSET="$(($1 / 512))" +KERNELSIZE="$(($2 / 512))" +ROOTFSOFFSET="$(($3 / 512))" +ROOTFSSIZE="$(($4 / 512))" + +BLOCKS="$((($KERNELSIZE / 2) - 1))" + +[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE" +dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc + +[ -n "$NOGRUB" ] && exit 0 + +genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel" +dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc +rm -f "$OUTPUT.kernel" diff --git a/target/linux/x86/image/gen_image_grub.sh b/target/linux/x86/image/gen_image_grub.sh index e1d1b92dda..9a84322f44 100755 --- a/target/linux/x86/image/gen_image_grub.sh +++ b/target/linux/x86/image/gen_image_grub.sh @@ -1,41 +1,6 @@ #!/usr/bin/env bash # Copyright (C) 2006-2010 OpenWrt.org -set -x -[ $# == 5 ] || { - echo "SYNTAX: $0 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image>" - exit 1 -} - -OUTPUT="$1" -KERNELSIZE="$2" -KERNELDIR="$3" -ROOTFSSIZE="$4" -ROOTFSIMAGE="$5" - -rm -f "$OUTPUT" - -head=16 -sect=63 -cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512))) - -# create partition table -set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m` - -KERNELOFFSET="$(($1 / 512))" -KERNELSIZE="$(($2 / 512))" -ROOTFSOFFSET="$(($3 / 512))" -ROOTFSSIZE="$(($4 / 512))" - -BLOCKS="$((($KERNELSIZE / 2) - 1))" - -[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE" -dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc - -[ -n "$NOGRUB" ] && exit 0 - -genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel" -dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc -rm -f "$OUTPUT.kernel" +. ./gen_image_generic.sh which chpax >/dev/null && chpax -zp $(which grub) grub --batch --no-curses --no-floppy --device-map=/dev/null <<EOF |