diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-01-18 00:34:57 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-01-18 00:34:57 +0000 |
| commit | 91ce10a184ec97ec0c9a748ee0a9c88664c7305f (patch) | |
| tree | 8ba8784d2a0ccd881d0656e8adb9d5e10d75addd | |
| parent | 632be658d5267c006e5ce7594f4631995437f5bf (diff) | |
| download | upstream-91ce10a184ec97ec0c9a748ee0a9c88664c7305f.tar.gz upstream-91ce10a184ec97ec0c9a748ee0a9c88664c7305f.tar.bz2 upstream-91ce10a184ec97ec0c9a748ee0a9c88664c7305f.zip | |
build: allow changing kernel name in new image code
Necessary for targets using zImage or other kernel
image types.
Signed-off-by: Claudio Leite <leitec@staticky.com>
SVN-Revision: 44018
| -rw-r--r-- | include/image.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/image.mk b/include/image.mk index eddf605ddf..e0f12e0e87 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))) |