[kernel] r15890 - in dists/sid/linux-2.6/debian: . templates/temp.image.plain
Ben Hutchings
benh at alioth.debian.org
Sat Jun 19 00:41:29 UTC 2010
Author: benh
Date: Sat Jun 19 00:41:27 2010
New Revision: 15890
Log:
Always set kernel image basename template variable (=K)
Instead of setting an empty value, then fixing that to 'vmlinuz', set
the correct value to start with and remove the install-time fixups.
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 Sat Jun 19 00:32:23 2010 (r15889)
+++ dists/sid/linux-2.6/debian/rules.real Sat Jun 19 00:41:27 2010 (r15890)
@@ -382,6 +382,7 @@
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_INITRD = YES
endif
+ARG_KIMAGE = vmlinuz
install-image_hppa_$(FEATURESET)_$(FLAVOUR)_plain_templates \
install-image_mips_$(FEATURESET)_$(FLAVOUR)_plain_templates \
install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_templates \
Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst Sat Jun 19 00:32:23 2010 (r15889)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/postinst Sat Jun 19 00:41:27 2010 (r15890)
@@ -16,7 +16,7 @@
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 $kimage = "=K";
my $loader = "=L"; # lilo, silo, quik, palo, vmelilo, nettrom, arcboot or delo
my $initrd = "=I"; # initrd kernel
my $mkimage = ""; # command to generate the initrd image
@@ -135,13 +135,6 @@
# most of our work is done in $image_dest (nominally /)
chdir("$image_dest") or die "could not chdir to $image_dest:$!\n";
-# Paranoid check to make sure that the correct value is put in there
-if (! $kimage) { $kimage = "vmlinuz"; } # Hmm. empty
-elsif ($kimage =~ m/^b?zImage$/o) { $kimage = "vmlinuz"; } # these produce vmlinuz
-elsif ($kimage =~ m/^[iI]mage$/o) { my $nop = $kimage; }
-elsif ($kimage =~ m/^vmlinux$/o) { my $nop = $kimage; }
-else { $kimage = "vmlinuz"; } # Default
-
$ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch;
Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/postrm
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/postrm Sat Jun 19 00:32:23 2010 (r15889)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/postrm Sat Jun 19 00:41:27 2010 (r15890)
@@ -24,7 +24,7 @@
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 $kimage = "=K";
my $loader = "=L"; # lilo, silo, quik, palo, vmelilo, or nettrom
my $initrd = "=I"; # initrd kernel
my $use_hard_links = ''; # hardlinks do not work across fs boundaries
@@ -108,13 +108,6 @@
chdir("$image_dest") or die "could not chdir to $image_dest:$!\n";
}
-# Paranoid check to make sure that the correct value is put in there
-if (! $kimage) {$kimage = "vmlinuz"} # Hmm. empty
-elsif ($kimage =~ m/^b?zImage$/o) {$kimage = "vmlinuz"} # these produce vmlinuz
-elsif ($kimage =~ m/^[iI]mage$/o) { my $nop = $kimage;}
-elsif ($kimage =~ m/^vmlinux$/o) { my $nop = $kimage;}
-else {$kimage = "vmlinuz"} # default
-
$ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch;
Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/preinst
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/preinst Sat Jun 19 00:32:23 2010 (r15889)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/preinst Sat Jun 19 00:41:27 2010 (r15890)
@@ -13,7 +13,7 @@
my $link_in_boot = "";
my $no_symlink = "";
my $do_symlink = "Yes"; # target machine defined
-my $kimage = "=K"; # Should be empty, mostly
+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
Modified: dists/sid/linux-2.6/debian/templates/temp.image.plain/prerm
==============================================================================
--- dists/sid/linux-2.6/debian/templates/temp.image.plain/prerm Sat Jun 19 00:32:23 2010 (r15889)
+++ dists/sid/linux-2.6/debian/templates/temp.image.plain/prerm Sat Jun 19 00:41:27 2010 (r15890)
@@ -13,7 +13,7 @@
my $do_symlinks = "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 $kimage = "=K";
my $loader = "=L"; # lilo, silo, quik, palo, vmelilo, or nettrom
my $use_hard_links = ''; # hardlinks do not wirk across fs boundaries
my $prerm_hook = ''; #Normally we do not
@@ -61,13 +61,6 @@
# Ignore all invocations uxcept when called on to remove
exit 0 unless ($ARGV[0] && $ARGV[0] =~ /remove/) ;
-# Paranoid check to make sure that the correct value is put in there
-if (! $kimage) { $kimage = "vmlinuz";} # Hmm. empty
-elsif ($kimage =~ m/^b?zImage$/o) { $kimage = "vmlinuz";} # these produce vmlinuz
-elsif ($kimage =~ m/^[iI]mage$/o) { my $nop = $kimage; }
-elsif ($kimage =~ m/^vmlinux$/o) { my $nop = $kimage; }
-else { $kimage = "vmlinuz";} # Default
-
if (-r "$CONF_LOC" && -f "$CONF_LOC" ) {
if (open(CONF, "$CONF_LOC")) {
while (<CONF>) {
More information about the Kernel-svn-changes
mailing list