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 | c8a91544bb6d67ffc74599af7e22922b6b94313c (patch) | |
tree | ab62a5e22c7924d91ad07f8b3f591b1020b84061 /include | |
parent | fb2649fbfe5ac81f04ddd76e4fe5b0fffeb8a609 (diff) | |
download | upstream-c8a91544bb6d67ffc74599af7e22922b6b94313c.tar.gz upstream-c8a91544bb6d67ffc74599af7e22922b6b94313c.tar.bz2 upstream-c8a91544bb6d67ffc74599af7e22922b6b94313c.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44018 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-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))) |