Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-09 02:43:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

image: only call Image/BuildKernel/Initramfs if initramfs is actually enabled

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41914
This commit is contained in:
Felix Fietkau 2014-07-31 23:40:37 +00:00
parent 69c403c234
commit 0a9ee89dbd
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/image.mk
View File

@ -77,15 +77,10 @@ define prepare_generic_squashfs
$(STAGING_DIR_HOST)/bin/padjffs2 $(1) 4 8 16 64 128 256 $(STAGING_DIR_HOST)/bin/padjffs2 $(1) 4 8 16 64 128 256
endef 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 cp $(KDIR)/vmlinux-initramfs.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs.elf
$(call Image/Build/Initramfs) $(call Image/Build/Initramfs)
endef endef
else
define Image/BuildKernel/Initramfs
endef
endif
define Image/BuildKernel/MkuImage define Image/BuildKernel/MkuImage
mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \ mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
@ -269,7 +264,7 @@ define BuildImage
$(call Image/Prepare) $(call Image/Prepare)
$(call Image/mkfs/prepare) $(call Image/mkfs/prepare)
$(call Image/BuildKernel) $(call Image/BuildKernel)
$(call Image/BuildKernel/Initramfs) $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Image/BuildKernel/Initramfs))
$(call Image/InstallKernel) $(call Image/InstallKernel)
$(call Image/mkfs/cpiogz) $(call Image/mkfs/cpiogz)
$(call Image/mkfs/targz) $(call Image/mkfs/targz)
@ -283,7 +278,7 @@ define BuildImage
else else
install: compile install-targets install: compile install-targets
$(call Image/BuildKernel) $(call Image/BuildKernel)
$(call Image/BuildKernel/Initramfs) $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Image/BuildKernel/Initramfs))
$(call Image/InstallKernel) $(call Image/InstallKernel)
$(call Image/mkfs/cpiogz) $(call Image/mkfs/cpiogz)
$(call Image/mkfs/targz) $(call Image/mkfs/targz)