Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=60285921127a1b345edcdc2e18f6f7b85f767657
commit 60285921127a1b345edcdc2e18f6f7b85f767657
Author: James Buren <r...@frugalware.org>
Date: Mon Jan 17 22:30:41 2011 -0600
oss-v4.2_build2004-1-i686
* skip over the current kernel module directory when deleting old
* tarballs
diff --git a/source/multimedia-extra/oss/FrugalBuild
b/source/multimedia-extra/oss/FrugalBuild
index 99dc80e..1d3fa35 100644
--- a/source/multimedia-extra/oss/FrugalBuild
+++ b/source/multimedia-extra/oss/FrugalBuild
@@ -16,11 +16,12 @@ groups=('multimedia-extra')
archs=('i686' 'x86_64')
up2date="Flastarchive $_dlurl $_ext"
backup=('usr/lib/oss/soundon.user')
-install="$pkgname.install"
+install="src/$pkgname.install"
source=($_dlurl/$pkgname-$_ver$_ext
$pkgname-disable-redundant-actions.patch
- rc.$pkgname)
-options=('scriptlet')
+ rc.$pkgname
+ $pkgname.install)
+options=('scriptlet' 'genscriptlet')
# Only alsa-lib is non-conflicting, for packages that rely on it.
conflicts=('alsa-utils' 'alsa-tools' 'alsa-oss' 'alsa-firmware')
Finclude kernel-module
@@ -38,7 +39,8 @@ _F_desktop_exec="ossxmix"
_F_desktop_categories="GTK;AudioVideo;"
sha1sums=('75c3ff1cf3e3bd5b351b1f778100387f998c7f3a' \
'e7887412fa6434e12ea8bf441cd6fd52008997e5' \
- '7f1c8c3758179bb1890dd17f232ebf824505cfea')
+ '7f1c8c3758179bb1890dd17f232ebf824505cfea' \
+ '8d630a5ef37a66568f9f8cdcb4a13d5c90f252d6')
build() {
Fcd "$pkgname-$_ver-src-gpl"
@@ -120,6 +122,9 @@ build() {
Fsplit $pkgname-gtk-mixer /usr/share/pixmaps
Fsplit $pkgname-gtk-mixer /usr/share/man/man1/ossxmix.1.gz
Fsplit $pkgname-gtk-mixer /usr/bin/ossxmix
+
+ # Modify the install script with a runtime value
+ Fexec sed -i "s:UNAME:$_F_kernelmod_uname:" "$Fsrcdir/oss.install"
}
# optimization OK
diff --git a/source/multimedia-extra/oss/oss.install
b/source/multimedia-extra/oss/oss.install
index aa43ab6..ad5637e 100644
--- a/source/multimedia-extra/oss/oss.install
+++ b/source/multimedia-extra/oss/oss.install
@@ -1,7 +1,7 @@
post_install()
{
echo -n "Suppressing ALSA drivers... "
- find /lib/modules -name "sound-preoss.tar.bz2" -delete
+ find /lib/modules -name "sound-preoss.tar.bz2" -not -path "*UNAME*"
-delete
/usr/lib/oss/scripts/remove_drv.sh &> /dev/null
depmod -a
/usr/sbin/chkconfig --add rc.oss
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
