aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/image
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2017-10-13 14:21:53 +0200
committerJonas Gorski <jonas.gorski@gmail.com>2017-10-26 12:26:25 +0200
commit6f528dfbd91f8e687e36300ab9284d16b78475b4 (patch)
tree75faf15e1027816412a81959e2a344f8118e3d84 /target/linux/ipq806x/image
parent21e59ee3a2310ba1ec80b07614991318c014610e (diff)
downloadupstream-6f528dfbd91f8e687e36300ab9284d16b78475b4.tar.gz
upstream-6f528dfbd91f8e687e36300ab9284d16b78475b4.tar.bz2
upstream-6f528dfbd91f8e687e36300ab9284d16b78475b4.zip
treewide: do not use IMG_PREFIX in Image/Prepare
IMG_PREFIX can be modified in ImageBuilder by passing EXTRA_IMAGE_NAME on command line, but Image/Prepare is not run in ImageBuilder. This causes missing files when IMG_PREFIX is used for target file names in Image/Prepare, then as source file names in Image/BuildKernel or Image/Build. Fix this by using a fixed output file name in Image/Prepare, and copy to the expected file name in Image/BuildKernel instead, which is run by ImageBuilder. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'target/linux/ipq806x/image')
-rw-r--r--target/linux/ipq806x/image/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index 3a76c7ffef..f6f7f421b8 100644
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -6,11 +6,11 @@ include $(INCLUDE_DIR)/image.mk
UBIFS_OPTS = -m 2048 -e 124KiB -c 4096 -U -F
define Image/Prepare
- $(CP) $(LINUX_DIR)/vmlinux $(KDIR)/$(IMG_PREFIX)-vmlinux.elf
+ $(CP) $(LINUX_DIR)/vmlinux $(KDIR)/vmlinux-unstripped.elf
endef
define Image/BuildKernel
- $(CP) $(KDIR)/$(IMG_PREFIX)-vmlinux.elf $(BIN_DIR)
+ $(CP) $(KDIR)/vmlinux-unstripped.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf
endef
define Image/Build/squashfs