summaryrefslogtreecommitdiffstats
path: root/abs/core
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2012-09-04 04:25:04 (GMT)
committerBritney Fransen <brfransen@gmail.com>2012-09-04 04:25:04 (GMT)
commit4510b7c0fb05c0d6c28bfaa1c9753836b6cda96b (patch)
tree0062a2409841e8be224bfc743e140b175e396350 /abs/core
parenta9ca69f7f9f03281d39c136a53ef185af15bd71d (diff)
downloadlinhes_pkgbuild-4510b7c0fb05c0d6c28bfaa1c9753836b6cda96b.zip
linhes_pkgbuild-4510b7c0fb05c0d6c28bfaa1c9753836b6cda96b.tar.gz
linhes_pkgbuild-4510b7c0fb05c0d6c28bfaa1c9753836b6cda96b.tar.bz2
v4l-dvb: fix conflicting kernel modules. refs #844
Diffstat (limited to 'abs/core')
-rw-r--r--abs/core/v4l-dvb/PKGBUILD9
-rw-r--r--abs/core/v4l-dvb/v4l-dvb.install8
2 files changed, 6 insertions, 11 deletions
diff --git a/abs/core/v4l-dvb/PKGBUILD b/abs/core/v4l-dvb/PKGBUILD
index ac150bb..f19c2fa 100644
--- a/abs/core/v4l-dvb/PKGBUILD
+++ b/abs/core/v4l-dvb/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=v4l-dvb
_kernver=`uname -r`
-pkgver=20120828
+pkgver=20120904
pkgrel=1
pkgdesc="V4L-DVB device drivers (newer than those included in kernel26)"
arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ build() {
msg "Connecting to GIT server...."
if [ -d "${srcdir}/${_gitname}" ] ; then
- cd ${_gitname} && git checkout -- . && git pull --rebase
+ cd ${_gitname} && git pull --rebase
else
git clone ${_gitroot}
fi
@@ -42,7 +42,8 @@ build() {
package() {
cd "${srcdir}/${_gitname}"
- make DESTDIR="${pkgdir}" install
- rm -fr ${pkgdir}/lib/modules/$_kernver/modules*
+ make DESTDIR="${pkgdir}/lib/modules/$_kernver/updates" install
+ # compress new kernel modules
+ find ${pkgdir}/lib/modules/$_kernver/updates/ -not -name 'media.ko' -name '*.ko' -exec gzip '{}' \;
}
md5sums=()
diff --git a/abs/core/v4l-dvb/v4l-dvb.install b/abs/core/v4l-dvb/v4l-dvb.install
index ec6382d..f7b7197 100644
--- a/abs/core/v4l-dvb/v4l-dvb.install
+++ b/abs/core/v4l-dvb/v4l-dvb.install
@@ -1,18 +1,12 @@
post_install() {
- echo ">>> Removing duplicate compressed kernel modules..."
- for file in `find /lib/modules -name "*.ko"`; do if [[ -e $file.gz ]]; then rm "$file.gz"; fi; done
echo ">>> Running depmod..."
depmod
}
post_upgrade() {
- echo ">>> Removing duplicate compressed kernel modules..."
- for file in `find /lib/modules -name "*.ko"`; do if [[ -e $file.gz ]]; then rm "$file.gz"; fi; done
- echo ">>> Running depmod..."
- depmod
+ post_install
}
post_remove() {
echo ">>> v4l-dvb has been removed"
- echo ">>> kernel26 & dvb-firmware & linux-firmware should be reinstalled"
}