From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 23 Jul 2013 13:11:41 +0000 (+0000)
Subject: kernel: fix remaining initramfs related breakage
X-Git-Tag: reboot~9718
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bb494ed639914c30b732d091fbe941d78927e16f;p=oweals%2Fopenwrt.git

kernel: fix remaining initramfs related breakage

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

SVN-Revision: 37518
---

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index c6f02e6514..48f2b2ab75 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -134,7 +134,7 @@ endif
 endef
 
 define Kernel/CompileImage/Default
-	$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),,rm -f $(TARGET_DIR)/init)
+	rm -f $(TARGET_DIR)/init
 	+$(MAKE) $(KERNEL_MAKEOPTS) $(subst ",,$(KERNELNAME))
 	#")
 	$(call Kernel/CopyImage)
@@ -143,7 +143,7 @@ endef
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
 define Kernel/CompileImage/Initramfs
 	$(call Kernel/Configure/Initramfs)
-	$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),,rm -f $(TARGET_DIR)/init)
+	$(CP) $(GENERIC_PLATFORM_DIR)/base-files/init $(TARGET_DIR)/init
 	rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio*
 	+$(MAKE) $(KERNEL_MAKEOPTS) $(subst ",,$(KERNELNAME))
 	#")