From 1ca850fd0c49c3228d36a76f4438319fd427a2c2 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 31 Jul 2014 23:41:21 +0000 Subject: [PATCH] image: only call Image/BuildKernel/Initramfs if initramfs is actually enabled Signed-off-by: Felix Fietkau Backport of r41914 git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@41918 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/include/image.mk b/include/image.mk index 9f583ca..b3211e7 100644 --- a/include/image.mk +++ b/include/image.mk @@ -77,15 +77,10 @@ define prepare_generic_squashfs $(STAGING_DIR_HOST)/bin/padjffs2 $(1) 4 8 16 64 128 256 endef -ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) - define Image/BuildKernel/Initramfs +define Image/BuildKernel/Initramfs cp $(KDIR)/vmlinux-initramfs.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs.elf $(call Image/Build/Initramfs) - endef -else - define Image/BuildKernel/Initramfs - endef -endif +endef define Image/BuildKernel/MkuImage mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \ @@ -269,7 +264,7 @@ define BuildImage $(call Image/Prepare) $(call Image/mkfs/prepare) $(call Image/BuildKernel) - $(call Image/BuildKernel/Initramfs) + $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Image/BuildKernel/Initramfs)) $(call Image/InstallKernel) $(call Image/mkfs/cpiogz) $(call Image/mkfs/targz) @@ -283,7 +278,7 @@ define BuildImage else install: compile install-targets $(call Image/BuildKernel) - $(call Image/BuildKernel/Initramfs) + $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Image/BuildKernel/Initramfs)) $(call Image/InstallKernel) $(call Image/mkfs/cpiogz) $(call Image/mkfs/targz)