[kernel] r9662 - in dists/trunk/linux-2.6/debian: . templates/temp.image.plain
Bastian Blank
waldi at alioth.debian.org
Sun Oct 14 10:39:04 UTC 2007
Author: waldi
Date: Sun Oct 14 10:39:04 2007
New Revision: 9662
Log:
* debian/changelog: Update.
* debian/templates/temp.image.plain: Merge from kernel-package 11.001.
Modified:
dists/trunk/linux-2.6/debian/changelog
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/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Sun Oct 14 10:39:04 2007
@@ -98,7 +98,10 @@
[ dann frazier ]
* [ia64] Re-enable various unintentionally disabled config options
- -- maximilian attems <maks at debian.org> Sat, 13 Oct 2007 14:37:28 +0200
+ [ Bastian Blank ]
+ * Update plain image type.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 14 Oct 2007 12:37:43 +0200
linux-2.6 (2.6.22-5) unstable; urgency=low
Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst (original)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst Sun Oct 14 10:39:04 2007
@@ -116,7 +116,6 @@
$do_symlink = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/ig;
$no_symlink = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/ig;
$reverse_symlink = "" if /reverse_symlink\s*=\s*(no|false|0)\s*$/ig;
- $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;
@@ -139,7 +138,6 @@
$do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/ig;
$no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/ig;
$reverse_symlink = "Yes" if /reverse_symlinks\s*=\s*(yes|true|1)\s*$/ig;
- $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;
@@ -475,13 +473,13 @@
if ($use_hard_links =~ m/YES/i) {
link($Old . "$link_name", $src_dir . "$link_name") ||
- die("Failed to symbolic-link " . $dest_dir . "$link_name to " . $src_dir
+ die("Failed to hard-link " . $dest_dir . "$link_name to " . $src_dir
. "$link_name .\n");
warn "ln " . $Old . "$link_name " . $src_dir . "$link_name" if $DEBUG;
}
else {
symlink($Old . "$link_name", $src_dir . "$link_name") ||
- die("Failed to link " . $dest_dir . "$link_name to " . $src_dir .
+ die("Failed to symbolically link " . $dest_dir . "$link_name to " . $src_dir .
"$link_name .\n");
warn "ln -s " . $Old . "$link_name " . $src_dir . "$link_name" if $DEBUG;
}
@@ -515,7 +513,7 @@
if $DEBUG;
my $vmlinuz_target = readlink "$kimage";
my $real_target = '';
- my $target = `readlink -q -m "${realimageloc}${kimage-$version}"`;
+ my $target = `readlink -q -m "${realimageloc}${kimage}-$version"`;
$real_target = abs_path($vmlinuz_target) if defined($vmlinuz_target);
if (!defined($vmlinuz_target) || ! -f "$real_target") {
@@ -794,7 +792,7 @@
if ($use_hard_links =~ m/YES/i) {
warn "ln " . $Old . "$kimage " . $realimageloc . "$image_name" if $DEBUG;
if (! link($Old . "$kimage", $realimageloc . "$image_name")) {
- warn "Could not link " . $image_dest .
+ warn "Could not hard link " . $image_dest .
"$kimage to $image_name :$!";
}
}
@@ -827,7 +825,7 @@
if (! link($Old . "$image_name", "$kimage")) {
warn "mv $kimage.$$ $kimage" if $DEBUG;
rename("$kimage.$$", "$kimage");
- die("Failed to link " . $realimageloc . "$image_name to "
+ die("Failed to hard link " . $realimageloc . "$image_name to "
. $image_dest . "$kimage .\n");
}
}
@@ -1151,9 +1149,10 @@
# set the env var stem
$ENV{'STEM'} = "=ST";
-sub exec_script {
+sub run_hook {
my $type = shift;
my $script = shift;
+
print STDERR "Running $type hook script $script.\n";
system ("$script $version $realimageloc$kimage-$version") &&
print STDERR "User $type hook script [$script] ";
@@ -1171,31 +1170,6 @@
exit $? >> 8;
}
}
-sub run_hook {
- my $type = shift;
- my $script = shift;
- if ($script =~ m,^/,) {
- # Full path provided for the hook script
- if (-x "$script") {
- &exec_script($type,$script);
- }
- else {
- die "The provided $type hook script [$script] could not be run.\n";
- }
- }
- else {
- # Look for it in a safe path
- for my $path ('/bin', '/sbin', '/usr/bin', '/usr/sbin') {
- if (-x "$path/$script") {
- &exec_script($type, "$path/$script");
- return 0;
- }
- }
- # No luck
- print STDERR "Could not find $type hook script [$script].\n";
- die "Looked in: '/bin', '/sbin', '/usr/bin', '/usr/sbin'\n";
- }
-}
## Run user hook script here, if any
if ($postinst_hook) {
Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm (original)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm Sun Oct 14 10:39:04 2007
@@ -119,7 +119,6 @@
$do_symlink = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/ig;
$no_symlink = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/ig;
$reverse_symlink = "" if /reverse_symlinks\s*=\s*(no|false|0)\s*$/ig;
- $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;
@@ -141,7 +140,6 @@
$do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/ig;
$no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/ig;
$reverse_symlink = "Yes" if /reverse_symlinks\s*=\s*(yes|true|1)\s*$/ig;
- $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;
@@ -374,6 +372,7 @@
modules.ieee1394map modules.pnpbiosmap
modules.alias modules.ccwmap modules.inputmap
modules.symbols build source modules.ofmap
+ modules.seriomap
};
foreach my $extra_file (@files_to_remove) {
Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst (original)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst Sun Oct 14 10:39:04 2007
@@ -117,7 +117,6 @@
$do_symlink = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/ig;
$no_symlink = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/ig;
$reverse_symlink = "" if /reverse_symlinks\s*=\s*(no|false|0)\s*$/ig;
- $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;
@@ -140,7 +139,6 @@
$do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/ig;
$no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/ig;
$reverse_symlink = "Yes" if /reverse_symlinks\s*=\s*(yes|true|1)\s*$/ig;
- $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;
@@ -302,7 +300,8 @@
}
$answer =~ s/^\s+//;
$answer =~ s/\s+$//;
- print STDERR "Ok, Aborting\n" unless $answer =~ /^(f|n)/i;
+ print STDERR "Ok, Aborting, since the bootloader might not handle " .
+ "an initrd/initramfs image.\n" unless $answer =~ /^(f|n)/i;
if ($answer !~ /^(f|n)/i && $invisible) {
my $note = "${package_name}/preinst/abort-install-$version";
@@ -446,7 +445,8 @@
$answer =~ s/^\s+//;
$answer =~ s/\s+$//;
- print STDERR "Ok, Aborting\n" unless $answer =~ /^(f|n)/i;
+ print STDERR "Ok, aborting, since modules for this image already exist.\n"
+ unless $answer =~ /^(f|n)/i;
if ($answer !~ /^(f|n)/i && $invisible) {
my $note = "${package_name}/preinst/abort-overwrite-$version";
Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm (original)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm Sun Oct 14 10:39:04 2007
@@ -120,7 +120,6 @@
$do_symlink = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/ig;
$no_symlink = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/ig;
$reverse_symlink = "" if /reverse_symlinks\s*=\s*(no|false|0)\s*$/ig;
- $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;
@@ -142,7 +141,6 @@
$do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/ig;
$no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/ig;
$reverse_symlink = "Yes" if /reverse_symlinks\s*=\s*(yes|true|1)\s*$/ig;
- $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;
More information about the Kernel-svn-changes
mailing list