[PATCH 4/5] Revert "UBUNTU: [Debian] dtb: symlink from /boot/dtb-$(uname -r) to /boot/dtb"

Paolo Pisati paolo.pisati at canonical.com
Mon Sep 1 11:29:08 UTC 2014


This reverts commit 459ead9705800ac2c5a93cfa58724199c0c878a7.

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian/control-scripts/postinst | 19 -------------------
 debian/control-scripts/postrm   |  2 --
 2 files changed, 21 deletions(-)

diff --git a/debian/control-scripts/postinst b/debian/control-scripts/postinst
index a388cef..c4fc23f 100644
--- a/debian/control-scripts/postinst
+++ b/debian/control-scripts/postinst
@@ -37,7 +37,6 @@ my $ramdisk           = "/usr/sbin/update-initramfs";  # List of tools to create
 my $notifier          = "/usr/share/update-notifier/notify-reboot-required";
 my $package_name      = "linux-image-$version";
 my $explicit_do_loader = 'Yes';
-my $dtb               = 'dtb';
 
 my $Loader          = "NoLOADER"; #
 $Loader             = "LILO"     if $loader =~ /^lilo/io;
@@ -927,24 +926,6 @@ else {
   }
 }
 
-if (-e "$dtb-$version") {
-  if (! defined $ARGV[1] || ! $ARGV[1] || $ARGV[1] =~ m/<unknown>/og) {
-	image_magic($dtb, $image_dest);
-  }
-  else {
-	if (! -e "$dtb") {
-	  handle_missing_link($dtb, $image_dest, "$dtb-$version", 
-						  $realimageloc);
-	}
-	else {
-	  print STDERR
-		"Not updating dtb symbolic links since we are being updated/reinstalled \n";
-	  print STDERR
-		"($ARGV[1] was configured last, according to dpkg)\n";
-	}
-  }
-}
-
 # We used to have System.* files in /
 if (-e "/System.map" || -e "/System.old") {
   unlink '/System.map' if -e '/System.map';
diff --git a/debian/control-scripts/postrm b/debian/control-scripts/postrm
index 56f4182..227e351 100644
--- a/debian/control-scripts/postrm
+++ b/debian/control-scripts/postrm
@@ -348,8 +348,6 @@ if ($ARGV[0] !~ /upgrade/) {
   image_magic($kimage . ".old", $image_dest);
   image_magic("initrd.img",     $image_dest) if $initrd;
   image_magic("initrd.img.old", $image_dest) if $initrd;
-  image_magic("dtb",     $image_dest);
-  image_magic("dtb.old", $image_dest);
 }
 
 exit 0;
-- 
1.9.1





More information about the kernel-team mailing list