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
This commit is contained in:
parent
f1366075bb
commit
1ca850fd0c
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue