Always use kernel-headers.

1 files changed, 27 insertions, 27 deletions

diff --git a/make/kernel-headers.mk b/make/kernel-headers.mk
index bce061a74..37839c665 100644
--- a/make/kernel-headers.mk
+++ b/make/kernel-headers.mk
@@ -50,71 +50,71 @@ endif
 
 LINUX_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
 
-LINUX_DIR:=$(TOOL_BUILD_DIR)/linux
+LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
 
 $(DL_DIR)/$(LINUX_SOURCE):
 	mkdir -p $(DL_DIR)
 	$(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE)
 
-$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
+$(LINUX_HEADERS_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
 	mkdir -p $(TOOL_BUILD_DIR)
 	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
-ifneq ($(LINUX_UNPACK_DIR),$(LINUX_DIR))
-	mv $(LINUX_UNPACK_DIR) $(LINUX_DIR)
+ifneq ($(LINUX_UNPACK_DIR),$(LINUX_HEADERS_DIR))
+	mv $(LINUX_UNPACK_DIR) $(LINUX_HEADERS_DIR)
 endif
-	touch $(LINUX_DIR)/.unpacked
+	touch $(LINUX_HEADERS_DIR)/.unpacked
 
-$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
-	$(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR) $(SOURCE_DIR) linux-libc-headers-$(LINUX_VERSION)-\*.patch
-	touch $(LINUX_DIR)/.patched
+$(LINUX_HEADERS_DIR)/.patched: $(LINUX_HEADERS_DIR)/.unpacked
+	$(SOURCE_DIR)/patch-kernel.sh $(LINUX_HEADERS_DIR) $(SOURCE_DIR) linux-libc-headers-$(LINUX_VERSION)-\*.patch
+	touch $(LINUX_HEADERS_DIR)/.patched
 
-$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
-	rm -f $(LINUX_DIR)/include/asm
-	@if [ ! -f $(LINUX_DIR)/Makefile ] ; then \
+$(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.patched
+	rm -f $(LINUX_HEADERS_DIR)/include/asm
+	@if [ ! -f $(LINUX_HEADERS_DIR)/Makefile ] ; then \
 	    echo -e "VERSION = $(VERSION)\nPATCHLEVEL = $(PATCHLEVEL)\n" > \
-		    $(LINUX_DIR)/Makefile; \
+		    $(LINUX_HEADERS_DIR)/Makefile; \
 	    echo -e "SUBLEVEL = $(SUBLEVEL)\nEXTRAVERSION =\n" >> \
-		    $(LINUX_DIR)/Makefile; \
+		    $(LINUX_HEADERS_DIR)/Makefile; \
 	    echo -e "KERNELRELEASE=\$$(VERSION).\$$(PATCHLEVEL).\$$(SUBLEVEL)\$$(EXTRAVERSION)" >> \
-		    $(LINUX_DIR)/Makefile; \
+		    $(LINUX_HEADERS_DIR)/Makefile; \
 	fi;
 	@if [ "$(ARCH)" = "powerpc" ];then \
-	    (cd $(LINUX_DIR)/include; ln -fs asm-ppc$(NOMMU) asm;) \
+	    (cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-ppc$(NOMMU) asm;) \
 	elif [ "$(ARCH)" = "mips" ];then \
-	    (cd $(LINUX_DIR)/include; ln -fs asm-mips$(NOMMU) asm;) \
+	    (cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-mips$(NOMMU) asm;) \
 	elif [ "$(ARCH)" = "mipsel" ];then \
-	    (cd $(LINUX_DIR)/include; ln -fs asm-mips$(NOMMU) asm;) \
+	    (cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-mips$(NOMMU) asm;) \
 	elif [ "$(ARCH)" = "arm" ];then \
-	    (cd $(LINUX_DIR)/include; ln -fs asm-arm$(NOMMU) asm; \
+	    (cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-arm$(NOMMU) asm; \
 	     cd asm; \
 	     if [ ! -L proc ] ; then \
 	     ln -fs proc-armv proc; \
 	     ln -fs arch-ebsa285 arch; fi); \
 	elif [ "$(ARCH)" = "armeb" ];then \
-	    (cd $(LINUX_DIR)/include; ln -fs asm-arm$(NOMMU) asm; \
+	    (cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-arm$(NOMMU) asm; \
 	     cd asm; \
 	     if [ ! -L proc ] ; then \
 	     ln -fs proc-armv proc; \
 	     ln -fs arch-ebsa285 arch; fi); \
 	elif [ "$(ARCH)" = "cris" ];then \
-	    (cd $(LINUX_DIR)/include; ln -fs asm-cris asm;) \
+	    (cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-cris asm;) \
 	else \
-	    (cd $(LINUX_DIR)/include; ln -fs asm-$(ARCH)$(NOMMU) asm;) \
+	    (cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-$(ARCH)$(NOMMU) asm;) \
 	fi
-	touch $(LINUX_DIR)/include/linux/autoconf.h;
-	touch $(LINUX_DIR)/.configured
+	touch $(LINUX_HEADERS_DIR)/include/linux/autoconf.h;
+	touch $(LINUX_HEADERS_DIR)/.configured
 
-$(LINUX_KERNEL): $(LINUX_DIR)/.configured
+$(LINUX_KERNEL): $(LINUX_HEADERS_DIR)/.configured
 
-kernel-headers: $(LINUX_DIR)/.configured
+kernel-headers: $(LINUX_HEADERS_DIR)/.configured
 
 kernel-headers-source: $(DL_DIR)/$(LINUX_SOURCE)
 
 kernel-headers-clean: clean
 	rm -f $(LINUX_KERNEL)
-	rm -rf $(LINUX_DIR)
+	rm -rf $(LINUX_HEADERS_DIR)
 
 kernel-headers-dirclean:
-	rm -rf $(LINUX_DIR)
+	rm -rf $(LINUX_HEADERS_DIR)
 
 endif