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

2012-04-05 Thread Tom Gundersen
Date: Thursday, April 5, 2012 @ 20:04:08
  Author: tomegun
Revision: 155732

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

Added:
  
kmod/repos/core-x86_64/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
(from rev 155723, 
kmod/repos/testing-x86_64/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch)
  
kmod/repos/core-x86_64/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
(from rev 155723, 
kmod/repos/testing-x86_64/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch)
  kmod/repos/core-x86_64/PKGBUILD
(from rev 155723, kmod/repos/testing-x86_64/PKGBUILD)
  kmod/repos/core-x86_64/depmod-search.conf
(from rev 155723, kmod/repos/testing-x86_64/depmod-search.conf)
Deleted:
  kmod/repos/core-x86_64/PKGBUILD
  kmod/repos/core-x86_64/depmod-search.conf
  kmod/repos/testing-x86_64/

-+
 0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch  |   50 
 0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch |   93 
 PKGBUILD|  114 
+-
 depmod-search.conf  |   10 
 4 files changed, 209 insertions(+), 58 deletions(-)

Copied: 
kmod/repos/core-x86_64/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
 (from rev 155723, 
kmod/repos/testing-x86_64/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch)
===
--- core-x86_64/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch  
(rev 0)
+++ core-x86_64/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch  
2012-04-06 00:04:08 UTC (rev 155732)
@@ -0,0 +1,50 @@
+From 666ba68a0635048aea0db70cd9ec61aea9b61ed2 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen 
+Date: Sat, 3 Mar 2012 12:37:06 +0100
+Subject: [PATCH 1/2] split usr: read configs from /lib/{depmod.d,modprobe.d}
+
+This allows rootprefix to be set to /usr, even if not all other packages
+have been fixed to read from this dir.
+---
+ libkmod/libkmod.c   |5 +++--
+ tools/kmod-depmod.c |1 +
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
+index 36ca629..12c1112 100644
+--- a/libkmod/libkmod.c
 b/libkmod/libkmod.c
+@@ -62,6 +62,7 @@ static const char *default_config_paths[] = {
+   SYSCONFDIR "/modprobe.d",
+   "/run/modprobe.d",
+   ROOTPREFIX "/lib/modprobe.d",
++  "/lib/modprobe.d",
+   NULL
+ };
+ 
+@@ -223,8 +224,8 @@ static char *get_kernel_release(const char *dirname)
+  * @config_paths: ordered array of paths (directories or files) where
+  *to load from user-defined configuration parameters such as
+  *alias, blacklists, commands (install, remove). If
+- *NULL defaults to /run/modprobe.d, /etc/modprobe.d and
+- *$rootprefix/lib/modprobe.d. Give an empty vector if
++ *NULL defaults to /run/modprobe.d, /etc/modprobe.d,
++ *$rootprefix/lib/modprobe.d and /lib/modprobe.d. Give an 
empty vector if
+  *configuration should not be read. This array must be null
+  *terminated.
+  *
+diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
+index 1871e18..7bb1c5d 100644
+--- a/tools/kmod-depmod.c
 b/tools/kmod-depmod.c
+@@ -58,6 +58,7 @@ static const char *default_cfg_paths[] = {
+   "/run/depmod.d",
+   SYSCONFDIR "/depmod.d",
+   ROOTPREFIX "/lib/depmod.d",
++  "/lib/depmod.d",
+   NULL
+ };
+ 
+-- 
+1.7.9.5
+

Copied: 
kmod/repos/core-x86_64/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
 (from rev 155723, 
kmod/repos/testing-x86_64/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch)
===
--- core-x86_64/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch 
(rev 0)
+++ core-x86_64/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch 
2012-04-06 00:04:08 UTC (rev 155732)
@@ -0,0 +1,93 @@
+From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001
+From: Tom Gundersen 
+Date: Sat, 31 Mar 2012 12:17:39 +0200
+Subject: [PATCH 2/2] config: hardcode the path to modules to be /lib/modules
+
+This means that we can move the configuration paths from /lib
+to /usr/lib without having to touch the kernel and related
+packages.
+
+That can be dealt with separately at a later location, in which case
+all we have to do is revert this patch.
+
+Signed-off-by: Tom Gundersen 
+---
+ libkmod/libkmod.c |2 +-
+ tools/kmod-depmod.c   |2 +-
+ tools/kmod-modinfo.c  |4 ++--
+ tools/kmod-modprobe.c |4 ++--
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
+index 12c1112..11edfa0 100644
+

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

2012-04-05 Thread Tom Gundersen
Date: Thursday, April 5, 2012 @ 20:04:07
  Author: tomegun
Revision: 155731

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

Added:
  
kmod/repos/core-i686/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
(from rev 155723, 
kmod/repos/testing-i686/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch)
  
kmod/repos/core-i686/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
(from rev 155723, 
kmod/repos/testing-i686/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch)
  kmod/repos/core-i686/PKGBUILD
(from rev 155723, kmod/repos/testing-i686/PKGBUILD)
  kmod/repos/core-i686/depmod-search.conf
