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

[Maximilian Attems]

Author: maks
Date: Mon Jul 27 12:14:37 2009
New Revision: 14024

Log:
config nuke useless code related to upgrade

neither are the variables use nor thus the powerpc exception do
anything.

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:14:25 2009	(r14023)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/config	Mon Jul 27 12:14:37 2009	(r14024)
@@ -30,7 +30,6 @@
 my $move_image        = '';     # target machine defined
 my $kimage            = "=K";   # Should be empty, mostly
 my $image_dir         = "=D";        # where the image is located
-my $clobber_modules   = '';          # target machine defined
 my $relative_links    = "";          # target machine defined
 my $use_hard_links    = ''; # hardlinks do not work across fs boundaries
 my $postinst_hook     = '';          #Normally we do not
@@ -42,7 +41,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 $official_image    = "=OF";  # only true for official images
 my $arch              = "=A"; #  should be same as dpkg --print-installation-architecture
 my $kernel_arch       = "=B";
 my $package_name    = "=ST-image-$version";
@@ -51,7 +49,6 @@
 my $image_dest      = "/";
 my $realimageloc    = "/$image_dir/";
 my $have_conffile   = "";
-my $silent_modules  = '';
 my $modules_base    = '/lib/modules';
 my $CONF_LOC        = '/etc/kernel-img.conf';
 
@@ -76,12 +73,10 @@
       $link_in_boot    = "" if /image_in_boot\s*=\s*(no|false|0)\s*$/ig;
       $link_in_boot    = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/ig;
       $move_image      = "" if /move_image\s*=\s*(no|false|0)\s*$/ig;
-      $clobber_modules = '' if /clobber_modules\s*=\s*(no|false|0)\s*$/ig;
       $do_boot_enable  = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/ig;
       $do_bootfloppy   = '' if /do_bootfloppy\s*=\s*(no|false|0)\s*$/ig;
       $relative_links  = '' if /relative_links \s*=\s*(no|false|0)\s*$/ig;
       $use_hard_links  = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/ig;
-      $silent_modules  = '' if /silent_modules\s*=\s*(no|false|0)\s*$/ig;
       $minimal_swap    = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/ig;
       $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/ig;
       $relink_src_link   = '' if /relink_src_link\s*=\s*(no|false|0)\s*$/ig;
@@ -94,12 +89,10 @@
       $link_in_boot    = "Yes" if /image_in_boot\s*=\s*(yes|true|1)\s*$/ig;
       $link_in_boot    = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/ig;
       $move_image      = "Yes" if /move_image\s*=\s*(yes|true|1)\s*$/ig;
-      $clobber_modules = "Yes" if /clobber_modules\s*=\s*(yes|true|1)\s*$/ig;
       $do_boot_enable  = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/ig;
       $do_bootfloppy   = "Yes" if /do_bootfloppy\s*=\s*(yes|true|1)\s*$/ig;
       $relative_links  = "Yes" if /relative_links\s*=\s*(yes|true|1)\s*$/ig;
       $use_hard_links  = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/ig;
-      $silent_modules  = 'Yes' if /silent_modules\s*=\s*(yes|true|1)\s*$/ig;
       $minimal_swap    = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/ig;
       $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/ig;
       $relink_src_link   = 'Yes' if /relink_src_link\s*=\s*(yes|true|1)\s*$/ig;
@@ -126,10 +119,6 @@
 $image_dest = "$image_dest/";
 $image_dest =~ s|/+$|/|o;
 
-# Official powerpc images may silently upgrade
-if ($official_image =~ /^\s*YES\s*$/o && $arch =~ m/powerpc/) {
-  $silent_modules = 'Yes';
-}
 $ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch;
 
 # Paranoid check to make sure that the correct value is put in there