Hi,

I have put together a patch for /usr/share/kernel-package/rules.
It reverts (and thus probably reopens) the changes of bug #285688.
With the patch make-kpkg works for me again.


Regards,
  Bastian
-- 
  ,''`.                  Bastian Kleineidam
 : :' :                    GnuPG Schlüssel
 `. `'    gpg --keyserver wwwkeys.pgp.net --recv-keys 32EC6F3E
   `-

--- rules.safe  2005-02-15 13:54:46.155449754 +0100
+++ rules       2005-02-15 13:55:12.124509582 +0100
@@ -143,27 +143,17 @@
 deb_rule = $(MAKE) -f $(DEBDIR)/rules
 
 
-# localversion_files := $(wildcard localversion*)
-# VERSION =$(shell grep -E '^VERSION +=' Makefile 2>/dev/null | \
-#  sed -e 's/[^0-9]*\([0-9]*\)/\1/')
-# PATCHLEVEL =$(shell grep -E '^PATCHLEVEL +=' Makefile 2>/dev/null | \
-#  sed -e 's/[^0-9]*\([0-9]*\)/\1/')
-# SUBLEVEL =$(shell grep -E '^SUBLEVEL +=' Makefile 2>/dev/null | \
-#  sed -e 's/[^0-9]*\([0-9]*\)/\1/')
-# EXTRA_VERSION =$(shell grep -E '^EXTRAVERSION +=' Makefile 2>/dev/null | \
-#  sed -e 's/EXTRAVERSION *= *\([^ \t]*\)/\1/')
-# LOCALVERSION = $(subst $(space),, $(shell cat /dev/null 
$(localversion_files)) \
-#                  $(CONFIG_LOCALVERSION))
-
-# Could have used :=, but some patches do seem to patch the
-# Makefile. perhaps deferring the rule makes that better
-VERSION      =$(shell $(MAKE) -sf $(DEBDIR)/kernel_version.mk debian_VERSION)
-PATCHLEVEL   =$(shell $(MAKE) -sf $(DEBDIR)/kernel_version.mk 
debian_PATCHLEVEL)
-SUBLEVEL     =$(shell $(MAKE) -sf $(DEBDIR)/kernel_version.mk debian_SUBLEVEL)
-EXTRA_VERSION=$(shell $(MAKE) -sf $(DEBDIR)/kernel_version.mk 
debian_EXTRAVERSION)
-LOCALVERSION =$(shell $(MAKE) -sf $(DEBDIR)/kernel_version.mk 
debian_LOCALVERSION)
-
-
+localversion_files := $(wildcard localversion*)
+VERSION =$(shell grep -E '^VERSION +=' Makefile 2>/dev/null | \
+ sed -e 's/[^0-9]*\([0-9]*\)/\1/')
+PATCHLEVEL =$(shell grep -E '^PATCHLEVEL +=' Makefile 2>/dev/null | \
+ sed -e 's/[^0-9]*\([0-9]*\)/\1/')
+SUBLEVEL =$(shell grep -E '^SUBLEVEL +=' Makefile 2>/dev/null | \
+ sed -e 's/[^0-9]*\([0-9]*\)/\1/')
+EXTRA_VERSION =$(shell grep -E '^EXTRAVERSION +=' Makefile 2>/dev/null | \
+ sed -e 's/EXTRAVERSION *= *\([^ \t]*\)/\1/')
+LOCALVERSION = $(subst $(space),, $(shell cat /dev/null $(localversion_files)) 
\
+                 $(CONFIG_LOCALVERSION))
 
 HAVE_NEW_MODLIB =$(shell grep -E '\(INSTALL_MOD_PATH\)' Makefile 2>/dev/null )
 

Attachment: signature.asc
Description: Digital signature

Reply via email to