From 57da00f1efeef15771c989ac7884d43aa903efea Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sun, 16 Feb 2014 17:52:22 -0600 Subject: kmod: 16 update binary path to /usr/bin refs #961 --- abs/core/kmod/PKGBUILD | 31 +++++++++++++------------------ abs/core/kmod/kmod.install | 9 --------- 2 files changed, 13 insertions(+), 27 deletions(-) delete mode 100644 abs/core/kmod/kmod.install diff --git a/abs/core/kmod/PKGBUILD b/abs/core/kmod/PKGBUILD index 18c3ee0..9227ad1 100644 --- a/abs/core/kmod/PKGBUILD +++ b/abs/core/kmod/PKGBUILD @@ -1,51 +1,44 @@ -# $Id: PKGBUILD 163513 2012-07-14 13:07:23Z allan $ +# $Id: PKGBUILD 203021 2014-01-01 17:44:12Z dreisner $ # Maintainer: Dave Reisner pkgname=kmod -pkgver=9 -pkgrel=2 +pkgver=16 +pkgrel=1 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') 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') +makedepends=('gtk-doc') +options=('strip' 'debug') +provides=('module-init-tools=3.16' 'libkmod.so') 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") -md5sums=('c8ae2d2694fbca2b28e238b30543a0cd' - 'dd62cbf62bd8f212f51ef8c43bec9a77') build() { cd "$pkgname-$pkgver" ./configure \ --sysconfdir=/etc \ - --with-zlib \ - --with-rootprefix=/usr + --enable-gtk-doc \ + --with-zlib make } check() { - # testsuite is broken on 32-bit because of an unhandled EEXIST on mkdir_p - make -C "$pkgname-$pkgver" check || : + make -C "$pkgname-$pkgver" check } package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install # extra directories - install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin" - - # add symlinks to kmod - ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe" - ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod" + install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d - for tool in {ins,ls,rm}mod modinfo; do + for tool in {ins,ls,rm,dep}mod mod{probe,info}; do ln -s kmod "$pkgdir/usr/bin/$tool" done @@ -54,3 +47,5 @@ package() { } # vim: ft=sh syn=sh et +md5sums=('3006a0287211212501cdfe1211b29f09' + 'dd62cbf62bd8f212f51ef8c43bec9a77') diff --git a/abs/core/kmod/kmod.install b/abs/core/kmod/kmod.install deleted file mode 100644 index 0a2e88d..0000000 --- a/abs/core/kmod/kmod.install +++ /dev/null @@ -1,9 +0,0 @@ -#!/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 -} - -- cgit v0.12