Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=f81e829914156141d5159ef69f43d326de1707ad
commit f81e829914156141d5159ef69f43d326de1707ad Author: Michel Hermier <herm...@frugalware.org> Date: Thu Mar 25 00:23:59 2010 +0100 kernel-module.* * Use genscriptlet.sh. diff --git a/source/include/kernel-module.install b/source/include/kernel-module.install index b389d4f..de3aefd 100644 --- a/source/include/kernel-module.install +++ b/source/include/kernel-module.install @@ -1,6 +1,6 @@ post_install() { - /sbin/depmod -a $_F_kernelmod_uname + /sbin/depmod -a @_F_kernelmod_uname@ } post_upgrade() diff --git a/source/include/kernel-module.sh b/source/include/kernel-module.sh index 1f06f83..1b52122 100644 --- a/source/include/kernel-module.sh +++ b/source/include/kernel-module.sh @@ -61,10 +61,10 @@ 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`) -# * install +# * _F_genscriptlet_install: the _F_kernelmod_scriptlet value. ### if [ -z "$_F_kernelmod_scriptlet" ]; then - _F_kernelmod_scriptlet="kernel-module.install" + _F_kernelmod_scriptlet="$Fincdir/kernel-module.install" fi if [ -z "$_F_kernelmod_name" ]; then _F_kernelmod_ver="$_F_kernelver_ver" @@ -73,17 +73,21 @@ 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 -install=$_F_kernelmod_scriptlet +_F_genscriptlet_install="$_F_kernelmod_scriptlet" ### # == APPENDED VARIABLES # * kernel package name to depends() # * kernel package source to makedepends() -# * scriptlet and genscriptlet to options() +# * scriptlet to options() +# * Fkernelmod_genscriptlet_hook to _F_genscriptlet_hooks() ### -depends=(${depen...@]} "kernel$_F_kernelmod_name=$_F_kernelmod_pkgver") -makedepends=(${depen...@]} "kernel$_F_kernelmod_name-source=$_F_kernelmod_pkgver") -options=(${optio...@]} 'scriptlet' 'genscriptlet') +depends=("${depen...@]}" "kernel$_F_kernelmod_name=$_F_kernelmod_pkgver") +makedepends=("${depen...@]}" "kernel$_F_kernelmod_name-source=$_F_kernelmod_pkgver") +options=("${optio...@]}" 'scriptlet') # Required by kernel +_F_genscriptlet_hooks=("${_f_genscriptlet_hoo...@]}" Fkernelmod_genscriptlet_hook) + +Finclude genscriptlet ### # == PROVIDED FUNCTIONS @@ -92,8 +96,10 @@ options=(${optio...@]} 'scriptlet' 'genscriptlet') ### Fbuild_kernelmod_scriptlet() { - cp $Fincdir/kernel-module.install ${Fsrcdir%/src} - Fsed '$_F_kernelmod_uname' "$_F_kernelmod_uname" ${Fsrcdir%/src}/$_F_kernelmod_scriptlet + Fgenscriptlet + + # Compatibility code remove after 1.3 + Fsed '$_F_kernelmod_uname' "$_F_kernelmod_uname" "${Fsrcdir}/$(basename "$_F_kernelmod_scriptlet")" } ### _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git