[PATCH 0/1] [SRU Intrepid] LP#297750 -- disable module amd76x_edac

[Andy Whitcroft]

On Thu, Dec 04, 2008 at 02:05:16PM -0800, Tim Gardner wrote:

> ACK - though what I uploaded is slightly different. See attached.
> 
> -- 
> Tim Gardner tim.gardner at canonical.com
>
> diff -u module-init-tools-3.3-pre11/debian/changelog module-init-tools-3.3-pre11/debian/changelog
> --- module-init-tools-3.3-pre11/debian/changelog
> +++ module-init-tools-3.3-pre11/debian/changelog
> @@ -1,3 +1,13 @@
> +module-init-tools (3.3-pre11-4ubuntu17) intrepid-proposed; urgency=low
> +
> +  [ Andy Whitcroft ]
> +
> +  * Add a blacklist entry for the amd76x_edac which prevents the
> +    AGP aperture being initialised.
> +    LP: #297750
> +
> + -- Tim Gardner <tim.gardner at canonical.com>  Thu, 04 Dec 2008 14:55:23 -0700
> +
>  module-init-tools (3.3-pre11-4ubuntu16) intrepid; urgency=low
>  
>    * Add ignore_hpa=1 option for libata to get prior functionality and
> only in patch2:
> unchanged:
> --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/blacklist-amd76-edac
> +++ module-init-tools-3.3-pre11/extra/modprobe.d/blacklist-amd76-edac
> @@ -0,0 +1,5 @@
> +# EDAC driver for amd76x clashes with the agp driver preventing the aperture
> +# from being initialised (Ubuntu: #297750). Blacklist so that the driver
> +# continues to build and is installable for the few cases where its
> +# really needed.
> +blacklist amd76x_edac

I just received this update via -proposed and it actually doesn't
include the blacklist-amd76-edac file.  It seems it does not get
installed during the binary build.  We need the debdiff below on top to
make sure it is installed.  Tim if it looks ok to you perhaps you could
sponsor it.

-apw

diff -u module-init-tools-3.3-pre11/debian/rules module-init-tools-3.3-pre11/debian/rules
--- module-init-tools-3.3-pre11/debian/rules
+++ module-init-tools-3.3-pre11/debian/rules
@@ -88,6 +88,7 @@
 	cp extra/modprobe.d/blacklist $D/etc/modprobe.d/
 	cp extra/modprobe.d/blacklist-framebuffer $D/etc/modprobe.d/
 	cp extra/modprobe.d/blacklist-watchdog $D/etc/modprobe.d/
+	cp extra/modprobe.d/blacklist-amd76-edac $D/etc/modprobe.d/
 	cp extra/modprobe.d/isapnp $D/etc/modprobe.d/
 	cp extra/modprobe.d/options $D/etc/modprobe.d/
 	cp extra/depmod.d/ubuntu.conf $D/etc/depmod.d/
diff -u module-init-tools-3.3-pre11/debian/changelog module-init-tools-3.3-pre11/debian/changelog
--- module-init-tools-3.3-pre11/debian/changelog
+++ module-init-tools-3.3-pre11/debian/changelog
@@ -1,3 +1,9 @@
+module-init-tools (3.3-pre11-4ubuntu18) intrepid-proposed; urgency=low
+
+  * Ensure we install blacklist-amd76-edac (LP: #297750)
+
+ -- Andy Whitcroft <apw at canonical.com>  Mon, 08 Dec 2008 01:48:21 +0000
+
 module-init-tools (3.3-pre11-4ubuntu17) intrepid-proposed; urgency=low
 
   [ Andy Whitcroft ]