[arch-commits] Commit in kmod/repos (8 files)

Dave Reisner dreisner at archlinux.org
Fri Jan 6 11:00:11 UTC 2012


    Date: Friday, January 6, 2012 @ 06:00:10
  Author: dreisner
Revision: 146226

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  kmod/repos/testing-i686/PKGBUILD
    (from rev 146225, kmod/trunk/PKGBUILD)
  kmod/repos/testing-i686/depmod-search.conf
    (from rev 146225, kmod/trunk/depmod-search.conf)
  kmod/repos/testing-i686/return-non-zero-on-fail.patch
    (from rev 146225, kmod/trunk/return-non-zero-on-fail.patch)
  kmod/repos/testing-x86_64/PKGBUILD
    (from rev 146225, kmod/trunk/PKGBUILD)
  kmod/repos/testing-x86_64/depmod-search.conf
    (from rev 146225, kmod/trunk/depmod-search.conf)
  kmod/repos/testing-x86_64/return-non-zero-on-fail.patch
    (from rev 146225, kmod/trunk/return-non-zero-on-fail.patch)
Deleted:
  kmod/repos/testing-i686/return-non-zero-on-fail.patch
  kmod/repos/testing-x86_64/return-non-zero-on-fail.patch

----------------------------------------------+
 testing-i686/PKGBUILD                        |   60 +++++++++++++++++++++++++
 testing-i686/depmod-search.conf              |    5 ++
 testing-i686/return-non-zero-on-fail.patch   |   60 ++++++++++++-------------
 testing-x86_64/PKGBUILD                      |   60 +++++++++++++++++++++++++
 testing-x86_64/depmod-search.conf            |    5 ++
 testing-x86_64/return-non-zero-on-fail.patch |   60 ++++++++++++-------------
 6 files changed, 190 insertions(+), 60 deletions(-)

