[arch-commits] Commit in kmod/trunk (2 files)
Dave Reisner
dreisner at archlinux.org
Fri Feb 10 19:09:21 UTC 2012
Date: Friday, February 10, 2012 @ 14:09:21
Author: dreisner
Revision: 149777
upgpkg: kmod 5-2
- backport patch to fix modprobe --show-depends
- move tool symlinks to /usr/bin (except modprobe)
Added:
kmod/trunk/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
Modified:
kmod/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch | 28 ++++++++++
PKGBUILD | 25 ++++----
2 files changed, 41 insertions(+), 12 deletions(-)
Added: 0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
===================================================================
--- 0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch (rev 0)
+++ 0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch 2012-02-10 19:09:21 UTC (rev 149777)
@@ -0,0 +1,28 @@
+From 269de2e0bf5011072da2f40f4f2d4023fad696b9 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi at profusion.mobi>
+Date: Tue, 7 Feb 2012 09:48:59 -0200
+Subject: [PATCH] libkmod-module: probe: Fix ignore-loaded flag not being
+ applied
+
+---
+ TODO | 3 +++
+ libkmod/libkmod-module.c | 3 ++-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
+index 0af3e2e..b5eb7c9 100644
+--- a/libkmod/libkmod-module.c
++++ b/libkmod/libkmod-module.c
+@@ -1132,7 +1132,8 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod,
+ if (mod == NULL)
+ return -ENOENT;
+
+- if (module_is_inkernel(mod)) {
++ if (!(flags & KMOD_PROBE_IGNORE_LOADED)
++ && module_is_inkernel(mod)) {
+ if (flags & KMOD_PROBE_FAIL_ON_LOADED)
+ return -EEXIST;
+ else
+--
+1.7.9
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-02-10 17:57:54 UTC (rev 149776)
+++ PKGBUILD 2012-02-10 19:09:21 UTC (rev 149777)
@@ -3,29 +3,33 @@
pkgname=kmod
pkgver=5
-pkgrel=1
+pkgrel=2
pkgdesc="Linux kernel module handling"
arch=('i686' 'x86_64')
url="http://git.profusion.mobi/cgit.cgi/kmod.git"
license=('GPL2')
depends=('glibc' 'zlib')
-options=('!libtool' '!strip')
+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'
"depmod-search.conf")
md5sums=('b271c2ec54aba1c67bda63c8579d8c15'
+ '81545a1509b43008f85c03fb980f0e86'
'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"
+
CFLAGS+=' -g -O0' ./configure \
--sysconfdir=/etc \
--with-rootprefix= \
- --with-zlib \
- --enable-debug
+ --with-zlib
make
}
@@ -37,16 +41,13 @@
package() {
make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
- # binary directories
- install -dm755 "$pkgdir"/{,s}bin
+ # extra directories
+ install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d "$pkgdir/sbin"
- # 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"
+ ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe"
+ for tool in {dep,ins,ls,rm}mod modinfo; do
+ ln -s kmod "$pkgdir/usr/bin/$tool"
done
# install depmod.d file for search/ dir
More information about the arch-commits
mailing list