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

[Tim Gardner]

Andy Whitcroft wrote:
> On Thu, Dec 11, 2008 at 11:39:51AM -0800, Tim Gardner wrote:
> 
>> Argh! Your patch is correct, and its not the first time I've missed
>> this. How about redoing the patch such that all of the files in
>> extra/modprobe.d are copied into the package build directory ? I can't
>> think of a good reason _not_ to do this (modulo the arch directory).
> 
> Yes that sounds like a very sound idea.  Below is a debdiff to do just
> that.  I have tested this locally and the binary .deb seems to have the
> right files in it.
> 
> -apw
> 
> === 8< ===
> module-init-tools: install all entries in the modprobe.d directory
> 
> We have been caught out a couple of times not adding files in the modprobe.d
> to the list of files to be installed, and so they do not actually made the
> binary packages and are not installed.  There is no good reason to not install
> all of these files (other than the arch subdirectory which is selectivly
> installed already).
> 
> The patch below updates the installer to install all of these files except
> the arch subdir.
> 
> Signed-off-by: Andy Whitcroft <apw at canonical.com>
> 
> 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
> @@ -84,12 +84,14 @@
>  
>  	dh_installdirs bin/ sbin/ etc/modprobe.d/arch/ etc/depmod.d/ lib/modules/
>  	dh_install --sourcedir=$O -p module-init-tools
> -	cp extra/modprobe.d/aliases $D/etc/modprobe.d/
> -	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/isapnp $D/etc/modprobe.d/
> -	cp extra/modprobe.d/options $D/etc/modprobe.d/
> +	( \
> +		cd extra/modprobe.d/ && \
> +                find . -name '.' -o -name '.*' -prune \
> +                        -o -name arch -prune \
> +                        -o -print | \
> +                cpio -pvd --preserve-modification-time \
> +                        $D/etc/modprobe.d/ \
> +	)
>  	cp extra/depmod.d/ubuntu.conf $D/etc/depmod.d/
>  
>  	install --mode=755 extra/update-modules $D/sbin/
> 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,11 @@
> +module-init-tools (3.3-pre11-4ubuntu18) intrepid; urgency=low
> +
> +  *  Ensure we install blacklist-amd76-edac from LP: #297750, to ensure we
> +     never fall foul of this internal list install all of the modprobe.d
> +     files with the exception of the arch directory.
> +
> + -- Andy Whitcroft <apw at canonical.com>  Tue, 16 Dec 2008 15:27:19 +0000
> +
>  module-init-tools (3.3-pre11-4ubuntu17) intrepid-proposed; urgency=low
>  
>    [ Andy Whitcroft ]
> 

uploaded

-- 
Tim Gardner tim.gardner at canonical.com