[uml] fix linking failures against memcpy on x86_64, fix runtime tested successfully

[openwrt.git] / 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 d48e372..5d4c0dd 100755 (executable)
--- 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)