[kernel] r5235 - in people/waldi/linux-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: Wed Jan  4 15:00:38 2006
New Revision: 5235

Modified:
   people/waldi/linux-2.6/debian/bin/install-image
   people/waldi/linux-2.6/debian/rules.real
Log:
* debian/bin/install-image: Use DEBIAN_LOCALVERSION and DEBIAN_LOCALVERSION_HEADERS.
* debian/rules.real: Set LOCALVERSION for scripts.


Modified: people/waldi/linux-2.6/debian/bin/install-image
==============================================================================
--- people/waldi/linux-2.6/debian/bin/install-image	(original)
+++ people/waldi/linux-2.6/debian/bin/install-image	Wed Jan  4 15:00:38 2006
@@ -32,8 +32,8 @@
 # to linux-headers-$(subarch)-$(version)-$(abiname),
 # not just linux-headers-$(version)-$(abiname).
 #
-prefix="$DEBIAN_VERSION-$DEBIAN_ABINAME"
-pkg="linux-headers-$prefix-$DEBIAN_FLAVOUR"
+prefix="$DEBIAN_VERSION$DEBIAN_LOCALVERSION_HEADERS"
+pkg="linux-headers-$DEBIAN_VERSION$DEBIAN_LOCALVERSION"
 top="$PWD/debian/$pkg"
 dir="$top/usr/src/$pkg"
 #
@@ -58,7 +58,7 @@
 mkdir -p "$dir/arch/$arch/kernel"
 mkdir -p "$dir/include/linux"
 cp -a .config "$dir"
-echo "-$DEBIAN_ABINAME-$DEBIAN_FLAVOUR" > "$dir/.extraversion"
+echo "$DEBIAN_LOCALVERSION" > "$dir/localversion"
 
 cp -a Module.symvers "$dir"
 

Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Wed Jan  4 15:00:38 2006
@@ -17,10 +17,12 @@
 #
 ifeq ($(SUBARCH),none)
   basedir := debian/arch/$(ARCH)
-  append := $(FLAVOUR)
+  LOCALVERSION := -$(FLAVOUR)
+  LOCALVERSION_HEADERS :=
 else
   basedir := debian/arch/$(ARCH)/$(SUBARCH)
-  append := $(SUBARCH)-$(FLAVOUR)
+  LOCALVERSION := -$(SUBARCH)-$(FLAVOUR)
+  LOCALVERSION_HEADERS := -$(SUBARCH)
 endif
 
 -include $(basedir)/Makefile.inc
@@ -38,7 +40,7 @@
 kpkg_header += --arch '$(ARCH)'
 kpkg_header += --stem linux
 kpkg_header += --config defconfig
-kpkg_image := make-kpkg --append-to-version '$(KPKG_ABINAME)-$(append)'
+kpkg_image := make-kpkg --append-to-version '$(KPKG_ABINAME)$(LOCALVERSION)'
 kpkg_image += --arch '$(ARCH)'
 kpkg_image += --stem linux
 kpkg_image += --initrd
@@ -51,7 +53,9 @@
   kpkg_image += --cross-compile='$(DEB_HOST_GNU_TYPE)'
 endif
 setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION
-setup_env += DEBIAN_ABINAME='$(ABINAME)' DEBIAN_FLAVOUR='$(FLAVOUR)' DEBIAN_VERSION='$(VERSION)'
+setup_env += DEBIAN_LOCALVERSION='-$(ABINAME)$(LOCALVERSION)'
+setup_env += DEBIAN_LOCALVERSION_HEADERS='-$(ABINAME)$(LOCALVERSION_HEADERS)'
+setup_env += DEBIAN_VERSION='$(VERSION)'
 setup_makeflags =
 ifdef COMPILER
   setup_makeflags += CC="$$$$(CROSS_COMPILE)$(COMPILER)"