diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2017-07-11 02:49:34 +0200 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-07-14 04:09:16 +0200 |
| commit | a576ed5437b00e0984712c6f38f8c11b0ed15b48 (patch) | |
| tree | 4bb4f8e16df8e9d8f2de1004b1b5626af8347464 /target/linux/x86 | |
| parent | c2a11bc8e44af3259a4bed99b46e8a7db6a18c81 (diff) | |
| download | upstream-a576ed5437b00e0984712c6f38f8c11b0ed15b48.tar.gz upstream-a576ed5437b00e0984712c6f38f8c11b0ed15b48.tar.bz2 upstream-a576ed5437b00e0984712c6f38f8c11b0ed15b48.zip | |
scripts/gen_image_generic.sh: move from x86/image
The script can also be useful for other targets.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/x86')
| -rw-r--r-- | target/linux/x86/image/Makefile | 2 | ||||
| -rwxr-xr-x | target/linux/x86/image/gen_image_generic.sh | 37 |
2 files changed, 1 insertions, 38 deletions
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index d3005d79c3..8a3cb327e3 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -83,7 +83,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),) -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ -e 's#@ROOT@#$(GRUB_ROOT)#g' \ ./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg - PADDING="$(CONFIG_TARGET_IMAGES_PAD)" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" ./gen_image_generic.sh \ + PADDING="$(CONFIG_TARGET_IMAGES_PAD)" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" $(SCRIPT_DIR)/gen_image_generic.sh \ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \ diff --git a/target/linux/x86/image/gen_image_generic.sh b/target/linux/x86/image/gen_image_generic.sh deleted file mode 100755 index 17d969b96b..0000000000 --- a/target/linux/x86/image/gen_image_generic.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/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} ${SIGNATURE:+-S 0x$SIGNATURE}` - -KERNELOFFSET="$(($1 / 512))" -KERNELSIZE="$2" -ROOTFSOFFSET="$(($3 / 512))" -ROOTFSSIZE="$(($4 / 512))" - -[ -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 - -make_ext4fs -J -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR" -dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc -rm -f "$OUTPUT.kernel" |