(from rev 155723, kmod/repos/testing-i686/depmod-search.conf)
Deleted:
  kmod/repos/core-i686/PKGBUILD
  kmod/repos/core-i686/depmod-search.conf
  kmod/repos/testing-i686/

-+
 0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch  |   50 
 0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch |   93 
 PKGBUILD|  114 
+-
 depmod-search.conf  |   10 
 4 files changed, 209 insertions(+), 58 deletions(-)

Copied: 
kmod/repos/core-i686/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
 (from rev 155723, 
kmod/repos/testing-i686/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch)
===
--- core-i686/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
(rev 0)
+++ core-i686/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
2012-04-06 00:04:07 UTC (rev 155731)
@@ -0,0 +1,50 @@
+From 666ba68a0635048aea0db70cd9ec61aea9b61ed2 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen 
+Date: Sat, 3 Mar 2012 12:37:06 +0100
+Subject: [PATCH 1/2] split usr: read configs from /lib/{depmod.d,modprobe.d}
+
+This allows rootprefix to be set to /usr, even if not all other packages
+have been fixed to read from this dir.
+---
+ libkmod/libkmod.c   |5 +++--
+ tools/kmod-depmod.c |1 +
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
+index 36ca629..12c1112 100644
+--- a/libkmod/libkmod.c
 b/libkmod/libkmod.c
+@@ -62,6 +62,7 @@ static const char *default_config_paths[] = {
+   SYSCONFDIR "/modprobe.d",
+   "/run/modprobe.d",
+   ROOTPREFIX "/lib/modprobe.d",
++  "/lib/modprobe.d",
+   NULL
+ };
+ 
+@@ -223,8 +224,8 @@ static char *get_kernel_release(const char *dirname)
+  * @config_paths: ordered array of paths (directories or files) where
+  *to load from user-defined configuration parameters such as
+  *alias, blacklists, commands (install, remove). If
+- *NULL defaults to /run/modprobe.d, /etc/modprobe.d and
+- *$rootprefix/lib/modprobe.d. Give an empty vector if
++ *NULL defaults to /run/modprobe.d, /etc/modprobe.d,
++ *$rootprefix/lib/modprobe.d and /lib/modprobe.d. Give an 
empty vector if
+  *configuration should not be read. This array must be null
+  *terminated.
+  *
+diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
+index 1871e18..7bb1c5d 100644
+--- a/tools/kmod-depmod.c
 b/tools/kmod-depmod.c
+@@ -58,6 +58,7 @@ static const char *default_cfg_paths[] = {
+   "/run/depmod.d",
+   SYSCONFDIR "/depmod.d",
+   ROOTPREFIX "/lib/depmod.d",
++  "/lib/depmod.d",
+   NULL
+ };
+ 
+-- 
+1.7.9.5
+

Copied: 
kmod/repos/core-i686/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
 (from rev 155723, 
kmod/repos/testing-i686/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch)
===
--- core-i686/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch   
(rev 0)
+++ core-i686/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch   
2012-04-06 00:04:07 UTC (rev 155731)
@@ -0,0 +1,93 @@
+From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001
+From: Tom Gundersen 
+Date: Sat, 31 Mar 2012 12:17:39 +0200
+Subject: [PATCH 2/2] config: hardcode the path to modules to be /lib/modules
+
+This means that we can move the configuration paths from /lib
+to /usr/lib without having to touch the kernel and related
+packages.
+
+That can be dealt with separately at a later location, in which case
+all we have to do is revert this patch.
+
+Signed-off-by: Tom Gundersen 
+---
+ libkmod/libkmod.c |2 +-
+ tools/kmod-depmod.c   |2 +-
+ tools/kmod-modinfo.c  |4 ++--
+ tools/kmod-modprobe.c |4 ++--
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
+index 12c1112..11edfa0 100644
+--- a/libkmod/libkmod.c
 b/l

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

2012-03-09 Thread Dave Reisner
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 
-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 
-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/PKGBUILD2012-03-09 17:34:09 UTC (rev 152814)
+++ core-x86_64/PKGBUILD2012-03-09 17:34:10 UTC (rev 152815)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner 
-
-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-lo

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

2012-03-09 Thread Dave Reisner
Date: Friday, March 9, 2012 @ 12:34:09
  Author: dreisner
Revision: 152814

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

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

-+
 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-i686/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
===
--- core-i686/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch   
2012-03-09 17:21:56 UTC (rev 152813)
+++ core-i686/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch   
2012-03-09 17:34:09 UTC (rev 152814)
@@ -1,28 +0,0 @@
-From 269de2e0bf5011072da2f40f4f2d4023fad696b9 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi 
-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-i686/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
===
--- core-i686/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch   
2012-03-09 17:21:56 UTC (rev 152813)
+++ core-i686/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch   
2012-03-09 17:34:09 UTC (rev 152814)
@@ -1,39 +0,0 @@
-From 8cd0f9e4f9f5c093136a7a2c0c2998b9dd203161 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi 
-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-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2012-03-09 17:21:56 UTC (rev 152813)
+++ core-i686/PKGBUILD  2012-03-09 17:34:09 UTC (rev 152814)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner 
-
-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-l