kernel: fix remaining initramfs related breakage
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 23 Jul 2013 13:11:41 +0000 (13:11 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 23 Jul 2013 13:11:41 +0000 (13:11 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37518 3c298f89-4303-0410-b956-a3cf2f4a3e73

include/kernel-defaults.mk

index c6f02e6..48f2b2a 100644 (file)
@@ -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))
        #")