[kernel] r14017 - dists/trunk/linux-2.6/debian/templates/temp.image.plain

Maximilian Attems maks at alioth.debian.org
Mon Jul 27 12:13:19 UTC 2009


Author: maks
Date: Mon Jul 27 12:13:11 2009
New Revision: 14017

Log:
config clean up of usesless variables regarding initramfs

Modified:
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/config

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/config
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/config	Mon Jul 27 12:12:53 2009	(r14016)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/config	Mon Jul 27 12:13:11 2009	(r14017)
@@ -34,8 +34,6 @@
 my $image_dir         = "=D";        # where the image is located
 my $clobber_modules   = '';          # target machine defined
 my $relative_links    = "";          # target machine defined
-my $initrd            = "=I";        # initrd kernel
-my $mkimage           = "=M";   # 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 $postrm_hook       = '';          #Normally we do not
@@ -49,8 +47,6 @@
 my $official_image    = "=OF";  # only true for official images
 my $arch              = "=A"; #  should be same as dpkg --print-installation-architecture
 my $kernel_arch       = "=B";
-my $ramdisk           = "=MK";  # List of tools to create initial ram fs.
-my $initrddep         = "=MD";  # List of dependencies for such tools
 my $package_name    = "=ST-image-$version";
 
 my $Loader          = "NoLOADER"; #
@@ -136,19 +132,12 @@
       $preinst_hook    = "$1"  if /preinst_hook\s*=\s*(\S+)/ig;
       $prerm_hook      = "$1"  if /prerm_hook\s*=\s*(\S+)/ig;
       $mkimage         = "$1"  if /mkimage\s*=\s*(.+)$/ig;
-      $ramdisk         = "$1"  if /ramdisk\s*=\s*(.+)$/ig;
     }
     close CONF;
     $have_conffile = "Yes";
   }
 }
 
-# For some versions of kernel-package, we had this warning in the
-# postinst, but the rules did not really interpolate the value in.
-# Here is a sanity check.
-my $pattern = "=" . "I";
-$initrd=~ s/^$pattern$//;
-
 if ($link_in_boot) {
   $image_dest = "/$image_dir/";
   $image_dest =~ s|^/*|/|o;



More information about the Kernel-svn-changes mailing list