diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-11 11:53:09 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-11 11:53:09 +0100 |
commit | 3156702a5deccd61451be9f7d8ba0fd212a3043b (patch) | |
tree | 624620bf3c78560df2455ebe11c66073a39d7355 /core/kmod | |
parent | aa74620a7ef4a49bd466b993c4675514781bd179 (diff) | |
parent | 4640048ddd1331c9f6fc14b8921ccecdb6b1ea11 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/kmod/PKGBUILD
core/nfs-utils/PKGBUILD
extra/libdmx/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/libgweather/PKGBUILD
gnome-unstable/libgweather/libgweather.install
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
testing/libxcb/PKGBUILD
testing/libxcb/libxcb-1.1-no-pthread-stubs.patch
testing/libxi/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'core/kmod')
-rw-r--r-- | core/kmod/PKGBUILD | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index b9e69d59f..ab9f39c6a 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,39 +1,28 @@ -# $Id: PKGBUILD 150335 2012-02-16 23:20:12Z dreisner $ +# $Id: PKGBUILD 152815 2012-03-09 17:34:10Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod -pkgver=5 -pkgrel=4 +pkgver=6 +pkgrel=1 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64' 'mips64el') -url="http://git.profusion.mobi/cgit.cgi/kmod.git" +url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' license=('GPL2') depends=('glibc' 'zlib') options=('!libtool') provides=('module-init-tools=3.16') conflicts=('module-init-tools') replaces=('module-init-tools') -source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz" - '0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch' - '0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch' +source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" "depmod-search.conf") -md5sums=('b271c2ec54aba1c67bda63c8579d8c15' - '81545a1509b43008f85c03fb980f0e86' - '662a85dbe420f04c1ef24f9cd4e4c990' +md5sums=('bad08102fad212cd34405136d9a7eb94' '4b8cbcbc54b9029c99fd730e257d4436') build() { cd "$pkgname-$pkgver" - # fix modprobe --show-depends failures on loaded modules - patch -Np1 <"$srcdir/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch" - - # fix infinite loop with softdeps - patch -Np1 <"$srcdir/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch" - ./configure \ --sysconfdir=/etc \ - --with-rootprefix= \ --with-zlib make |