diff --git a/debian/changelog b/debian/changelog index 2c513fa0e..59c0d63f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ linux (3.11~rc5-1~exp1) UNRELEASED; urgency=low * [armel] Disable iop32x and ixp4xx flavours (fixes FTBFS) * Clean up maintainer scripts and templating system - Move all templates under debian/templates + - linux-image: Remove undocumented $KERNEL_ARCH variable from hook + environment -- Ben Hutchings Sun, 11 Aug 2013 19:34:47 +0200 diff --git a/debian/templates/image.plain.postinst.in b/debian/templates/image.plain.postinst.in index 55cd64a09..858636a24 100755 --- a/debian/templates/image.plain.postinst.in +++ b/debian/templates/image.plain.postinst.in @@ -22,7 +22,6 @@ my $use_hard_links = ''; # hardlinks do not work across fs boundaries my $postinst_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 = ''; my $package_name = "linux-image-$version"; @@ -99,8 +98,6 @@ if ($do_symlink && $no_symlink) { # most of our work is done in $image_dest (nominally /) chdir("$image_dest") or die "could not chdir to $image_dest:$!\n"; -$ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch; - die "Internal Error: Could not find image (" . $realimageloc . "$kimage-$version)\n" unless -e $realimageloc diff --git a/debian/templates/image.plain.postrm.in b/debian/templates/image.plain.postrm.in index 4ef4651c3..0a4f7c2bd 100755 --- a/debian/templates/image.plain.postrm.in +++ b/debian/templates/image.plain.postrm.in @@ -24,7 +24,6 @@ my $link_in_boot = ""; my $kimage = "=K"; my $initrd = "=I"; # initrd kernel my $postrm_hook = ''; #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"; @@ -66,8 +65,6 @@ if (-d "$image_dest") { chdir("$image_dest") or die "could not chdir to $image_dest:$!\n"; } -$ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch; - ###################################################################### ###################################################################### diff --git a/debian/templates/image.plain.preinst.in b/debian/templates/image.plain.preinst.in index 8bf10e7b6..c5b5e027f 100755 --- a/debian/templates/image.plain.preinst.in +++ b/debian/templates/image.plain.preinst.in @@ -13,7 +13,6 @@ $|=1; my $version = "=V"; my $kimage = "=K"; my $preinst_hook = ''; #Normally we do not -my $kernel_arch = "=B"; my $package_name = "linux-image-$version"; #known variables @@ -40,8 +39,6 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { } } -$ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch; - # set the env var stem $ENV{'STEM'} = "linux"; diff --git a/debian/templates/image.plain.prerm.in b/debian/templates/image.plain.prerm.in index 3c43b9ff5..395b1e21f 100755 --- a/debian/templates/image.plain.prerm.in +++ b/debian/templates/image.plain.prerm.in @@ -11,7 +11,6 @@ $|=1; my $version = "=V"; my $kimage = "=K"; my $prerm_hook = ''; #Normally we do not -my $kernel_arch = "=B"; my $package_name = "linux-image-$version"; #known variables @@ -43,8 +42,6 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC" ) { } -$ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch; - #check to see if we are trying to remove a running kernel # if so we abort right now. chop($running=`uname -r`);