r4205 - in people/waldi/linux-2.6/debian: . templates

[Bastian Blank]

Author: waldi
Date: 2005-09-14 19:54:56 +0000 (Wed, 14 Sep 2005)
New Revision: 4205

Modified:
   people/waldi/linux-2.6/debian/rules.real
   people/waldi/linux-2.6/debian/templates/post-install.in
Log:
* debian/rules.real
  - Update post-install substitution.
  - Remove append variable.
* debian/templates/post-install.in: Remove append substitution.


Modified: people/waldi/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/linux-2.6/debian/rules.real	2005-09-14 19:43:27 UTC (rev 4204)
+++ people/waldi/linux-2.6/debian/rules.real	2005-09-14 19:54:56 UTC (rev 4205)
@@ -16,10 +16,8 @@
 #
 ifeq ($(SUBARCH),none)
   basedir := debian/arch/$(ARCH)
-  append  := 
 else
   basedir := debian/arch/$(ARCH)/$(SUBARCH)
-  append  := $(SUBARCH)-
 endif
 
 configs := $(notdir $(wildcard $(basedir)/config.*))
@@ -40,7 +38,7 @@
 # replaced by the flavour for which the command is run. 
 #
 kpkg_header := HEADER_CLEAN_HOOK='$(CURDIR)/$(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)'
-kpkg_header += make-kpkg --append-to-version "$(append)$(KPKG_ABINAME)"
+kpkg_header += make-kpkg --append-to-version "$(KPKG_ABINAME)"
 kpkg_header += --arch $(ARCH)
 kpkg_header += --stem linux
 kpkg_header += --config defconfig
@@ -95,7 +93,6 @@
 endif
 $(BUILD_DIR)/post-install-$(ARCH)-$(SUBARCH): $(TEMPLATES_DIR)/post-install.in
 	sed -e 's, at initrd_modules@,$(initrd_modules),'			\
-	    -e 's, at append_subarch@,$(append),'				\
 	    -e 's, at extra_postinstall_command@,$(extra_command),'	\
 	    -e 's, at headers_dirs@,$(headers_dirs),g'			\
 	    $< > $@

Modified: people/waldi/linux-2.6/debian/templates/post-install.in
===================================================================
--- people/waldi/linux-2.6/debian/templates/post-install.in	2005-09-14 19:43:27 UTC (rev 4204)
+++ people/waldi/linux-2.6/debian/templates/post-install.in	2005-09-14 19:54:56 UTC (rev 4205)
@@ -30,11 +30,8 @@
 # prefix is then used to form a destination directory
 # to link to. For cases with subarch we need to link
 # to linux-headers-$(subarch)-$(version)-$(abiname),
-# not just linux-headers-$(version)-$(abiname). Note
-# that the append_subarch substitution must contain a
-# trailing dash, if it is non-empty.
+# not just linux-headers-$(version)-$(abiname).
 #
-append='@append_subarch@'
 prefix=$DEBIAN_VERSION-$DEBIAN_ABINAME
 pkg=linux-headers-$prefix-$DEBIAN_FLAVOUR
 top=$PWD/debian/$pkg