[OpenWrt-Devel] build: allow changing kernel name in new image code
diff mbox

Message ID 1421534900-20485-1-git-send-email-leitec@staticky.com
State Accepted
Headers show

Commit Message

Claudio Leite Jan. 17, 2015, 10:48 p.m. UTC
Necessary for targets using zImage or other kernel
image types.

Signed-off-by: Claudio Leite <leitec@staticky.com>
---
 include/image.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Felix Fietkau Jan. 18, 2015, 12:37 a.m. UTC | #1
On 2015-01-17 23:48, Claudio Leite wrote:
> Necessary for targets using zImage or other kernel
> image types.
> 
> Signed-off-by: Claudio Leite <leitec@staticky.com>
Committed in r44018, thanks.

- Felix

Patch
diff mbox

diff --git a/include/image.mk b/include/image.mk
index eddf605..e0f12e0 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -341,6 +341,7 @@  define Device/Init
   KERNEL_INITRAMFS_PREFIX = $$(IMAGE_PREFIX)-initramfs
   KERNEL_INITRAMFS_IMAGE = $$(KERNEL_INITRAMFS_PREFIX)$$(KERNEL_SUFFIX)
   KERNEL_INSTALL :=
+  KERNEL_NAME := vmlinux
   KERNEL_SIZE :=
 
   FILESYSTEMS := $(TARGET_FILESYSTEMS)
@@ -362,7 +363,7 @@  define Device/Build/initramfs
   $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_INITRAMFS_IMAGE)
 	cp $$^ $$@
 
-  $(KDIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/vmlinux-initramfs
+  $(KDIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_NAME)-initramfs
 	@rm -f $$@
 	$$(call concat_cmd,$$(KERNEL_INITRAMFS))
 endef
@@ -378,7 +379,7 @@  define Device/Build/kernel
   $$(_TARGET): $$(if $$(KERNEL_INSTALL),$(BIN_DIR)/$$(KERNEL_IMAGE))
   $(BIN_DIR)/$$(KERNEL_IMAGE): $(KDIR)/$$(KERNEL_IMAGE)
 	cp $$^ $$@
-  $(KDIR)/$$(KERNEL_IMAGE): $(KDIR)/vmlinux
+  $(KDIR)/$$(KERNEL_IMAGE): $(KDIR)/$$(KERNEL_NAME)
 	@rm -f $$@
 	$$(call concat_cmd,$$(KERNEL))
 	$$(if $$(KERNEL_SIZE),$$(call Device/Build/check_size,$$(KERNEL_SIZE)))