Author: nbd Date: 2014-08-01 01:41:21 +0200 (Fri, 01 Aug 2014) New Revision: 41918
Modified: branches/barrier_breaker/include/image.mk Log: image: only call Image/BuildKernel/Initramfs if initramfs is actually enabled Signed-off-by: Felix Fietkau <[email protected]> Backport of r41914 Modified: branches/barrier_breaker/include/image.mk =================================================================== --- branches/barrier_breaker/include/image.mk 2014-07-31 23:40:49 UTC (rev 41917) +++ branches/barrier_breaker/include/image.mk 2014-07-31 23:41:21 UTC (rev 41918) @@ -77,15 +77,10 @@ $(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 @@ $(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 @@ 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) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