Copied: kmod/repos/testing-i686/PKGBUILD (from rev 146225, kmod/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-01-06 11:00:10 UTC (rev 146226)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=kmod
+pkgver=3
+pkgrel=4
+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')
+provides=('module-init-tools=3.16')
+conflicts=('module-init-tools')
+replaces=('module-init-tools')
+source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz"
+        "depmod-search.conf"
+        "return-non-zero-on-fail.patch")
+md5sums=('bc0e69f75c2ac22c091f05e166e86c5d'
+         '4b8cbcbc54b9029c99fd730e257d4436'
+         '4be6f783a7fc2d1747ccaa2536d2e88f')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 <"$srcdir/return-non-zero-on-fail.patch"
+
+  ./configure \
+    --sysconfdir=/etc \
+    --with-rootprefix= \
+    --with-rootlibdir=/lib \
+    --with-zlib
+
+  make
+}
+
+check() {
+  make -C "$pkgname-$pkgver" 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
+
+  # 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

Copied: kmod/repos/testing-i686/depmod-search.conf (from rev 146225, kmod/trunk/depmod-search.conf)
===================================================================
--- testing-i686/depmod-search.conf	                        (rev 0)
+++ testing-i686/depmod-search.conf	2012-01-06 11:00:10 UTC (rev 146226)
@@ -0,0 +1,5 @@
+#
+# /etc/depmod.d/depmod.conf
+#
+
+search updates extramodules built-in

Deleted: testing-i686/return-non-zero-on-fail.patch
===================================================================
--- testing-i686/return-non-zero-on-fail.patch	2012-01-06 10:56:44 UTC (rev 146225)
+++ testing-i686/return-non-zero-on-fail.patch	2012-01-06 11:00:10 UTC (rev 146226)
@@ -1,30 +0,0 @@
-diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
-index b6af26f..8506193 100644
---- a/tools/kmod-modinfo.c
-+++ b/tools/kmod-modinfo.c
-@@ -279,6 +279,12 @@ static int modinfo_alias_do(struct kmod_ctx *ctx, const char *alias)
- 		LOG("Module alias %s not found.\n", alias);
- 		return err;
- 	}
-+
-+	if (list == NULL) {
-+		LOG("Module %s not found.\n", alias);
-+		return -ENOENT;
-+	}
-+
- 	kmod_list_foreach(l, list) {
- 		struct kmod_module *mod = kmod_module_get_module(l);
- 		int r = modinfo_do(mod);
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index 8286b9b..6ca94f2 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -856,7 +856,7 @@ static int insmod_alias(struct kmod_ctx *ctx, const char *alias, const char *ext
- 
- 	if (list == NULL) {
- 		LOG("Module %s not found.\n", alias);
--		return err;
-+		return -ENOENT;
- 	}
- 
- 	if (use_blacklist) {

Copied: kmod/repos/testing-i686/return-non-zero-on-fail.patch (from rev 146225, kmod/trunk/return-non-zero-on-fail.patch)
===================================================================
--- testing-i686/return-non-zero-on-fail.patch	                        (rev 0)
+++ testing-i686/return-non-zero-on-fail.patch	2012-01-06 11:00:10 UTC (rev 146226)
@@ -0,0 +1,30 @@
+diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
+index b6af26f..8506193 100644
+--- a/tools/kmod-modinfo.c
++++ b/tools/kmod-modinfo.c
+@@ -279,6 +279,12 @@ static int modinfo_alias_do(struct kmod_ctx *ctx, const char *alias)
+ 		LOG("Module alias %s not found.\n", alias);
+ 		return err;
+ 	}
++
++	if (list == NULL) {
++		LOG("Module %s not found.\n", alias);
++		return -ENOENT;
++	}
++
+ 	kmod_list_foreach(l, list) {
+ 		struct kmod_module *mod = kmod_module_get_module(l);
+ 		int r = modinfo_do(mod);
+diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
+index 8286b9b..6ca94f2 100644
+--- a/tools/kmod-modprobe.c
++++ b/tools/kmod-modprobe.c
+@@ -856,7 +856,7 @@ static int insmod_alias(struct kmod_ctx *ctx, const char *alias, const char *ext
+ 
+ 	if (list == NULL) {
+ 		LOG("Module %s not found.\n", alias);
+-		return err;
++		return -ENOENT;
+ 	}
+ 
+ 	if (use_blacklist) {

Copied: kmod/repos/testing-x86_64/PKGBUILD (from rev 146225, kmod/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-01-06 11:00:10 UTC (rev 146226)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=kmod
+pkgver=3
+pkgrel=4
+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')
+provides=('module-init-tools=3.16')
+conflicts=('module-init-tools')
+replaces=('module-init-tools')
+source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz"
+        "depmod-search.conf"
+        "return-non-zero-on-fail.patch")
+md5sums=('bc0e69f75c2ac22c091f05e166e86c5d'
+         '4b8cbcbc54b9029c99fd730e257d4436'
+         '4be6f783a7fc2d1747ccaa2536d2e88f')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 <"$srcdir/return-non-zero-on-fail.patch"
+
+  ./configure \
+    --sysconfdir=/etc \
+    --with-rootprefix= \
+    --with-rootlibdir=/lib \
+    --with-zlib
+
+  make
+}
+
+check() {
+  make -C "$pkgname-$pkgver" 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
+
+  # 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

Copied: kmod/repos/testing-x86_64/depmod-search.conf (from rev 146225, kmod/trunk/depmod-search.conf)
===================================================================
--- testing-x86_64/depmod-search.conf	                        (rev 0)
+++ testing-x86_64/depmod-search.conf	2012-01-06 11:00:10 UTC (rev 146226)
@@ -0,0 +1,5 @@
+#
+# /etc/depmod.d/depmod.conf
+#
+
+search updates extramodules built-in

Deleted: testing-x86_64/return-non-zero-on-fail.patch
===================================================================
--- testing-x86_64/return-non-zero-on-fail.patch	2012-01-06 10:56:44 UTC (rev 146225)
+++ testing-x86_64/return-non-zero-on-fail.patch	2012-01-06 11:00:10 UTC (rev 146226)
@@ -1,30 +0,0 @@
-diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
-index b6af26f..8506193 100644
---- a/tools/kmod-modinfo.c
-+++ b/tools/kmod-modinfo.c
-@@ -279,6 +279,12 @@ static int modinfo_alias_do(struct kmod_ctx *ctx, const char *alias)
- 		LOG("Module alias %s not found.\n", alias);
- 		return err;
- 	}
-+
-+	if (list == NULL) {
-+		LOG("Module %s not found.\n", alias);
-+		return -ENOENT;
-+	}
-+
- 	kmod_list_foreach(l, list) {
- 		struct kmod_module *mod = kmod_module_get_module(l);
- 		int r = modinfo_do(mod);
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index 8286b9b..6ca94f2 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -856,7 +856,7 @@ static int insmod_alias(struct kmod_ctx *ctx, const char *alias, const char *ext
- 
- 	if (list == NULL) {
- 		LOG("Module %s not found.\n", alias);
--		return err;
-+		return -ENOENT;
- 	}
- 
- 	if (use_blacklist) {

Copied: kmod/repos/testing-x86_64/return-non-zero-on-fail.patch (from rev 146225, kmod/trunk/return-non-zero-on-fail.patch)
===================================================================
--- testing-x86_64/return-non-zero-on-fail.patch	                        (rev 0)
+++ testing-x86_64/return-non-zero-on-fail.patch	2012-01-06 11:00:10 UTC (rev 146226)
@@ -0,0 +1,30 @@
+diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
+index b6af26f..8506193 100644
+--- a/tools/kmod-modinfo.c
++++ b/tools/kmod-modinfo.c
+@@ -279,6 +279,12 @@ static int modinfo_alias_do(struct kmod_ctx *ctx, const char *alias)
+ 		LOG("Module alias %s not found.\n", alias);
+ 		return err;
+ 	}
++
++	if (list == NULL) {
++		LOG("Module %s not found.\n", alias);
++		return -ENOENT;
++	}
++
+ 	kmod_list_foreach(l, list) {
+ 		struct kmod_module *mod = kmod_module_get_module(l);
+ 		int r = modinfo_do(mod);
+diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
+index 8286b9b..6ca94f2 100644
+--- a/tools/kmod-modprobe.c
++++ b/tools/kmod-modprobe.c
+@@ -856,7 +856,7 @@ static int insmod_alias(struct kmod_ctx *ctx, const char *alias, const char *ext
+ 
+ 	if (list == NULL) {
+ 		LOG("Module %s not found.\n", alias);
+-		return err;
++		return -ENOENT;
+ 	}
+ 
+ 	if (use_blacklist) {




More information about the arch-commits mailing list