Fixes module autoloading for Wireless devices (#906)

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

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 42791f1..bf13321 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -17,7 +17,7 @@ PKG_SOURCE_URL= \
                http://www.kernel.org/pub/linux/kernel/v2.4
 PKG_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
 
                http://www.kernel.org/pub/linux/kernel/v2.4
 PKG_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
 

-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/linux-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux-$(PKG_VERSION)

 
 include $(INCLUDE_DIR)/host-build.mk
 
 
 include $(INCLUDE_DIR)/host-build.mk
 


@@ -29,9 +29,10 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
        -e 's/armeb/arm/' \
 )
 
        -e 's/armeb/arm/' \
 )
 

+

 define Build/Prepare
 define Build/Prepare

-       mkdir -p $(TOOL_BUILD_DIR)
-       bzcat $(DL_DIR)/$(PKG_SOURCE) | tar --wildcards -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - \
+       mkdir -p $(TOOLCHAIN_BUILD_DIR)
+       bzcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) --wildcards -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS) \

                linux-$(PKG_VERSION)/include \
                linux-$(PKG_VERSION)/Makefile \
                linux-$(PKG_VERSION)/Rules.make \
                linux-$(PKG_VERSION)/include \
                linux-$(PKG_VERSION)/Makefile \
                linux-$(PKG_VERSION)/Rules.make \


@@ -47,7 +48,10 @@ endef
 
 define Build/Configure
        -$(CP) ./files/config.$(LINUX_KARCH) $(PKG_BUILD_DIR)/.config
 
 define Build/Configure
        -$(CP) ./files/config.$(LINUX_KARCH) $(PKG_BUILD_DIR)/.config

-       $(MAKE) -C $(PKG_BUILD_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/version.h
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               ARCH=$(LINUX_KARCH) \
+               CONFIG_SHELL=$(shell which bash) \
+               oldconfig include/linux/version.h

 endef
 
 define Build/Compile
 endef
 
 define Build/Compile