summaryrefslogtreecommitdiff
path: root/core/kmod
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-13 22:00:22 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-13 22:00:22 -0300
commitb9930cb145be895813f48623c21b12acaf8e1dbf (patch)
treef878c72c58f3add6dcaf4ce56491acb1a01c8862 /core/kmod
parent009cb3e36c303eb4460b20d01fb01522787198d9 (diff)
parent16e845de1bbf76ab48a02bfaa21730f45e6afaaa (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/ccrtp/PKGBUILD community/commoncpp2/PKGBUILD core/ncurses/PKGBUILD core/udev/PKGBUILD multilib/lib32-libjpeg-turbo/PKGBUILD
Diffstat (limited to 'core/kmod')
-rw-r--r--core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch28
-rw-r--r--core/kmod/PKGBUILD38
2 files changed, 41 insertions, 25 deletions
diff --git a/core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch b/core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
new file mode 100644
index 000000000..4ffc3e53b
--- /dev/null
+++ b/core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
@@ -0,0 +1,28 @@
+From 269de2e0bf5011072da2f40f4f2d4023fad696b9 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi@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
+
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 06275f062..85d74af1f 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -1,41 +1,32 @@
-# $Id: PKGBUILD 148463 2012-02-01 13:16:33Z dreisner $
+# $Id: PKGBUILD 150108 2012-02-12 15:37:16Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=kmod
-pkgver=4
+pkgver=5
pkgrel=2
pkgdesc="Linux kernel module handling"
arch=('i686' 'x86_64' 'mips64el')
url="http://git.profusion.mobi/cgit.cgi/kmod.git"
license=('GPL2')
depends=('glibc' 'zlib')
-makedepends=('docbook2x')
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-partially-fix-parsing-of-alias-with-dots.patch
- 0002-libkmod-module-used-shared-code-in-module-creation.patch
- 0003-modprobe-handle-all-error-returns-from-init_module.patch
- 0004-modprobe-remove-0-refcnt-deps.patch
+ '0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch'
"depmod-search.conf")
-md5sums=('e14450a066a48accd0af1995b3c0232d'
- '5f497ab3466ee1a616b6e6c97b330706'
- '23a9257a152862753ce4c4ee7287761a'
- '3a57671b0f37b1203b207f35a4442ae3'
- '1fe88eee9302104b179124ce6bfc55d2'
+md5sums=('b271c2ec54aba1c67bda63c8579d8c15'
+ '81545a1509b43008f85c03fb980f0e86'
'4b8cbcbc54b9029c99fd730e257d4436')
build() {
cd "$pkgname-$pkgver"
- patch -Np1 <"$srcdir/0001-partially-fix-parsing-of-alias-with-dots.patch"
- patch -Np1 <"$srcdir/0002-libkmod-module-used-shared-code-in-module-creation.patch"
- patch -Np1 <"$srcdir/0003-modprobe-handle-all-error-returns-from-init_module.patch"
- patch -Np1 <"$srcdir/0004-modprobe-remove-0-refcnt-deps.patch"
+ # fix modprobe --show-depends failures on loaded modules
+ patch -Np1 <"$srcdir/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch"
- ./configure \
+ CFLAGS+=' -g -O0' ./configure \
--sysconfdir=/etc \
--with-rootprefix= \
--with-zlib
@@ -50,16 +41,13 @@ check() {
package() {
make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
- # binary directories
- install -dm755 "$pkgdir"/{,s}bin
-
- # configuration directories
- install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d
+ # extra directories
+ install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d "$pkgdir/sbin"
# 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