aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-04-20 13:57:43 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-04-20 13:57:43 +0000
commit0ee950491197e8c528249d64ca3276b39bad0ddd (patch)
treed114f48ebb450250489833cdd8c4bf2ac61e5d9b /target/linux/x86
parent3edc273a332b08773068e0e1c974ad40fe58b9b9 (diff)
downloadupstream-0ee950491197e8c528249d64ca3276b39bad0ddd.tar.gz
upstream-0ee950491197e8c528249d64ca3276b39bad0ddd.tar.bz2
upstream-0ee950491197e8c528249d64ca3276b39bad0ddd.zip
all: replace genext2fs with make_ext4fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 45517
Diffstat (limited to 'target/linux/x86')
-rwxr-xr-xtarget/linux/x86/image/gen_image_generic.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/x86/image/gen_image_generic.sh b/target/linux/x86/image/gen_image_generic.sh
index 3fb31f6e40..17d969b96b 100755
--- a/target/linux/x86/image/gen_image_generic.sh
+++ b/target/linux/x86/image/gen_image_generic.sh
@@ -23,17 +23,15 @@ cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512)))
set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE}`
KERNELOFFSET="$(($1 / 512))"
-KERNELSIZE="$(($2 / 512))"
+KERNELSIZE="$2"
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"
+make_ext4fs -J -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR"
dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc
rm -f "$OUTPUT.kernel"