diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-09 12:30:57 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-09 12:30:57 -0300 |
| commit | 3282ccb6286f172872d887baf49e623c51e0a157 (patch) | |
| tree | 73ddd891395a089f724fd9cbcb95c6a28e1ffcce /core/module-init-tools | |
| parent | f22839d3ad483a975a0c5955964bf257c0a0af6b (diff) | |
| parent | ddba9670c1518d9b420db6a6dca01a4a4a4136c7 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/virtualbox-modules/PKGBUILD
community-testing/virtualbox/PKGBUILD
community-testing/virtualbox/vbox-service.rc
community-testing/virtualbox/vboxdrv-reference.patch
core/cryptsetup/PKGBUILD
core/ed/PKGBUILD
core/module-init-tools/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
Diffstat (limited to 'core/module-init-tools')
| -rw-r--r-- | core/module-init-tools/PKGBUILD | 22 | ||||
| -rw-r--r-- | core/module-init-tools/modprobe.conf | 2 |
2 files changed, 14 insertions, 10 deletions
diff --git a/core/module-init-tools/PKGBUILD b/core/module-init-tools/PKGBUILD index d3299c964..d52b61042 100644 --- a/core/module-init-tools/PKGBUILD +++ b/core/module-init-tools/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 128937 2011-06-25 14:35:00Z dreisner $ +# $Id: PKGBUILD 142296 2011-11-08 00:38:05Z 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=1 -pkgdesc="utilities needed by Linux systems for managing loadable kernel modules" +pkgrel=2 +pkgdesc="Utilities needed by Linux systems for managing loadable kernel modules" arch=('i686' 'x86_64' 'mips64el') -url="http://kerneltools.org" +url="https://modules.wiki.kernel.org" license=('GPL') depends=('glibc') makedepends=('docbook2x') backup=('etc/modprobe.d/modprobe.conf') -source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2 +source=("http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.bz2" modprobe.conf docfix.patch) md5sums=('bc44832c6e41707b8447e2847d2019f5' - '316f1bda4c21af02b30252eb014a0a55' + '325657db471b3190f685e5a89c9b90e3' '4320d19902ded43bed55c804b065cdc7') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" # fix headers in SGML manpage sources and an XML typo patch -Np0 < "$srcdir/docfix.patch" @@ -30,10 +31,13 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" make DESTDIR=$pkgdir install + # extra modprobe.d conf dir + install -dm755 "$pkgdir/lib/modprobe.d" + # Install our custom (read: empty) modprobe.conf - install -Dm644 $srcdir/modprobe.conf $pkgdir/etc/modprobe.d/modprobe.conf + install -Dm644 "$srcdir/modprobe.conf" "$pkgdir/etc/modprobe.d/modprobe.conf" } diff --git a/core/module-init-tools/modprobe.conf b/core/module-init-tools/modprobe.conf index 83865a3af..551bdfbdf 100644 --- a/core/module-init-tools/modprobe.conf +++ b/core/module-init-tools/modprobe.conf @@ -1,3 +1,3 @@ # -# /etc/modprobe.d/modprobe.conf (for v2.6 kernels) +# /etc/modprobe.d/modprobe.conf # |