[Frugalware-git] frugalware-current: catalyst-11.8-1-i686 * remove blacklist stuff from install script * add modprobe conf for this * don't bump yet

[James Buren]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dc489dd890183acc821e7f1cb966dde2511851fd

commit dc489dd890183acc821e7f1cb966dde2511851fd
Author: James Buren <ryuo at frugalware.org>
Date:   Sun Aug 28 12:29:43 2011 -0500

catalyst-11.8-1-i686
* remove blacklist stuff from install script
* add modprobe conf for this
* don't bump yet

diff --git a/source/x11-extra/catalyst/FrugalBuild b/source/x11-extra/catalyst/FrugalBuild
index 8645b0c..9664ebd 100644
--- a/source/x11-extra/catalyst/FrugalBuild
+++ b/source/x11-extra/catalyst/FrugalBuild
@@ -11,13 +11,14 @@ groups=('x11-extra')
archs=('i686' 'x86_64' '!ppc' '!arm')
options=('nodocs' 'genscriptlet')
up2date="lynx -dump http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx | grep 'AMD Catalyst' | cut -d ' ' -f 6"
-source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run $pkgname.install)
+source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run $pkgname.install $pkgname.conf)
conflicts=('libgl' 'libglx' 'xf86-video-ati' 'xf86-video-mach64' 'xf86-video-r128')
provides=('libgl' 'libglx')
_F_kernelmod_scriptlet="$pkgname.install"
Finclude kernel-module
sha1sums=('807a5663b062a9cf6295ac8cf3dee7439aabda57' \
-          '524a5b34e9922439968eb428004b1b4b549134b9')
+          '719c67805efe39c276c49a36606ab11249cdcc70' \
+          '2ca17ca649b4389786d0611c6fef4e41f5dfbd43')

build()
{
@@ -91,4 +92,6 @@ build()
Ffileschmod /usr/lib 0755

Fbuild_kernelmod_scriptlet
+
+	Ffile /etc/modprobe.d/$pkgname.conf
}
diff --git a/source/x11-extra/catalyst/catalyst.conf b/source/x11-extra/catalyst/catalyst.conf
new file mode 100644
index 0000000..accffca
--- /dev/null
+++ b/source/x11-extra/catalyst/catalyst.conf
@@ -0,0 +1 @@
+blacklist radeon
diff --git a/source/x11-extra/catalyst/catalyst.install b/source/x11-extra/catalyst/catalyst.install
index 266a31e..aa03944 100644
--- a/source/x11-extra/catalyst/catalyst.install
+++ b/source/x11-extra/catalyst/catalyst.install
@@ -7,7 +7,6 @@ warning()
post_install()
{
depmod -a @_F_kernelmod_uname@
-	echo "blacklist radeon" >> /etc/modprobe.d/blacklist.conf
warning
}

@@ -20,7 +19,6 @@ post_upgrade()
post_remove()
{
depmod -a @_F_kernelmod_uname@
-	sed -i '/^blacklist radeon$/ d' /etc/modprobe.d/blacklist.conf
}

op=$1