From patchwork Fri Feb 19 23:55:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 45901 X-Patchwork-Delegate: stefan.bader@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 35E5DB7CB9 for ; Sat, 20 Feb 2010 10:56:02 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NichL-0005N5-Am; Fri, 19 Feb 2010 23:55:51 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NichJ-0005Mx-AA for kernel-team@lists.ubuntu.com; Fri, 19 Feb 2010 23:55:49 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Nich8-0003ig-Jv for ; Fri, 19 Feb 2010 23:55:45 +0000 Received: from 128-193-143-232.public.oregonstate.edu ([128.193.143.232]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1Nich8-0008Lj-8G for kernel-team@lists.ubuntu.com; Fri, 19 Feb 2010 23:55:38 +0000 Subject: [PATCH] [Karmic] UBUNTU: Add missing files to prerm files_to_remove list From: Leann Ogasawara To: kernel-team Date: Fri, 19 Feb 2010 15:55:34 -0800 Message-ID: <1266623734.5124.116.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.2 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Hi All, In http://bugs.launchpad.net/bugs/524180 it was noted that purging the Karmic ec2 linux kernel package failed to completely remove /lib/modules/2.6.31-30x-ec2. A similar issue was pointed out in bugs 345623 and 415832 and resolved via commit 8b453930465c15f490ea44c2987b0a1bfe71ed66 for the Karmic master branch. The following patch takes the same fix that was applied to the master branch and applies it to the ec2 branch. Please consider this for a Karmic SRU. This is an Ubuntu specific fix and should have low to no risk of regression. For Lucid this should be a non-issue with recent changes which pull in common files (like control-scripts/prerm) into the debian dir. git://kernel.ubuntu.com/ogasawara/ubuntu-karmic.git lp524180 Thanks in advance, Leann >From 2b536f99283f34f5b95e85090b9554e105029f65 Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Fri, 19 Feb 2010 10:28:24 -0800 Subject: UBUNTU: Add missing files to prerm files_to_remove list BugLink: http://bugs.launchpad.net/bugs/524180 Purge fails to completely remove files from /lib/modules/`uname -r`. Subsequently a warning is displayed and /lib/modules/`uname -r` is not completely removed. A similar fix to resolve this issue was applied to the master branch via commit 8b453930465c15f490ea44c2987b0a1bfe71ed66. Apply the same fix to the ec2 branch. Signed-off-by: Leann Ogasawara Acked-by: Tim Gardner Acked-by: Stefan Bader --- debian.ec2/control-scripts/prerm | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/debian.ec2/control-scripts/prerm b/debian.ec2/control-scripts/prerm index 47fbd21..4c0ad60 100644 --- a/debian.ec2/control-scripts/prerm +++ b/debian.ec2/control-scripts/prerm @@ -284,6 +284,7 @@ sub success () { modules.ieee1394map modules.pnpbiosmap modules.alias modules.ccwmap modules.inputmap modules.symbols modules.ofmap modules.seriomap + modules.alias.bin modules.dep.bin modules.symbols.bin }; foreach my $extra_file (@files_to_remove) {