X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fkernel-defaults.mk;h=407c1924a152e8b87bcb402098b8ed0c4b30ac6b;hb=deef71375c78068545ec2b4cb05e8499ade265cd;hp=1c3b428b1661d2fa2e4feb9c0b1eb11992d9dd7d;hpb=1f12a3daaaa8f3525741bef2bc2be7c5c6c77b50;p=openwrt%2Fopenwrt.git

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 1c3b428b16..407c1924a1 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -152,7 +152,7 @@ define Kernel/CopyImage
 		$(KERNEL_CROSS)objcopy $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux$(1).elf; \
 		$(CP) $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux$(1).debug; \
 		$(foreach k, \
-			$(if $(KERNEL_IMAGES),$(KERNEL_IMAGES),$(filter-out dtbs,$(KERNELNAME))), \
+			$(if $(KERNEL_IMAGES),$(KERNEL_IMAGES),$(filter-out vmlinux dtbs,$(KERNELNAME))), \
 			$(CP) $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/$(IMAGES_DIR)/$(k) $(KERNEL_BUILD_DIR)/$(k)$(1); \
 		) \
 	}
@@ -167,7 +167,7 @@ endef
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
 define Kernel/CompileImage/Initramfs
 	$(call Kernel/Configure/Initramfs)
-	$(CP) $(GENERIC_PLATFORM_DIR)/base-files/init $(TARGET_DIR)/init
+	$(CP) $(GENERIC_PLATFORM_DIR)/other-files/init $(TARGET_DIR)/init
 	rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio*
 	+$(MAKE) $(KERNEL_MAKEOPTS) $(if $(KERNELNAME),$(KERNELNAME),all) modules
 	$(call Kernel/CopyImage,-initramfs)