[Karmic] UBUNTU: Add missing files to prerm files_to_remove list

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 <leann.ogasawara@canonical.com>
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 <leann.ogasawara@canonical.com>
---
 debian.ec2/control-scripts/prerm |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Leann Ogasawara wrote:
> 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 <leann.ogasawara@canonical.com>
> 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 <leann.ogasawara@canonical.com>
> ---
>  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) {

Acked-by: Tim Gardner <tim.gardner@canonical.com>

Leann Ogasawara wrote:
> 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 <leann.ogasawara@canonical.com>
> 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 <leann.ogasawara@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  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) {

Applied to Karmic ec2