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

Dave Reisner dreisner at archlinux.org
Fri Mar 9 12:34:11 EST 2012


    Date: Friday, March 9, 2012 @ 12:34:10
  Author: dreisner
Revision: 152815

db-move: moved kmod from [testing] to [core] (x86_64)

Added:
  kmod/repos/core-x86_64/PKGBUILD
    (from rev 152813, kmod/repos/testing-x86_64/PKGBUILD)
  kmod/repos/core-x86_64/depmod-search.conf
    (from rev 152813, kmod/repos/testing-x86_64/depmod-search.conf)
Deleted:
  kmod/repos/core-x86_64/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
  kmod/repos/core-x86_64/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
  kmod/repos/core-x86_64/PKGBUILD
  kmod/repos/core-x86_64/depmod-search.conf
  kmod/repos/testing-x86_64/

-----------------------------------------------------------------+
 0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch |   28 --
 0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch |   39 ---
 PKGBUILD                                                        |  117 ++++------
 depmod-search.conf                                              |   10 
 4 files changed, 58 insertions(+), 136 deletions(-)

Deleted: core-x86_64/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
===================================================================
--- core-x86_64/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch	2012-03-09 17:34:09 UTC (rev 152814)
+++ core-x86_64/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch	2012-03-09 17:34:10 UTC (rev 152815)
@@ -1,28 +0,0 @@
-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
-

Deleted: core-x86_64/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
===================================================================
--- core-x86_64/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch	2012-03-09 17:34:09 UTC (rev 152814)
+++ core-x86_64/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch	2012-03-09 17:34:10 UTC (rev 152815)
@@ -1,39 +0,0 @@
-From 8cd0f9e4f9f5c093136a7a2c0c2998b9dd203161 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi at profusion.mobi>
-Date: Sat, 11 Feb 2012 19:45:29 -0200
-Subject: [PATCH] libkmod-module: probe: fix infinite loop with softdeps
-
-If a softdep depends on a module in the dependency list of the module
-being inserted, we would enter and infinite loop.
-
-Move the "mod->visited = true" assignment to the proper place, hoping it
-didn't break other use cases. This is a bug that comes and goes every
-now and then. Since we have a testsuite now, a test for this should be
-written.
----
- libkmod/libkmod-module.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index b5eb7c9..835896f 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -1013,7 +1013,6 @@ static int __kmod_module_fill_softdep(struct kmod_module *mod,
- 		goto fail;
- 	}
- 	*list = l;
--	mod->visited = true;
- 	mod->ignorecmd = (pre != NULL || post != NULL);
- 
- 	kmod_list_foreach(l, post) {
-@@ -1043,6 +1042,7 @@ static int __kmod_module_get_probe_list(struct kmod_module *mod,
- 								mod->name);
- 		return 0;
- 	}
-+	mod->visited = true;
- 
- 	dep = kmod_module_get_dependencies(mod);
- 	kmod_list_foreach(l, dep) {
--- 
-1.7.9
-

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2012-03-09 17:34:09 UTC (rev 152814)
+++ core-x86_64/PKGBUILD	2012-03-09 17:34:10 UTC (rev 152815)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-
-pkgname=kmod
-pkgver=5
-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"
-        '0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch'
-        '0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch'
-        "depmod-search.conf")
-md5sums=('b271c2ec54aba1c67bda63c8579d8c15'
-         '81545a1509b43008f85c03fb980f0e86'
-         '662a85dbe420f04c1ef24f9cd4e4c990'
-         '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"
-
-  # fix infinite loop with softdeps
-  patch -Np1 <"$srcdir/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch"
-
-  ./configure \
-    --sysconfdir=/etc \
-    --with-rootprefix= \
-    --with-zlib
-
-  make
-}
-
-check() {
-  make -C "$pkgname-$pkgver" check
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  # extra directories
-  install -dm755 "$pkgdir"/{etc,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"
-
-  for tool in {ins,ls,rm}mod modinfo; do
-    ln -s kmod "$pkgdir/usr/bin/$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/core-x86_64/PKGBUILD (from rev 152813, kmod/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2012-03-09 17:34:10 UTC (rev 152815)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=kmod
+pkgver=6
+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')
+conflicts=('module-init-tools')
+replaces=('module-init-tools')
+source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
+        "depmod-search.conf")
+md5sums=('bad08102fad212cd34405136d9a7eb94'
+         '4b8cbcbc54b9029c99fd730e257d4436')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+    --sysconfdir=/etc \
+    --with-zlib
+
+  make
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+  # extra directories
+  install -dm755 "$pkgdir"/{etc,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"
+
+  for tool in {ins,ls,rm}mod modinfo; do
+    ln -s kmod "$pkgdir/usr/bin/$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

Deleted: core-x86_64/depmod-search.conf
===================================================================
--- core-x86_64/depmod-search.conf	2012-03-09 17:34:09 UTC (rev 152814)
+++ core-x86_64/depmod-search.conf	2012-03-09 17:34:10 UTC (rev 152815)
@@ -1,5 +0,0 @@
-#
-# /etc/depmod.d/depmod.conf
-#
-
-search updates extramodules built-in

Copied: kmod/repos/core-x86_64/depmod-search.conf (from rev 152813, kmod/repos/testing-x86_64/depmod-search.conf)
===================================================================
--- core-x86_64/depmod-search.conf	                        (rev 0)
+++ core-x86_64/depmod-search.conf	2012-03-09 17:34:10 UTC (rev 152815)
@@ -0,0 +1,5 @@
+#
+# /etc/depmod.d/depmod.conf
+#
+
+search updates extramodules built-in



More information about the arch-commits mailing list