[kernel] r18617 - in dists/trunk/linux-2.6/debian: . templates/temp.image.plain
Ben Hutchings
benh at alioth.debian.org
Tue Jan 24 06:38:12 UTC 2012
Author: benh
Date: Tue Jan 24 06:38:10 2012
New Revision: 18617
Log:
Remove unused configuration variables from linux-image maintainer scripts
Modified:
dists/trunk/linux-2.6/debian/changelog
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/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Tue Jan 24 06:24:49 2012 (r18616)
+++ dists/trunk/linux-2.6/debian/changelog Tue Jan 24 06:38:10 2012 (r18617)
@@ -3,6 +3,7 @@
[ Ben Hutchings ]
* Stop changing 'build' and 'source' symlinks in linux-image maintainer
scripts; these symlinks now belong to the linux-headers packages
+ * Remove unused configuration variables from linux-image maintainer scripts
-- Ben Hutchings <ben at decadent.org.uk> Tue, 24 Jan 2012 06:19:55 +0000
Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm Tue Jan 24 06:24:49 2012 (r18616)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm Tue Jan 24 06:38:10 2012 (r18617)
@@ -21,15 +21,9 @@
# Predefined values:
my $version = "=V";
my $link_in_boot = "";
-my $no_symlink = "";
-my $do_symlink = "Yes"; # target machine defined
-my $do_boot_enable = "Yes"; # target machine defined
my $kimage = "=K";
my $initrd = "=I"; # initrd kernel
-my $use_hard_links = ''; # hardlinks do not work across fs boundaries
my $postrm_hook = ''; #Normally we do not
-my $minimal_swap = ''; # Do not swap symlinks
-my $ignore_depmod_err = ''; # normally we do not
my $kernel_arch = "=B";
my $ramdisk = "=MK"; # List of tools to create initial ram fs.
my $package_name = "linux-image-$version";
@@ -49,20 +43,9 @@
s/\#.*$//g;
next if /^\s*$/;
- $do_symlink = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/i;
- $no_symlink = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/i;
$link_in_boot = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i;
- $do_boot_enable = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/i;
- $use_hard_links = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i;
- $minimal_swap = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i;
- $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i;
- $do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i;
- $no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i;
$link_in_boot = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i;
- $use_hard_links = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i;
- $minimal_swap = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i;
- $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
$image_dest = "$1" if /image_dest\s*=\s*(\S+)/i;
$postrm_hook = "$1" if /postrm_hook\s*=\s*(\S+)/i;
Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst Tue Jan 24 06:24:49 2012 (r18616)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst Tue Jan 24 06:38:10 2012 (r18617)
@@ -11,20 +11,12 @@
# Predefined values:
my $version = "=V";
-my $link_in_boot = "";
-my $no_symlink = "";
-my $do_symlink = "Yes"; # target machine defined
my $kimage = "=K";
-my $use_hard_links = ''; # hardlinks do not wirk across fs boundaries
my $preinst_hook = ''; #Normally we do not
-my $minimal_swap = ''; # Do not swap symlinks
-my $ignore_depmod_err = ''; # normally we do not
my $kernel_arch = "=B";
-my $ramdisk = "=MK"; # List of tools to create initial ram fs.
my $package_name = "linux-image-$version";
#known variables
-my $image_dest = "/";
my $realimageloc = "/boot/";
my $CONF_LOC = '/etc/kernel-img.conf';
@@ -42,23 +34,7 @@
s/\#.*$//g;
next if /^\s*$/;
- $do_symlink = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/i;
- $no_symlink = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/i;
- $link_in_boot = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i;
- $use_hard_links = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i;
- $minimal_swap = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i;
- $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i;
-
- $do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i;
- $no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i;
- $link_in_boot = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i;
- $use_hard_links = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i;
- $minimal_swap = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i;
- $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
-
- $image_dest = "$1" if /image_dest\s*=\s*(\S+)/i;
$preinst_hook = "$1" if /preinst_hook\s*=\s*(\S+)/i;
- $ramdisk = "$1" if /ramdisk\s*=\s*(.+)$/i;
}
close CONF;
}
Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm Tue Jan 24 06:24:49 2012 (r18616)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm Tue Jan 24 06:38:10 2012 (r18617)
@@ -9,20 +9,12 @@
$|=1;
# Predefined values:
my $version = "=V";
-my $link_in_boot = "";
-my $no_symlink = "";
-my $do_symlink = "Yes"; # target machine defined
-my $do_boot_enable = "Yes"; # target machine defined
my $kimage = "=K";
-my $use_hard_links = ''; # hardlinks do not wirk across fs boundaries
my $prerm_hook = ''; #Normally we do not
-my $minimal_swap = ''; # Do not swap symlinks
-my $ignore_depmod_err = ''; # normally we do not
my $kernel_arch = "=B";
my $package_name = "linux-image-$version";
#known variables
-my $image_dest = "/";
my $realimageloc = "/boot/";
my $CONF_LOC = '/etc/kernel-img.conf';
@@ -50,24 +42,6 @@
s/\#.*$//g;
next if /^\s*$/;
- $do_symlink = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/i;
- $no_symlink = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/i;
- $link_in_boot = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i;
- $do_boot_enable = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/i;
- $use_hard_links = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i;
- $minimal_swap = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i;
- $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i;
-
-
- $do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i;
- $no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i;
- $link_in_boot = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i;
- $do_boot_enable = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/i;
- $use_hard_links = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i;
- $minimal_swap = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i;
- $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
-
- $image_dest = "$1" if /image_dest\s*=\s*(\S+)/i;
$prerm_hook = "$1" if /prerm_hook\s*=\s*(\S+)/i;
}
close CONF;
More information about the Kernel-svn-changes
mailing list