X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/39478055b206d9b3bf8027dbe3f73efcc7fed134..1421adab2d899e4f353ba903d3ef75077f34dd21:/target/linux/kernel.mk

diff --git a/target/linux/kernel.mk b/target/linux/kernel.mk
index 22c6d8412..56817dbab 100644
--- a/target/linux/kernel.mk
+++ b/target/linux/kernel.mk
@@ -1,6 +1,6 @@
 LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
-LINUX_SITE=http://www.fi.kernel.org/pub/linux/kernel/v$(KERNEL) \
-           http://www.fr.kernel.org/pub/linux/kernel/v$(KERNEL) \
+LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
+           http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
            http://www.kernel.org/pub/linux/kernel/v$(KERNEL) \
            http://www.de.kernel.org/pub/linux/kernel/v$(KERNEL)
 
@@ -38,7 +38,7 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
 $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done
 else
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
-	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare $(MAKE_TRACE)
+	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts $(MAKE_TRACE)
 	touch $@
 endif
 
@@ -55,15 +55,10 @@ $(LINUX_DIR)/.modules_done:
 	$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install $(MAKE_TRACE)
 	touch $(LINUX_DIR)/.modules_done
 
-# $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
-# 	mkdir -p $(STAGING_DIR)/include
-# 	tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/include/
-# 	tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/
-
 $(STAMP_DIR)/.linux-compile:
 	@$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) $(MAKE_TRACE)
 	ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux $(MAKE_TRACE)
-	@$(TRACE) target/linux/package/compile
+	@$(TRACE) target/linux/package-compile
 	$(MAKE) -C $(TOPDIR)/target/linux/package \
 		$(KPKG_MAKEOPTS) \
 		compile
@@ -97,9 +92,9 @@ prepare:
 compile: prepare $(STAMP_DIR)/.linux-compile
 
 install: compile
-	@$(TRACE) target/linux/package/install
-	$(MAKE) pkg-install $(MAKE_TRACE)
-	$(MAKE) $(LINUX_KERNEL) $(MAKE_TRACE)
+	@$(TRACE) target/linux/package-install
+	$(MAKE) $(KPKG_MAKEOPTS) pkg-install $(MAKE_TRACE)
+	$(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE)
 
 mostlyclean:
 	rm -f $(STAMP_DIR)/.linux-compile
@@ -119,3 +114,8 @@ clean:
 	rm -f $(STAMP_DIR)/.linux-compile
 	rm -rf $(LINUX_BUILD_DIR)
 	rm -f $(TARGETS)
+
+package/%:
+	$(MAKE) -C $(TOPDIR)/target/linux/package \
+		$(KPKG_MAKEOPTS) \
+		$(patsubst package/%,%,$@)