aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2017-07-11 02:49:34 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2017-07-14 04:09:16 +0200
commita576ed5437b00e0984712c6f38f8c11b0ed15b48 (patch)
tree4bb4f8e16df8e9d8f2de1004b1b5626af8347464
parentc2a11bc8e44af3259a4bed99b46e8a7db6a18c81 (diff)
downloadupstream-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>
-rwxr-xr-xscripts/gen_image_generic.sh (renamed from target/linux/x86/image/gen_image_generic.sh)0
-rw-r--r--target/linux/x86/image/Makefile2
2 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/x86/image/gen_image_generic.sh b/scripts/gen_image_generic.sh
index 17d969b96b..17d969b96b 100755
--- a/target/linux/x86/image/gen_image_generic.sh
+++ b/scripts/gen_image_generic.sh
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) \