From 3d65494a8eda056377febda4642ce992e69a9371 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 7 Apr 2012 00:01:17 +0000
Subject: Sat Apr  7 00:01:16 UTC 2012

---
 core/kmod/PKGBUILD | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'core/kmod/PKGBUILD')

diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 3f933fae3..88ad2f13d 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154256 2012-03-25 02:41:50Z dreisner $
+# $Id: PKGBUILD 155732 2012-04-06 00:04:08Z tomegun $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=kmod
 pkgver=7
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64')
 url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
@@ -14,16 +14,24 @@ provides=('module-init-tools=3.16')
 conflicts=('module-init-tools')
 replaces=('module-init-tools')
 source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
-        "depmod-search.conf")
+        "depmod-search.conf"
+        "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch"
+        "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch")
 md5sums=('7bd916ae1c8a38e7697fdd8118bc98eb'
-         '09d8af2ba37c5902d904275cb27f1b09')
+         'dd62cbf62bd8f212f51ef8c43bec9a77'
+         'ba73b9e98db1abbf41274f922fcfbd55'
+         'c9af56636c5667cf4ce3a31ea56e03d9')
 
 build() {
   cd "$pkgname-$pkgver"
 
+  patch -p1 -i ../0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
+  patch -p1 -i ../0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
+
   ./configure \
     --sysconfdir=/etc \
-    --with-zlib
+    --with-zlib \
+    --with-rootprefix=/usr
 
   make
 }
@@ -36,7 +44,7 @@ package() {
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 
   # extra directories
-  install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d "$pkgdir/sbin"
+  install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin"
 
   # add symlinks to kmod
   ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe"
@@ -47,7 +55,7 @@ package() {
   done
 
   # install depmod.d file for search/ dir
-  install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/lib/depmod.d/search.conf"
+  install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/usr/lib/depmod.d/search.conf"
 }
 
 # vim: ft=sh syn=sh et
-- 
cgit v1.2.3-54-g00ecf