diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-07-31 23:41:21 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-31 23:41:21 +0000 |
| commit | 2cd3c505ec80f9edeb13cc412096c6ccbc6c20c6 (patch) | |
| tree | 731bb69ec710f670856898f150d80ed04b253d27 | |
| parent | 7b3fcd6d28c76a37cd480f58af4d8141c42ce63c (diff) | |
| download | upstream-2cd3c505ec80f9edeb13cc412096c6ccbc6c20c6.tar.gz upstream-2cd3c505ec80f9edeb13cc412096c6ccbc6c20c6.tar.bz2 upstream-2cd3c505ec80f9edeb13cc412096c6ccbc6c20c6.zip | |
image: only call Image/BuildKernel/Initramfs if initramfs is actually enabled
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r41914
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@41918 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/image.mk | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/include/image.mk b/include/image.mk index 9f583ca7ad..b3211e7cb1 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) |