From 2d3bc3ed38873ca3b2159897eaab4cba5798ea0c Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Wed, 24 May 2017 14:32:07 -0500
Subject: [PATCH] Corrected path for linux-headers

---
 Makefile    | 22 +++++++++++-----------
 SNAP/config |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 0dd7668..db02404 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ BRIEF = The Linux kernel
 DESC = Linux is a clone of the operating system Unix, written from scratch \
 by Linus Torvalds with assistance from a loosely-knit team of hackers \
 across the Net.
-export SNAPVER = 5
+export SNAPVER = 6
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -52,12 +52,14 @@ $(LINUX-DOC-ROOT): $(LINUX-HEADERS-ROOT)
 	cd $(LINUX-DOC) && make -f ../Makefile.linux-doc && mv *.snap ../
 
 $(LINUX-HEADERS-ROOT): $(LINUX-FIRMWARE-ROOT)
-	@install -v -d $(LINUX-HEADERS)/SNAP && \
+	@HDR=$(LINUX-HEADERS-ROOT)/usr/src/linux-headers-$(VERSION) && \
+	install -v -d $(LINUX-HEADERS)/SNAP && \
 	install -v -d $(LINUX-HEADERS-ROOT) && \
-	cd $(SRCDIR) && make headers_install \
-		INSTALL_HDR_PATH=$(LINUX-HEADERS-ROOT)/usr && \
-	cd $(LINUX-HEADERS) && make -f \
-		../Makefile.linux-headers && \
+	install -v -d -m 755 $(LINUX-HEADERS-ROOT)/lib/modules/$(VERSION) && \
+	ln -sf /usr/src/linux-headers-$(VERSION) \
+		$(LINUX-HEADERS-ROOT)/lib/modules/$(VERSION)/source && \
+	cd $(SRCDIR) && make headers_install INSTALL_HDR_PATH=$$HDR && \
+	cd $(LINUX-HEADERS) && make -f ../Makefile.linux-headers && \
 		mv *.snap ../
 
 $(LINUX-FIRMWARE-ROOT): $(SRCDIR)/arch/x86_64/boot/bzImage
@@ -84,11 +86,8 @@ $(SRCDIR)/Makefile: $(ARCHIVE)
 	@touch $(SRCDIR)/Makefile
 
 $(SRCDIR)/arch/x86_64/boot/bzImage: $(SRCDIR)/Makefile
-	@cd $(SRCDIR); \
-	make mrproper
-	@cp SNAP/config $(SRCDIR)/.config
-	@cd $(SRCDIR); \
-	make
+	@cd $(SRCDIR) && make mrproper && \
+	cp $(PWD)/SNAP/config .config && make
 
 $(ROOT): $(LINUX-DOC-ROOT)
 	@if [ -d $(ROOT) ]; then \
@@ -99,6 +98,7 @@ $(ROOT): $(LINUX-DOC-ROOT)
 
 	@cd $(SRCDIR); \
 	make modules_install INSTALL_MOD_PATH=$(ROOT) && \
+	rm $(ROOT)/lib/modules/$(VERSION)/{build,source} && \
 	rm -rf $(ROOT)/lib/firmware && \
 	install -d -m 755 $(ROOT)/boot && \
 	install -d -m 755 $(ROOT)/etc/modprobe.d && \
diff --git a/SNAP/config b/SNAP/config
index ad3685b..1846385 100644
--- a/SNAP/config
+++ b/SNAP/config
@@ -50,7 +50,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-5"
+CONFIG_LOCALVERSION="-6"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y