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

commit faf7ca9805bb7682cecd3e7f714bf07298ffc777
Author: Michel Hermier <herm...@frugalware.org>
Date:   Thu Apr 23 09:50:52 2009 +0200

kernel-modules.sh
* Make depends and makedepends lists to be happended rather than
overwritten. This sounds more logical that a Finclude scripts
add what it needs, and build scripts to impose what they need.
* Verified that none of the users don't rely on old behaviour.
(only nvidia.sh was using it wrongly, and was expecting new
behaviour).

diff --git a/source/include/kernel-module.sh b/source/include/kernel-module.sh
index 05dc890..d37ba93 100644
--- a/source/include/kernel-module.sh
+++ b/source/include/kernel-module.sh
@@ -61,8 +61,6 @@ Finclude kernel-version
# * _F_kernelmod_uname: the output of the uname -r command of the official 
kernel
# * _F_kernelmod_pkgver: the package version (pkgname-pkgrel) of the kernel
# * _F_kernelmod_dir: the directory where the modules are (ie: 
/lib/modules/`uname -r`)
-# * depends()
-# * makedepends()
# * install
###
if [ -z "$_F_kernelmod_scriptlet" ]; then
@@ -75,14 +73,16 @@ fi
_F_kernelmod_uname=$_F_kernelmod_ver$_F_kernelmod_name-fw$_F_kernelmod_rel
_F_kernelmod_pkgver=$_F_kernelmod_ver-$_F_kernelmod_rel
_F_kernelmod_dir=/lib/modules/$_F_kernelmod_uname
-depends=("kernel$_F_kernelmod_name=$_F_kernelmod_pkgver")
-makedepends=("kernel$_F_kernelmod_name-source=$_F_kernelmod_pkgver")
install=$_F_kernelmod_scriptlet

###
# == APPENDED VARIABLES
+# * kernel package name to depends()
+# * kernel package source to makedepends()
# * scriptlet and genscriptlet to options()
###
+depends=(${depen...@]} "kernel$_F_kernelmod_name=$_F_kernelmod_pkgver")
+makedepends=(${depen...@]} 
"kernel$_F_kernelmod_name-source=$_F_kernelmod_pkgver")
options=(${optio...@]} 'scriptlet' 'genscriptlet')

###
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to