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

[Maximilian Attems]

Author: maks
Date: Sun Oct  4 16:42:21 2009
New Revision: 14319

Log:
maintainer script nuke "official_image" variable

we are allways *offical*.

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

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Sun Oct  4 04:00:33 2009	(r14318)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Sun Oct  4 16:42:21 2009	(r14319)
@@ -46,7 +46,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 $ramdisk           = "=MK";  # List of tools to create initial ram fs.
@@ -969,9 +968,7 @@
   last if $loader =~ /nettrom/i; # NETTROM does not have to be executed.
   last if $loader =~ /arcboot/i; # ARCBOOT does not have to be executed.
   last if $loader =~ /delo/i; # DELO does not have to be executed.
-  if ($official_image =~ /^\s*YES\s*$/o) {
-    last if $loader =~ /quik/i; # maintainer asked quik invocation to be ignored
-  }
+  last if $loader =~ /quik/i; # maintainer asked quik invocation to be ignored
 
   last unless $loaderloc;
   last unless -x $loaderloc;

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm	Sun Oct  4 04:00:33 2009	(r14318)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm	Sun Oct  4 16:42:21 2009	(r14319)
@@ -52,7 +52,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 $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.

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst	Sun Oct  4 04:00:33 2009	(r14318)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst	Sun Oct  4 16:42:21 2009	(r14319)
@@ -38,7 +38,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 $ramdisk           = "=MK";  # List of tools to create initial ram fs.
@@ -164,11 +163,9 @@
   warn "Info:\n$errors\n" if $errors;
 }
 
-if ($official_image =~ /^\s*YES\s*$/o ) {
-  if (-d "$modules_base/$version" && -l "$modules_base/$version/build" ) {
-    rename("$modules_base/$version/build", "$modules_base/$version/build.save") ||
-      die "failed to move $modules_base/$version/build:$!";
-  }
+if (-d "$modules_base/$version" && -l "$modules_base/$version/build" ) {
+	rename("$modules_base/$version/build", "$modules_base/$version/build.save") ||
+	die "failed to move $modules_base/$version/build:$!";
 }
 
 # set the env var stem

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm	Sun Oct  4 04:00:33 2009	(r14318)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm	Sun Oct  4 16:42:21 2009	(r14319)
@@ -39,7 +39,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 $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";