clean up the openswan patch to work with older patch versions as well

[openwrt.git] / openwrt / target / linux / kernel.mk

diff --git a/openwrt/target/linux/kernel.mk b/openwrt/target/linux/kernel.mk
index 8cc22cf..56817db 100644 (file)
--- a/openwrt/target/linux/kernel.mk
+++ b/openwrt/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
 
@@ -58,7 +58,7 @@ $(LINUX_DIR)/.modules_done:
 $(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
@@ -92,7 +92,7 @@ prepare:
 compile: prepare $(STAMP_DIR)/.linux-compile
 
 install: compile
-       @$(TRACE) target/linux/package/install
+       @$(TRACE) target/linux/package-install
        $(MAKE) $(KPKG_MAKEOPTS) pkg-install $(MAKE_TRACE)
        $(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE)
 
@@ -114,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/%,%,$@)