Tags: patch This problem came up with moving UTS_RELEASE from include/linux/version.h to include/linux/utsrelease.h in the kernel sources (new for 2.6.18-rc1).
Attached you can find a suggested fix. I could build, installing, and reinstalling 2.6.18-rc1 on amd64. Hope this helps Harri
diff -ur ../kernel-package-10.049/debian/changelog ./debian/changelog
--- ../kernel-package-10.049/debian/changelog 2006-06-16 22:51:53.000000000
+0200
+++ ./debian/changelog 2006-07-08 09:43:44.000000000 +0200
@@ -1,3 +1,10 @@
+kernel-package (10.049.1) unstable; urgency=low
+
+ * support UTS_RELEASE in include/linux/utsrelease.h (2.6.18-rc1)
+ (Closes: #377267).
+
+ -- Harald Dunkel <[EMAIL PROTECTED]> Sat, 8 Jul 2006 09:42:09 +0200
+
kernel-package (10.049) unstable; urgency=low
* Bug fix: "kernel-package: localversion* files not supported?", thanks
diff -ur ../kernel-package-10.049/kernel/ruleset/misc/version_vars.mk
./kernel/ruleset/misc/version_vars.mk
--- ../kernel-package-10.049/kernel/ruleset/misc/version_vars.mk
2006-03-29 17:20:50.000000000 +0200
+++ ./kernel/ruleset/misc/version_vars.mk 2006-07-08 09:34:29.000000000
+0200
@@ -103,8 +103,12 @@
EXTRAV_ARG :=
endif
-UTS_RELEASE_VERSION=$(shell if [ -f include/linux/version.h ]; then
\
- grep 'define UTS_RELEASE' include/linux/version.h |
\
+UTS_RELEASE_HEADER:=$(shell \
+ x=include/linux/utsrelease.h ; \
+ test -f $$x || x=include/linux/version.h ; \
+ echo $$x)
+UTS_RELEASE_VERSION:=$(shell if [ -f $(UTS_RELEASE_HEADER) ]; then
\
+ grep 'define UTS_RELEASE' $(UTS_RELEASE_HEADER) |
\
perl -nle 'm/^\s*\#define\s+UTS_RELEASE\s+("?)(\S+)\1/g &&
print $$2;';\
else echo "" ;
\
fi)
diff -ur ../kernel-package-10.049/kernel/ruleset/modules.mk
./kernel/ruleset/modules.mk
--- ../kernel-package-10.049/kernel/ruleset/modules.mk 2006-03-27
18:57:27.000000000 +0200
+++ ./kernel/ruleset/modules.mk 2006-07-08 09:39:43.000000000 +0200
@@ -81,7 +81,7 @@
@(echo "The changelog says we are creating $(saved_version), but I
thought the version is $(version)"; exit 1)
endif
$(if $(subst $(strip $(UTS_RELEASE_VERSION)),,$(strip $(version))), \
- echo "The UTS Release version in include/linux/version.h"; \
+ echo "The UTS Release version in $(UTS_RELEASE_HEADER)"; \
echo " \"$(strip $(UTS_RELEASE_VERSION))\" "; \
echo "does not match current version:"; \
echo " \"$(strip $(version))\" "; \
@@ -126,7 +126,7 @@
@(echo "The changelog says we are creating $(saved_version), but I
thought the version is $(version)"; exit 1)
endif
$(if $(subst $(strip $(UTS_RELEASE_VERSION)),,$(strip $(version))), \
- echo "The UTS Release version in include/linux/version.h"; \
+ echo "The UTS Release version in $(UTS_RELEASE_HEADER)"; \
echo " \"$(strip $(UTS_RELEASE_VERSION))\" "; \
echo "does not match current version:"; \
echo " \"$(strip $(version))\" "; \
@@ -171,7 +171,7 @@
@(echo "The changelog says we are creating $(saved_version), but I
thought the version is $(version)"; exit 1)
endif
$(if $(subst $(strip $(UTS_RELEASE_VERSION)),,$(strip $(version))), \
- echo "The UTS Release version in include/linux/version.h"; \
+ echo "The UTS Release version in $(UTS_RELEASE_HEADER)"; \
echo " \"$(strip $(UTS_RELEASE_VERSION))\" "; \
echo "does not match current version:"; \
echo " \"$(strip $(version))\" "; \
@@ -206,7 +206,7 @@
@echo Modules not configured, so not making $@
else
$(if $(subst $(strip $(UTS_RELEASE_VERSION)),,$(strip $(version))), \
- echo "The UTS Release version in include/linux/version.h"; \
+ echo "The UTS Release version in $(UTS_RELEASE_HEADER)"; \
echo " \"$(strip $(UTS_RELEASE_VERSION))\" "; \
echo "does not match current version:"; \
echo " \"$(strip $(version))\" "; \
diff -ur ../kernel-package-10.049/kernel/ruleset/targets/headers.mk
./kernel/ruleset/targets/headers.mk
--- ../kernel-package-10.049/kernel/ruleset/targets/headers.mk 2006-06-16
22:33:28.000000000 +0200
+++ ./kernel/ruleset/targets/headers.mk 2006-07-08 09:41:34.000000000 +0200
@@ -35,7 +35,7 @@
@echo "This is kernel package version $(kpkg_version)."
ifeq ($(strip $(MAKING_VIRTUAL_IMAGE)),)
$(if $(subst $(strip $(UTS_RELEASE_VERSION)),,$(strip $(version))), \
- echo "The UTS Release version in include/linux/version.h"; \
+ echo "The UTS Release version in $(UTS_RELEASE_HEADER)"; \
echo " \"$(strip $(UTS_RELEASE_VERSION))\" "; \
echo "does not match current version:"; \
echo " \"$(strip $(version))\" "; \
diff -ur ../kernel-package-10.049/kernel/ruleset/targets/image.mk
./kernel/ruleset/targets/image.mk
--- ../kernel-package-10.049/kernel/ruleset/targets/image.mk 2006-06-05
20:45:58.000000000 +0200
+++ ./kernel/ruleset/targets/image.mk 2006-07-08 09:40:53.000000000 +0200
@@ -34,7 +34,7 @@
$(REASON)
@echo "This is kernel package version $(kpkg_version)."
$(if $(subst $(strip $(UTS_RELEASE_VERSION)),,$(strip $(version))), \
- echo "The UTS Release version in include/linux/version.h"; \
+ echo "The UTS Release version in $(UTS_RELEASE_HEADER)"; \
echo " \"$(strip $(UTS_RELEASE_VERSION))\" "; \
echo "does not match current version:"; \
echo " \"$(strip $(version))\" "; \
@@ -136,7 +136,7 @@
mv $(TMPTOP)/lib/modules/$(version)/build ./debian/build-link
ifeq ($(strip $(KERNEL_ARCH)),um)
-depmod -q -FSystem.map -b $(TMPTOP) \
- $(version)-$$(sed q include/linux/version.h | sed s/\"//g | awk
-F\- '{print $$2}')
+ $(version)-$$(sed q $(UTS_RELEASE_HEADER) | sed s/\"//g | awk -F\-
'{print $$2}')
else
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-depmod -q -FSystem.map -b $(TMPTOP) $(version);
diff -ur ../kernel-package-10.049/kernel/ruleset/targets/target.mk
./kernel/ruleset/targets/target.mk
--- ../kernel-package-10.049/kernel/ruleset/targets/target.mk 2006-03-29
17:12:06.000000000 +0200
+++ ./kernel/ruleset/targets/target.mk 2006-07-08 09:36:56.000000000 +0200
@@ -279,11 +279,11 @@
exit 1
endif
$(if $(subst $(strip $(UTS_RELEASE_VERSION)),,$(strip $(version))),
\
- if [ -f include/linux/version.h ]; then
\
- uts_ver=$$(grep 'define UTS_RELEASE' include/linux/version.h |
\
+ if [ -f $(UTS_RELEASE_HEADER) ]; then
\
+ uts_ver=$$(grep 'define UTS_RELEASE' $(UTS_RELEASE_HEADER) |
\
perl -nle 'm/^\s*\#define\s+UTS_RELEASE\s+("?)(\S+)\1/g &&
print $$2;'); \
if [ "X$$uts_ver" != "X$(strip $(UTS_RELEASE_VERSION))" ]; then
\
- echo "The UTS Release version in include/linux/version.h";
\
+ echo "The UTS Release version in $(UTS_RELEASE_HEADER)";
\
echo " \"$$uts_ver\" ";
\
echo "does not match current version " ;
\
echo " \"$(strip $(version))\" " ;
\
signature.asc
Description: OpenPGP digital signature
