diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-09 15:21:15 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-09 15:21:15 +0100 |
commit | 784f841dd02d4cf93e02aeab3e17cb7de1a7937f (patch) | |
tree | e5c1dc07e7ca785a346ef10efa7b43e212b7c884 /core/module-init-tools | |
parent | ebd15ff2a4a2dd51cc6d862bcef96a1b6d753336 (diff) | |
parent | 707457876743e969be9eb163c36928978df245cd (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/python-mpi4py/PKGBUILD
community/sword/PKGBUILD
community/xiphos/PKGBUILD
extra/bitlbee/PKGBUILD
extra/nicotine/PKGBUILD
extra/purple-plugin-pack/PKGBUILD
multilib/lib32-curl/PKGBUILD
multilib/lib32-glib2/PKGBUILD
Diffstat (limited to 'core/module-init-tools')
-rw-r--r-- | core/module-init-tools/PKGBUILD | 18 | ||||
-rw-r--r-- | core/module-init-tools/depmod.conf | 5 |
2 files changed, 17 insertions, 6 deletions
diff --git a/core/module-init-tools/PKGBUILD b/core/module-init-tools/PKGBUILD index d52b61042..1e3b467f9 100644 --- a/core/module-init-tools/PKGBUILD +++ b/core/module-init-tools/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 142296 2011-11-08 00:38:05Z dreisner $ +# $Id: PKGBUILD 144465 2011-12-06 10:57:39Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=module-init-tools pkgver=3.16 -pkgrel=2 +pkgrel=3 pkgdesc="Utilities needed by Linux systems for managing loadable kernel modules" arch=('i686' 'x86_64' 'mips64el') url="https://modules.wiki.kernel.org" license=('GPL') depends=('glibc') makedepends=('docbook2x') -backup=('etc/modprobe.d/modprobe.conf') +backup=('etc/modprobe.d/modprobe.conf' + 'etc/depmod.d/depmod.conf') source=("http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.bz2" modprobe.conf + depmod.conf docfix.patch) md5sums=('bc44832c6e41707b8447e2847d2019f5' '325657db471b3190f685e5a89c9b90e3' + '4b8cbcbc54b9029c99fd730e257d4436' '4320d19902ded43bed55c804b065cdc7') build() { @@ -35,9 +38,12 @@ package() { make DESTDIR=$pkgdir install - # extra modprobe.d conf dir - install -dm755 "$pkgdir/lib/modprobe.d" + # extra modprobe.d and depmod.d conf dirs + install -dm755 "$pkgdir/lib/modprobe.d" "$pkgdir/etc/depmod.d" - # Install our custom (read: empty) modprobe.conf + # Install custom depmod config to allow searching extramodules/ + install -Dm644 "$srcdir/depmod.conf" "$pkgdir/etc/depmod.d/depmod.conf" + + # Install our custom (empty) modprobe.conf install -Dm644 "$srcdir/modprobe.conf" "$pkgdir/etc/modprobe.d/modprobe.conf" } diff --git a/core/module-init-tools/depmod.conf b/core/module-init-tools/depmod.conf new file mode 100644 index 000000000..3feb67b05 --- /dev/null +++ b/core/module-init-tools/depmod.conf @@ -0,0 +1,5 @@ +# +# /etc/depmod.d/depmod.conf +# + +search updates extramodules built-in |