>The attached patch makes make-kpkg look for utsrelease.h in its new
>location.

It is not enough; in ruleset/targets/common.mk compiles.h should also 
be looked for in generated subdirectory

Attached patch fixes this also.

Regards

Jean-Luc
diff -ruN kernel-package-12.031.orig/kernel/ruleset/misc/version_vars.mk kernel-package-12.031/kernel/ruleset/misc/version_vars.mk
--- kernel-package-12.031.orig/kernel/ruleset/misc/version_vars.mk	2009-02-17 09:43:08.000000000 +0100
+++ kernel-package-12.031/kernel/ruleset/misc/version_vars.mk	2009-12-25 19:26:10.511455581 +0100
@@ -138,8 +138,10 @@
 EXTRAV_ARG :=
 endif
 
-UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-	                       echo include/linux/utsrelease.h;            \
+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
+	                       echo include/generated/utsrelease.h ;           \
+			       elif [ -f include/linux/utsrelease.h ]; then \
+			       echo include/linux/utsrelease.h ; \
 	                   else                                            \
                                echo include/linux/version.h ;              \
 	                   fi)
diff -ruN kernel-package-12.031.orig/kernel/ruleset/targets/common.mk kernel-package-12.031/kernel/ruleset/targets/common.mk
--- kernel-package-12.031.orig/kernel/ruleset/targets/common.mk	2009-09-11 17:06:22.000000000 +0200
+++ kernel-package-12.031/kernel/ruleset/targets/common.mk	2009-12-19 11:39:22.432594951 +0100
@@ -336,8 +336,14 @@
 	@echo this was built on a machine with the kernel: >> debian/stamp/build/info
 	uname -a >> debian/stamp/build/info
 	echo using the compiler: >> debian/stamp/build/info
-	grep LINUX_COMPILER include/linux/compile.h | \
-	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/stamp/build/info
+	if [ -f include/generated/compile.h ]; then \
+		grep LINUX_COMPILER include/generated/compile.h | \
+		   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/stamp/build/info; \
+	else \
+		grep LINUX_COMPILER include/generated/compile.h | \
+		   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/stamp/build/info; \
+       fi	
+
 ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
 	echo kernel source package used: >> debian/stamp/build/info
 	echo $(INT_STEM)-source-$(shell cat version.Debian) >> debian/stamp/build/info

Attachment: pgpGHGIgNrLu2.pgp
Description: PGP signature

Reply via email to