diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
commit | 70877cfb7e290449b9f9c660e25345f462576c4c (patch) | |
tree | 0f63651432b8448262549265a5420fff1ab665e8 /core/kmod | |
parent | 509bf50c73444930b6f57c42678ec22e7de82c88 (diff) | |
parent | 412d061bfbf23d1e908eed3f8405b1af46fb1ba8 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community-testing/gnash/PKGBUILD
community-testing/performous/PKGBUILD
community/drbd/PKGBUILD
community/oss/PKGBUILD
community/pinot/PKGBUILD
core/glibc/PKGBUILD
core/kmod/PKGBUILD
core/pkg-config/PKGBUILD
core/systemd/PKGBUILD
extra/bitlbee/PKGBUILD
extra/mesa/PKGBUILD
extra/nettle/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdepim/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-nettle/PKGBUILD
multilib/lib32-nouveau-dri/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/zsnes/PKGBUILD
multilib/zsnes/zsnes.patch
testing/cryptsetup/PKGBUILD
testing/ekiga/PKGBUILD
testing/iputils/PKGBUILD
testing/poppler/PKGBUILD
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'core/kmod')
-rw-r--r-- | core/kmod/PKGBUILD | 16 | ||||
-rw-r--r-- | core/kmod/kmod.install | 9 |
2 files changed, 14 insertions, 11 deletions
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 45fb7b5ae..6f32487fe 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162219 2012-06-23 18:29:15Z dreisner $ +# $Id: PKGBUILD 163513 2012-07-14 13:07:23Z allan $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod pkgver=9 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64' 'mips64el') url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' @@ -13,21 +13,15 @@ options=('!libtool') provides=('module-init-tools=3.16') conflicts=('module-init-tools') replaces=('module-init-tools') +install=kmod.install source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" - "depmod-search.conf" - "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch") + "depmod-search.conf") md5sums=('c8ae2d2694fbca2b28e238b30543a0cd' - 'dd62cbf62bd8f212f51ef8c43bec9a77' - 'b099be8997331dcb549617188cabc6af') + 'dd62cbf62bd8f212f51ef8c43bec9a77') build() { cd "$pkgname-$pkgver" - patch -Np1 <"$srcdir"/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch - - # Architecture-specific test. - sed -ri 's:(&smodinfo_jonsmodules,):/*\1*/:' testsuite/test-modinfo.c - ./configure \ --sysconfdir=/etc \ --with-zlib \ diff --git a/core/kmod/kmod.install b/core/kmod/kmod.install new file mode 100644 index 000000000..0a2e88dc5 --- /dev/null +++ b/core/kmod/kmod.install @@ -0,0 +1,9 @@ +#!/bin/sh + +post_upgrade() { + if [ "$(vercmp 9-2 "$2")" -eq 1 ]; then + echo "==> Kernel modules are now only read from /usr/lib/modules, all custom" + echo " built kernels and modules must be moved there before rebooting." + fi +} + |