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

[Ben Hutchings]

Author: benh
Date: Fri Jun 18 03:53:48 2010
New Revision: 15886

Log:
Get rid of some flag template variables (=IB, =M, =S)

These are always empty now.

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 03:46:24 2010	(r15885)
+++ dists/sid/linux-2.6/debian/rules.real	Fri Jun 18 03:53:48 2010	(r15886)
@@ -397,14 +397,11 @@
 	  sed \
 	    -e 's@=A@$(DEB_HOST_ARCH)@g' \
 	    -e 's@=B@$(KERNEL_ARCH)@g' \
-	    -e 's/=IB//g' \
 	    -e 's/=I/$(ARG_INITRD)/g' \
 	    -e 's/=K/$(ARG_KIMAGE)/g' \
 	    -e 's/=L/$(ARG_BOOTLOADER)/g' \
 	    -e 's@=MK@$(INITRD_CMD)@g' \
 	    -e 's/=V/$(REAL_VERSION)/g' \
-	    -e 's/=M//g' \
-	    -e 's/=S//g' \
 	    $$i > debian/$(PACKAGE_NAME).$$(basename $$i); \
 	done
 	mkdir -p debian/$(PACKAGE_NAME).po

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 03:46:24 2010	(r15885)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst	Fri Jun 18 03:53:48 2010	(r15886)
@@ -11,15 +11,15 @@
 
 # Predefined values:
 my $version           = "=V";
-my $link_in_boot      = "=IB";  # Should be empty, mostly
-my $no_symlink        = "=S";   # Should be empty, mostly
+my $link_in_boot      = "";
+my $no_symlink        = "";
 my $do_symlink        = "Yes";  # target machine defined
 my $do_boot_enable    = "Yes";  # target machine defined
 my $do_bootloader     = "Yes";  # target machine defined
 my $kimage            = "=K";   # Should be empty, mostly
 my $loader            = "=L"; # lilo, silo, quik, palo, vmelilo, nettrom, arcboot or delo
 my $initrd            = "=I";        # initrd kernel
-my $mkimage           = "=M";   # command to generate the initrd image
+my $mkimage           = "";     # command to generate the initrd image
 my $use_hard_links    = ''; # hardlinks do not work across fs boundaries
 my $postinst_hook     = '';          #Normally we do not
 my $minimal_swap      = '';          # Do not swap symlinks

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 03:46:24 2010	(r15885)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/postrm	Fri Jun 18 03:53:48 2010	(r15886)
@@ -19,8 +19,8 @@
 $|=1;
 # Predefined values:
 my $version           = "=V";
-my $link_in_boot      = "=IB";	# Should be empty, mostly
-my $no_symlink        = "=S";	# Should be empty, mostly
+my $link_in_boot      = "";
+my $no_symlink        = "";
 my $do_symlink        = "Yes";	# target machine defined
 my $do_boot_enable    = "Yes";	# target machine defined
 my $do_bootloader     = "Yes";	# target machine defined

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 03:46:24 2010	(r15885)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/preinst	Fri Jun 18 03:53:48 2010	(r15886)
@@ -10,8 +10,8 @@
 
 # Predefined values:
 my $version         = "=V";
-my $link_in_boot    = "=IB";     # Should be empty, mostly
-my $no_symlink      = "=S";     # Should be empty, mostly
+my $link_in_boot    = "";
+my $no_symlink      = "";
 my $do_symlink      = "Yes";	# target machine defined
 my $kimage          = "=K";     # Should be empty, mostly
 my $use_hard_links  = '';       # hardlinks do not wirk across fs boundaries

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 03:46:24 2010	(r15885)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/prerm	Fri Jun 18 03:53:48 2010	(r15886)
@@ -8,8 +8,8 @@
 $|=1;
 # Predefined values:
 my $version         = "=V";
-my $link_in_boot    = "=IB";	# Should be empty, mostly
-my $no_symlink      = "=S";	# Should be empty, mostly
+my $link_in_boot    = "";
+my $no_symlink      = "";
 my $do_symlinks     = "Yes";	# target machine defined
 my $do_boot_enable  = "Yes";	# target machine defined
 my $do_bootloader   = "Yes";	# target machine defined