From 4cf91506a9efba7662cdb15440c4d277b6f9f080 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 28 Jun 2008 17:54:44 +0000 Subject: x86: don't attempt to compile grub on darwin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11599 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/x86/image/gen_image.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'target/linux/x86/image/gen_image.sh') diff --git a/target/linux/x86/image/gen_image.sh b/target/linux/x86/image/gen_image.sh index d48e3720d..5d4c0dd34 100755 --- a/target/linux/x86/image/gen_image.sh +++ b/target/linux/x86/image/gen_image.sh @@ -28,10 +28,13 @@ ROOTFSSIZE="$(($4 / 512))" BLOCKS="$((($KERNELSIZE / 2) - 1))" -genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel" -dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc [ -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" which chpax >/dev/null && chpax -zp $(which grub) -- cgit v1.2.3