X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fkernel-defaults.mk;h=529b330851142f4cd258864d3a0062902354a20e;hb=597d9811aee6be6ebfd7114ad287806ea659d379;hp=d69b2e4d55765f5cd50443ecd12773432f5b6e55;hpb=d6ce92de58071d353f27a06e512fe6964519af4a;p=openwrt-10.03%2F.git

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index d69b2e4d5..529b33085 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -27,11 +27,11 @@ KERNEL_MAKEOPTS := -C $(LINUX_DIR) \
 	ARCH="$(LINUX_KARCH)" \
 	CONFIG_SHELL="$(BASH)"
 
+# defined in quilt.mk
+Kernel/Patch:=$(Kernel/Patch/Default)
 define Kernel/Prepare/Default
 	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
-	if [ -d $(GENERIC_PLATFORM_DIR)/patches ]; then $(PATCH) $(LINUX_DIR) $(GENERIC_PLATFORM_DIR)/patches; fi
-	if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi
-	if [ -d ./patches ]; then $(PATCH) $(LINUX_DIR) ./patches; fi
+	$(Kernel/Patch)
 endef
 
 define Kernel/Configure/2.4
@@ -40,7 +40,7 @@ define Kernel/Configure/2.4
 	$(MAKE) $(KERNEL_MAKEOPTS) dep
 endef
 define Kernel/Configure/2.6
-	$(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" oldconfig prepare scripts
+	-$(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" oldconfig prepare scripts
 endef
 define Kernel/Configure/Default
 	@if [ -f "./config/profile-$(PROFILE)" ]; then \
@@ -67,14 +67,12 @@ ifeq ($(KERNEL),2.6)
 		echo 'CONFIG_INITRAMFS_SOURCE="../../root"' >> $(LINUX_DIR)/.config
 		echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
 		echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
-		mkdir -p $(BUILD_DIR)/root/etc/init.d
-		$(CP) $(GENERIC_PLATFORM_DIR)/files/init $(BUILD_DIR)/root/
     endef
   else
     define Kernel/SetInitramfs
 		mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
 		grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
-		rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs
+		rm -f $(BUILD_DIR)/root/init
 		echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
     endef
   endif