From 7f0bb16482f56eff1c5590c5a51d808f0a65f57f Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Mon, 9 Jan 2012 22:33:29 -0500 Subject: [PATCH] kmod-git: bump for buildsys changes --- kmod-git/PKGBUILD | 44 ++++++++++++++++++++++++++++--------- kmod-git/depmod-search.conf | 5 +++++ 2 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 kmod-git/depmod-search.conf diff --git a/kmod-git/PKGBUILD b/kmod-git/PKGBUILD index abc5a7c..9758f04 100644 --- a/kmod-git/PKGBUILD +++ b/kmod-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Dave Reisner pkgname=kmod-git -pkgver=20111226 +pkgver=20120109 pkgrel=1 pkgdesc="interface to kernel module operations" arch=('i686' 'x86_64') @@ -9,9 +9,13 @@ url="http://git.profusion.mobi/cgit.cgi/kmod.git/" license=('GPL2') depends=('glibc' 'zlib') makedepends=('git') -conflicts=('kmod') -provides=('kmod') +conflicts=('kmod' 'module-init-tools') +provides=('kmod=3' 'module-init-tools=3.16') +replaces=('module-init-tools') options=('!libtool') +backup=('lib/depmod.d/search.conf') +source=('depmod-search.conf') +md5sums=('4b8cbcbc54b9029c99fd730e257d4436') _gitroot="git://git.profusion.mobi/kmod.git" _gitname="kmod" @@ -20,7 +24,7 @@ build() { msg "Connecting to GIT server...." if [[ -d $_gitname ]] ; then - cd "$_gitname" && git pull origin + ( cd "$_gitname" && git pull origin ) msg "The local files are updated." else git clone "$_gitroot" "$_gitname" @@ -29,22 +33,42 @@ build() { msg "GIT checkout done or server timeout" msg "Starting make..." - rm -rf "$srcdir/$_gitname-build" - cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" + rm -rf "$_gitname-build" + cp -r "$_gitname"{,-build} + cd "$_gitname-build" - ./autogen.sh \ + ./autogen.sh + ./configure \ + --sysconfdir=/etc \ + --enable-debug \ + --with-rootprefix= \ --with-rootlibdir=/lib \ --with-zlib + make } check() { - make -C "$srcdir/$_gitname-build" check + make -C "$_gitname-build" check } package() { - make -C "$srcdir/$_gitname-build" DESTDIR="$pkgdir" install + make -C "$_gitname-build" DESTDIR="$pkgdir" install + + # binary directories + install -dm755 "$pkgdir"/{,s}bin + + # configuration directories + install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d + + # add symlinks to kmod + ln -s /usr/bin/kmod "$pkgdir/bin/lsmod" + for tool in {ins,rm,dep}mod mod{info,probe}; do + ln -s ../usr/bin/kmod "$pkgdir/sbin/$tool" + done + + # install depmod.d file for search/ dir + install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/lib/depmod.d/search.conf" } # vim: ft=sh syn=sh et diff --git a/kmod-git/depmod-search.conf b/kmod-git/depmod-search.conf new file mode 100644 index 0000000..3feb67b --- /dev/null +++ b/kmod-git/depmod-search.conf @@ -0,0 +1,5 @@ +# +# /etc/depmod.d/depmod.conf +# + +search updates extramodules built-in