[kernel] r15888 - in dists/sid/linux-2.6/debian: . templates/temp.image.plain

[Ben Hutchings]

Author: benh
Date: Sat Jun 19 00:27:37 2010
New Revision: 15888

Log:
Get rid of Debian architecture template variable (=A)

This is only used to initialise a variable which is itself not used.

Modified:
   dists/sid/linux-2.6/debian/rules.real
   dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst
   dists/sid/linux-2.6/debian/templates/temp.image.plain/postrm
   dists/sid/linux-2.6/debian/templates/temp.image.plain/preinst
   dists/sid/linux-2.6/debian/templates/temp.image.plain/prerm

Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real	Fri Jun 18 04:30:46 2010	(r15887)
+++ dists/sid/linux-2.6/debian/rules.real	Sat Jun 19 00:27:37 2010	(r15888)
@@ -395,7 +395,6 @@
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
 	for i in $(wildcard debian/templates/temp.image.plain/*); do \
 	  sed \
-	    -e 's@=A@$(DEB_HOST_ARCH)@g' \
 	    -e 's@=B@$(KERNEL_ARCH)@g' \
 	    -e 's/=I/$(ARG_INITRD)/g' \
 	    -e 's/=K/$(ARG_KIMAGE)/g' \

Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst	Fri Jun 18 04:30:46 2010	(r15887)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst	Sat Jun 19 00:27:37 2010	(r15888)
@@ -27,7 +27,6 @@
 my $relink_src_link   = 'YES'; # There is no harm in checking the link
 my $relink_build_link = 'YES'; # There is no harm in checking the link
 my $force_build_link  = '';    # There is no harm in checking the link
-my $arch              = "=A"; #  should be same as dpkg --print-architecture
 my $kernel_arch       = "=B";
 my $ramdisk           = "=MK";  # List of tools to create initial ram fs.
 my $package_name      = "linux-image-$version";

Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/postrm
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/postrm	Fri Jun 18 04:30:46 2010	(r15887)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/postrm	Sat Jun 19 00:27:37 2010	(r15888)
@@ -33,7 +33,6 @@
 my $ignore_depmod_err = '';	# normally we do not
 my $relink_build_link = 'YES';	# There is no harm in checking the link
 my $force_build_link  = '';	# we shall not create a dangling link
-my $arch              = "=A";  #  should be same as dpkg --print-architecture
 my $kernel_arch       = "=B";
 my $ramdisk           = "=MK";  # List of tools to create initial ram fs.
 my $package_name    = "linux-image-$version";

Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/preinst
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/preinst	Fri Jun 18 04:30:46 2010	(r15887)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/preinst	Sat Jun 19 00:27:37 2010	(r15888)
@@ -21,7 +21,6 @@
 my $relink_src_link   = 'YES';	# There is no harm in checking the link
 my $relink_build_link = 'YES'; # There is no harm in checking the link
 my $force_build_link  = '';	 # There is no harm in checking the link
-my $arch              = "=A";  #  should be same as dpkg --print-architecture
 my $kernel_arch       = "=B";
 my $ramdisk           = "=MK";  # List of tools to create initial ram fs.
 my $package_name    = "linux-image-$version";

Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/prerm
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/prerm	Fri Jun 18 04:30:46 2010	(r15887)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/prerm	Sat Jun 19 00:27:37 2010	(r15888)
@@ -21,7 +21,6 @@
 my $ignore_depmod_err = '';	# normally we do not
 my $relink_build_link = 'YES';	# There is no harm in checking the link
 my $force_build_link = '';	# There is no harm in checking the link
-my $arch              = "=A";  #  should be same as dpkg --print-architecture
 my $kernel_arch       = "=B";
 my $package_name    = "linux-image-$version";