[kernel] netfilter/ipset cleanups

[openwrt.git] / toolchain / kernel-headers / Makefile

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 68fa1bc..cb7ed49 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -6,14 +6,7 @@
 #
 include $(TOPDIR)/rules.mk
 
 #
 include $(TOPDIR)/rules.mk
 

-PKG_NAME:=linux
-PKG_VERSION:=$(LINUX_VERSION)
-PKG_SOURCE:=$(LINUX_SOURCE)
-PKG_SOURCE_URL:=$(LINUX_SITE)
-

 KERNEL_BUILD_DIR := $(BUILD_DIR_TOOLCHAIN)
 KERNEL_BUILD_DIR := $(BUILD_DIR_TOOLCHAIN)

-PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
-LINUX_DIR := $(PKG_BUILD_DIR)

 BUILD_DIR := $(KERNEL_BUILD_DIR)
 
 STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
 BUILD_DIR := $(KERNEL_BUILD_DIR)
 
 STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)


@@ -21,12 +14,21 @@ BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 override QUILT:=
 
 include $(INCLUDE_DIR)/kernel.mk
 override QUILT:=
 
 include $(INCLUDE_DIR)/kernel.mk

+
+PKG_NAME:=linux
+PKG_VERSION:=$(LINUX_VERSION)
+PKG_SOURCE:=$(LINUX_SOURCE)
+PKG_SOURCE_URL:=$(LINUX_SITE)
+PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
+PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
+LINUX_DIR := $(PKG_BUILD_DIR)
+

 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
 define Build/Prepare/cris
        mkdir -p $(BUILD_DIR_TOOLCHAIN)
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
 define Build/Prepare/cris
        mkdir -p $(BUILD_DIR_TOOLCHAIN)

-       bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS)
+       bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(BUILD_DIR_TOOLCHAIN) $(TAR_OPTIONS)

        $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/generic_2.6
        $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/cris
        ln -sf arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch
        $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/generic_2.6
        $(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/cris
        ln -sf arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch