[arch-commits] Commit in kmod/repos (14 files)
Date: Saturday, December 8, 2012 @ 14:52:26
Author: dreisner
Revision: 173025
db-move: moved kmod from [testing] to [core] (i686, x86_64)
Added:
kmod/repos/core-i686/PKGBUILD
(from rev 173024, kmod/repos/testing-i686/PKGBUILD)
kmod/repos/core-i686/depmod-search.conf
(from rev 173024, kmod/repos/testing-i686/depmod-search.conf)
kmod/repos/core-x86_64/PKGBUILD
(from rev 173024, kmod/repos/testing-x86_64/PKGBUILD)
kmod/repos/core-x86_64/depmod-search.conf
(from rev 173024, kmod/repos/testing-x86_64/depmod-search.conf)
Deleted:
kmod/repos/core-i686/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch
kmod/repos/core-i686/0002-depmod-fix-asserting-mod-kmod-NULL.patch
kmod/repos/core-i686/PKGBUILD
kmod/repos/core-i686/depmod-search.conf
kmod/repos/core-x86_64/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch
kmod/repos/core-x86_64/0002-depmod-fix-asserting-mod-kmod-NULL.patch
kmod/repos/core-x86_64/PKGBUILD
kmod/repos/core-x86_64/depmod-search.conf
kmod/repos/testing-i686/
kmod/repos/testing-x86_64/
-+
core-i686/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch |
43 ---
core-i686/0002-depmod-fix-asserting-mod-kmod-NULL.patch |
31 --
core-i686/PKGBUILD |
120 --
core-i686/depmod-search.conf|
10
core-x86_64/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch |
43 ---
core-x86_64/0002-depmod-fix-asserting-mod-kmod-NULL.patch |
31 --
core-x86_64/PKGBUILD|
120 --
core-x86_64/depmod-search.conf |
10
8 files changed, 120 insertions(+), 288 deletions(-)
Deleted:
core-i686/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch
===
--- core-i686/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch
2012-12-08 18:35:40 UTC (rev 173024)
+++ core-i686/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch
2012-12-08 19:52:26 UTC (rev 173025)
@@ -1,43 +0,0 @@
-From 06294621a944e4611e15ce8201df80870e052e7d Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi lucas.demar...@profusion.mobi
-Date: Fri, 16 Nov 2012 11:35:30 -0200
-Subject: [PATCH 1/2] depmod: fix hash lookup by relpath instead of uncrelpath
-
-We index modules in depmod by it's uncompressed relative path, not
-relative path. We didn't notice this bug before since this function is
-only triggered if we release a module to be replaced by one of higher
-priority.
-
-Also fix a leftover log message referring to relpath instead of
-uncrelpath.
- tools/depmod.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tools/depmod.c b/tools/depmod.c
-index cc9346f..aafe66b 100644
a/tools/depmod.c
-+++ b/tools/depmod.c
-@@ -1114,7 +1114,7 @@ static int depmod_module_add(struct depmod *depmod,
struct kmod_module *kmod)
- mod-uncrelpath, mod);
- if (err 0) {
- ERR(hash_add_unique %s: %s\n,
-- mod-relpath, strerror(-err));
-+ mod-uncrelpath, strerror(-err));
- hash_del(depmod-modules_by_name, mod-modname);
- goto fail;
- }
-@@ -1134,8 +1134,8 @@ static int depmod_module_del(struct depmod *depmod,
struct mod *mod)
- {
- DBG(del %p kmod=%p, path=%s\n, mod, mod-kmod, mod-path);
-
-- if (mod-relpath != NULL)
-- hash_del(depmod-modules_by_uncrelpath, mod-relpath);
-+ if (mod-uncrelpath != NULL)
-+ hash_del(depmod-modules_by_uncrelpath, mod-uncrelpath);
-
- hash_del(depmod-modules_by_name, mod-modname);
-
---
-1.8.0
-
Deleted: core-i686/0002-depmod-fix-asserting-mod-kmod-NULL.patch
===
--- core-i686/0002-depmod-fix-asserting-mod-kmod-NULL.patch 2012-12-08
18:35:40 UTC (rev 173024)
+++ core-i686/0002-depmod-fix-asserting-mod-kmod-NULL.patch 2012-12-08
19:52:26 UTC (rev 173025)
@@ -1,31 +0,0 @@
-From 02c64df3c2b33880b18d3f4aba9fa8e48e5ca904 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi lucas.demar...@profusion.mobi
-Date: Fri, 16 Nov 2012 12:05:42 -0200
-Subject: [PATCH 2/2] depmod: fix asserting mod-kmod == NULL
-
-If we are replacing a lower priority module (due to its location), we
-already created a kmod_module, but didn't open the file for reading its
-symbols. This means mod-kmod won't be NULL, and this is just ok. Since
-all the functions freeing stuff below the previous assert already takes
-NULL into consideration, it's safe to just unref mod-kmod and let the
-right thing
[arch-commits] Commit in kmod/repos (14 files)
Date: Saturday, November 17, 2012 @ 22:33:34
Author: dreisner
Revision: 171489
db-move: moved kmod from [testing] to [core] (i686, x86_64)
Added:
kmod/repos/core-i686/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch
(from rev 171488,
kmod/repos/testing-i686/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch)
kmod/repos/core-i686/0002-depmod-fix-asserting-mod-kmod-NULL.patch
(from rev 171488,
kmod/repos/testing-i686/0002-depmod-fix-asserting-mod-kmod-NULL.patch)
kmod/repos/core-i686/PKGBUILD
(from rev 171488, kmod/repos/testing-i686/PKGBUILD)
kmod/repos/core-i686/depmod-search.conf
(from rev 171488, kmod/repos/testing-i686/depmod-search.conf)
kmod/repos/core-x86_64/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch
(from rev 171488,
kmod/repos/testing-x86_64/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch)
kmod/repos/core-x86_64/0002-depmod-fix-asserting-mod-kmod-NULL.patch
(from rev 171488,
kmod/repos/testing-x86_64/0002-depmod-fix-asserting-mod-kmod-NULL.patch)
kmod/repos/core-x86_64/PKGBUILD
(from rev 171488, kmod/repos/testing-x86_64/PKGBUILD)
kmod/repos/core-x86_64/depmod-search.conf
(from rev 171488, kmod/repos/testing-x86_64/depmod-search.conf)
Deleted:
kmod/repos/core-i686/PKGBUILD
kmod/repos/core-i686/depmod-search.conf
kmod/repos/core-x86_64/PKGBUILD
kmod/repos/core-x86_64/depmod-search.conf
kmod/repos/testing-i686/
kmod/repos/testing-x86_64/
-+
core-i686/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch |
43 +++
core-i686/0002-depmod-fix-asserting-mod-kmod-NULL.patch |
31 ++
core-i686/PKGBUILD |
121 +-
core-i686/depmod-search.conf|
10
core-x86_64/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch |
43 +++
core-x86_64/0002-depmod-fix-asserting-mod-kmod-NULL.patch |
31 ++
core-x86_64/PKGBUILD|
121 +-
core-x86_64/depmod-search.conf |
10
8 files changed, 288 insertions(+), 122 deletions(-)
Copied:
kmod/repos/core-i686/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch
(from rev 171488,
kmod/repos/testing-i686/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch)
===
--- core-i686/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch
(rev 0)
+++ core-i686/0001-depmod-fix-hash-lookup-by-relpath-instead-of-uncrelp.patch
2012-11-18 03:33:34 UTC (rev 171489)
@@ -0,0 +1,43 @@
+From 06294621a944e4611e15ce8201df80870e052e7d Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi lucas.demar...@profusion.mobi
+Date: Fri, 16 Nov 2012 11:35:30 -0200
+Subject: [PATCH 1/2] depmod: fix hash lookup by relpath instead of uncrelpath
+
+We index modules in depmod by it's uncompressed relative path, not
+relative path. We didn't notice this bug before since this function is
+only triggered if we release a module to be replaced by one of higher
+priority.
+
+Also fix a leftover log message referring to relpath instead of
+uncrelpath.
+---
+ tools/depmod.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/depmod.c b/tools/depmod.c
+index cc9346f..aafe66b 100644
+--- a/tools/depmod.c
b/tools/depmod.c
+@@ -1114,7 +1114,7 @@ static int depmod_module_add(struct depmod *depmod,
struct kmod_module *kmod)
+ mod-uncrelpath, mod);
+ if (err 0) {
+ ERR(hash_add_unique %s: %s\n,
+- mod-relpath, strerror(-err));
++ mod-uncrelpath, strerror(-err));
+ hash_del(depmod-modules_by_name, mod-modname);
+ goto fail;
+ }
+@@ -1134,8 +1134,8 @@ static int depmod_module_del(struct depmod *depmod,
struct mod *mod)
+ {
+ DBG(del %p kmod=%p, path=%s\n, mod, mod-kmod, mod-path);
+
+- if (mod-relpath != NULL)
+- hash_del(depmod-modules_by_uncrelpath, mod-relpath);
++ if (mod-uncrelpath != NULL)
++ hash_del(depmod-modules_by_uncrelpath, mod-uncrelpath);
+
+ hash_del(depmod-modules_by_name, mod-modname);
+
+--
+1.8.0
+
Copied: kmod/repos/core-i686/0002-depmod-fix-asserting-mod-kmod-NULL.patch
(from rev 171488,
kmod/repos/testing-i686/0002-depmod-fix-asserting-mod-kmod-NULL.patch)
===
--- core-i686/0002-depmod-fix-asserting-mod-kmod-NULL.patch
(rev 0)
+++ core-i686/0002-depmod-fix-asserting-mod-kmod-NULL.patch 2012-11-18
03:33:34 UTC (rev
[arch-commits] Commit in kmod/repos (14 files)
Date: Wednesday, November 14, 2012 @ 19:46:13
Author: dreisner
Revision: 171018
db-move: moved kmod from [testing] to [core] (i686, x86_64)
Added:
kmod/repos/core-i686/PKGBUILD
(from rev 171017, kmod/repos/testing-i686/PKGBUILD)
kmod/repos/core-i686/depmod-search.conf
(from rev 171017, kmod/repos/testing-i686/depmod-search.conf)
kmod/repos/core-x86_64/PKGBUILD
(from rev 171017, kmod/repos/testing-x86_64/PKGBUILD)
kmod/repos/core-x86_64/depmod-search.conf
(from rev 171017, kmod/repos/testing-x86_64/depmod-search.conf)
Deleted:
kmod/repos/core-i686/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
kmod/repos/core-i686/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch
kmod/repos/core-i686/PKGBUILD
kmod/repos/core-i686/depmod-search.conf
kmod/repos/core-x86_64/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
kmod/repos/core-x86_64/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch
kmod/repos/core-x86_64/PKGBUILD
kmod/repos/core-x86_64/depmod-search.conf
kmod/repos/testing-i686/
kmod/repos/testing-x86_64/
-+
core-i686/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch |
165 --
core-i686/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch |
33 --
core-i686/PKGBUILD |
122 +++
core-i686/depmod-search.conf|
10
core-x86_64/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch |
165 --
core-x86_64/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch |
33 --
core-x86_64/PKGBUILD|
122 +++
core-x86_64/depmod-search.conf |
10
8 files changed, 122 insertions(+), 538 deletions(-)
Deleted:
core-i686/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
===
--- core-i686/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
2012-11-14 21:21:51 UTC (rev 171017)
+++ core-i686/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
2012-11-15 00:46:13 UTC (rev 171018)
@@ -1,165 +0,0 @@
-From 88c247f7f18ac25181ddcaff97fbbecbd3a29f57 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi lucas.de.mar...@gmail.com
-Date: Wed, 3 Oct 2012 16:28:24 -0300
-Subject: [PATCH] depmod: fix parsing of modules.order with compressed modules
-
-We now index the modules by uncompressed-relative-path instead of
-relative-path. This is because the file modules.order, coming from
-kernel, always comes with uncompressed paths. This fixes the issue of
-not sorting the aliases correctly due to paths not matching when using
-compressed modules.
- tools/depmod.c | 46 +-
- 1 file changed, 29 insertions(+), 17 deletions(-)
-
-diff --git a/tools/depmod.c b/tools/depmod.c
-index 0bf2dea..ff19d6e 100644
a/tools/depmod.c
-+++ b/tools/depmod.c
-@@ -39,6 +39,8 @@
- #define DEFAULT_VERBOSE LOG_WARNING
- static int verbose = DEFAULT_VERBOSE;
-
-+#define KMOD_EXT_UNC 0
-+
- static const struct kmod_ext {
- const char *ext;
- size_t len;
-@@ -1001,6 +1003,7 @@ struct mod {
- uint16_t idx; /* index in depmod-modules.array */
- uint16_t users; /* how many modules depend on this one */
- uint8_t dep_loop : 1;
-+ char *uncrelpath; /* same as relpath but ending in .ko */
- char modname[];
- };
-
-@@ -1014,7 +1017,7 @@ struct depmod {
- const struct cfg *cfg;
- struct kmod_ctx *ctx;
- struct array modules;
-- struct hash *modules_by_relpath;
-+ struct hash *modules_by_uncrelpath;
- struct hash *modules_by_name;
- struct hash *symbols;
- unsigned int dep_loops;
-@@ -1025,6 +1028,7 @@ static void mod_free(struct mod *mod)
- DBG(free %p kmod=%p, path=%s\n, mod, mod-kmod, mod-path);
- array_free_array(mod-deps);
- kmod_module_unref(mod-kmod);
-+ free(mod-uncrelpath);
- free(mod);
- }
-
-@@ -1066,10 +1070,10 @@ static int depmod_init(struct depmod *depmod, struct
cfg *cfg,
-
- array_init(depmod-modules, 128);
-
-- depmod-modules_by_relpath = hash_new(512, NULL);
-- if (depmod-modules_by_relpath == NULL) {
-+ depmod-modules_by_uncrelpath = hash_new(512, NULL);
-+ if (depmod-modules_by_uncrelpath == NULL) {
- err = -errno;
-- goto modules_by_relpath_failed;
-+ goto modules_by_uncrelpath_failed;
- }
-
- depmod-modules_by_name = hash_new(512, NULL);
-@@ -1089,8 +1093,8 @@ static int depmod_init(struct depmod *depmod, struct cfg
*cfg,
- symbols_failed:
- hash_free(depmod-modules_by_name);
- modules_by_name_failed:
--
[arch-commits] Commit in kmod/repos (14 files)
Date: Tuesday, October 23, 2012 @ 18:08:40
Author: dreisner
Revision: 169581
db-move: moved kmod from [testing] to [core] (i686, x86_64)
Added:
kmod/repos/core-i686/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
(from rev 169580,
kmod/repos/testing-i686/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch)
kmod/repos/core-i686/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch
(from rev 169580,
kmod/repos/testing-i686/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch)
kmod/repos/core-i686/PKGBUILD
(from rev 169580, kmod/repos/testing-i686/PKGBUILD)
kmod/repos/core-i686/depmod-search.conf
(from rev 169580, kmod/repos/testing-i686/depmod-search.conf)
kmod/repos/core-x86_64/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
(from rev 169580,
kmod/repos/testing-x86_64/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch)
kmod/repos/core-x86_64/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch
(from rev 169580,
kmod/repos/testing-x86_64/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch)
kmod/repos/core-x86_64/PKGBUILD
(from rev 169580, kmod/repos/testing-x86_64/PKGBUILD)
kmod/repos/core-x86_64/depmod-search.conf
(from rev 169580, kmod/repos/testing-x86_64/depmod-search.conf)
Deleted:
kmod/repos/core-i686/PKGBUILD
kmod/repos/core-i686/depmod-search.conf
kmod/repos/core-x86_64/PKGBUILD
kmod/repos/core-x86_64/depmod-search.conf
kmod/repos/testing-i686/
kmod/repos/testing-x86_64/
-+
core-i686/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch |
165 ++
core-i686/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch |
33 ++
core-i686/PKGBUILD |
122 ---
core-i686/depmod-search.conf|
10
core-x86_64/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch |
165 ++
core-x86_64/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch |
33 ++
core-x86_64/PKGBUILD|
122 ---
core-x86_64/depmod-search.conf |
10
8 files changed, 538 insertions(+), 122 deletions(-)
Copied:
kmod/repos/core-i686/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
(from rev 169580,
kmod/repos/testing-i686/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch)
===
--- core-i686/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
(rev 0)
+++ core-i686/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
2012-10-23 22:08:40 UTC (rev 169581)
@@ -0,0 +1,165 @@
+From 88c247f7f18ac25181ddcaff97fbbecbd3a29f57 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi lucas.de.mar...@gmail.com
+Date: Wed, 3 Oct 2012 16:28:24 -0300
+Subject: [PATCH] depmod: fix parsing of modules.order with compressed modules
+
+We now index the modules by uncompressed-relative-path instead of
+relative-path. This is because the file modules.order, coming from
+kernel, always comes with uncompressed paths. This fixes the issue of
+not sorting the aliases correctly due to paths not matching when using
+compressed modules.
+---
+ tools/depmod.c | 46 +-
+ 1 file changed, 29 insertions(+), 17 deletions(-)
+
+diff --git a/tools/depmod.c b/tools/depmod.c
+index 0bf2dea..ff19d6e 100644
+--- a/tools/depmod.c
b/tools/depmod.c
+@@ -39,6 +39,8 @@
+ #define DEFAULT_VERBOSE LOG_WARNING
+ static int verbose = DEFAULT_VERBOSE;
+
++#define KMOD_EXT_UNC 0
++
+ static const struct kmod_ext {
+ const char *ext;
+ size_t len;
+@@ -1001,6 +1003,7 @@ struct mod {
+ uint16_t idx; /* index in depmod-modules.array */
+ uint16_t users; /* how many modules depend on this one */
+ uint8_t dep_loop : 1;
++ char *uncrelpath; /* same as relpath but ending in .ko */
+ char modname[];
+ };
+
+@@ -1014,7 +1017,7 @@ struct depmod {
+ const struct cfg *cfg;
+ struct kmod_ctx *ctx;
+ struct array modules;
+- struct hash *modules_by_relpath;
++ struct hash *modules_by_uncrelpath;
+ struct hash *modules_by_name;
+ struct hash *symbols;
+ unsigned int dep_loops;
+@@ -1025,6 +1028,7 @@ static void mod_free(struct mod *mod)
+ DBG(free %p kmod=%p, path=%s\n, mod, mod-kmod, mod-path);
+ array_free_array(mod-deps);
+ kmod_module_unref(mod-kmod);
++ free(mod-uncrelpath);
+ free(mod);
+ }
+
+@@ -1066,10 +1070,10 @@ static int depmod_init(struct depmod *depmod, struct
cfg *cfg,
+
+ array_init(depmod-modules, 128);
+
+- depmod-modules_by_relpath = hash_new(512,
[arch-commits] Commit in kmod/repos (14 files)
Date: Saturday, July 14, 2012 @ 09:07:23
Author: allan
Revision: 163513
db-move: moved kmod from [testing] to [core] ( i686, x86_64)
Added:
kmod/repos/core-i686/PKGBUILD
(from rev 163510, kmod/repos/testing-i686/PKGBUILD)
kmod/repos/core-i686/depmod-search.conf
(from rev 163510, kmod/repos/testing-i686/depmod-search.conf)
kmod/repos/core-i686/kmod.install
(from rev 163510, kmod/repos/testing-i686/kmod.install)
kmod/repos/core-x86_64/PKGBUILD
(from rev 163510, kmod/repos/testing-x86_64/PKGBUILD)
kmod/repos/core-x86_64/depmod-search.conf
(from rev 163510, kmod/repos/testing-x86_64/depmod-search.conf)
kmod/repos/core-x86_64/kmod.install
(from rev 163510, kmod/repos/testing-x86_64/kmod.install)
Deleted:
kmod/repos/core-i686/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
kmod/repos/core-i686/PKGBUILD
kmod/repos/core-i686/depmod-search.conf
kmod/repos/core-x86_64/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
kmod/repos/core-x86_64/PKGBUILD
kmod/repos/core-x86_64/depmod-search.conf
kmod/repos/testing-i686/
kmod/repos/testing-x86_64/
-+
core-i686/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch |
93
core-i686/PKGBUILD |
115 --
core-i686/depmod-search.conf|
10
core-i686/kmod.install |
9
core-x86_64/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch |
93
core-x86_64/PKGBUILD|
115 --
core-x86_64/depmod-search.conf |
10
core-x86_64/kmod.install|
9
8 files changed, 140 insertions(+), 314 deletions(-)
Deleted:
core-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
2012-07-14 13:07:15 UTC (rev 163512)
+++ core-i686/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
2012-07-14 13:07:23 UTC (rev 163513)
@@ -1,93 +0,0 @@
-From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001
-From: Tom Gundersen t...@jklm.no
-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 t...@jklm.no
- libkmod/libkmod.c |2 +-
- tools/depmod.c|2 +-
- tools/modinfo.c |4 ++--
- tools/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/libkmod/libkmod.c
-@@ -196,7 +196,7 @@ static int log_priority(const char *priority)
- return 0;
- }
-
--static const char *dirname_default_prefix = ROOTPREFIX /lib/modules;
-+static const char *dirname_default_prefix = /lib/modules;
-
- static char *get_kernel_release(const char *dirname)
- {
-diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
-index 7bb1c5d..454d538 100644
a/tools/depmod.c
-+++ b/tools/depmod.c
-@@ -2634,7 +2634,7 @@ static int do_depmod(int argc, char *argv[])
- }
-
- cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX,
--%s ROOTPREFIX /lib/modules/%s,
-+%s/lib/modules/%s,
- root == NULL ? : root, cfg.kversion);
-
- if (optind == argc)
-diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
-index aa5223f..b13cd4b 100644
a/tools/modinfo.c
-+++ b/tools/modinfo.c
-@@ -339,7 +339,7 @@ static void help(const char *progname)
- \t-0, --null Use \\0 instead of \\n\n
- \t-F, --field=FIELD Print only provided FIELD\n
- \t-k, --set-version=VERSION Use VERSION instead of `uname
-r`\n
-- \t-b, --basedir=DIR Use DIR as filesystem root for
ROOTPREFIX /lib/modules\n
-+ \t-b, --basedir=DIR Use DIR as filesystem root for
/lib/modules\n
- \t-V, --version Show version\n
- \t-h, --help Show this help\n,
- progname);
-@@ -439,7 +439,7 @@ static int do_modinfo(int argc, char *argv[])
- }
- kversion = u.release;
- }
-- snprintf(dirname_buf,
[arch-commits] Commit in kmod/repos (14 files)
Date: Thursday, May 10, 2012 @ 21:49:20
Author: dreisner
Revision: 158817
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
kmod/repos/testing-i686/
kmod/repos/testing-i686/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch
(from rev 158816,
kmod/trunk/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch)
kmod/repos/testing-i686/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
(from rev 158816,
kmod/trunk/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch)
kmod/repos/testing-i686/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
(from rev 158816,
kmod/trunk/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch)
kmod/repos/testing-i686/0002-depmod-report-failures-in-loading-symbols.patch
(from rev 158816,
kmod/trunk/0002-depmod-report-failures-in-loading-symbols.patch)
kmod/repos/testing-i686/PKGBUILD
(from rev 158816, kmod/trunk/PKGBUILD)
kmod/repos/testing-i686/depmod-search.conf
(from rev 158816, kmod/trunk/depmod-search.conf)
kmod/repos/testing-x86_64/
kmod/repos/testing-x86_64/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch
(from rev 158816,
kmod/trunk/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch)
kmod/repos/testing-x86_64/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
(from rev 158816,
kmod/trunk/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch)
kmod/repos/testing-x86_64/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
(from rev 158816,
kmod/trunk/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch)
kmod/repos/testing-x86_64/0002-depmod-report-failures-in-loading-symbols.patch
(from rev 158816,
kmod/trunk/0002-depmod-report-failures-in-loading-symbols.patch)
kmod/repos/testing-x86_64/PKGBUILD
(from rev 158816, kmod/trunk/PKGBUILD)
kmod/repos/testing-x86_64/depmod-search.conf
(from rev 158816, kmod/trunk/depmod-search.conf)
+
testing-i686/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch
| 35 +++
testing-i686/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
| 50 +
testing-i686/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
| 93 ++
testing-i686/0002-depmod-report-failures-in-loading-symbols.patch
| 34 +++
testing-i686/PKGBUILD
| 69 +++
testing-i686/depmod-search.conf
|5
testing-x86_64/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch
| 35 +++
testing-x86_64/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
| 50 +
testing-x86_64/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
| 93 ++
testing-x86_64/0002-depmod-report-failures-in-loading-symbols.patch
| 34 +++
testing-x86_64/PKGBUILD
| 69 +++
testing-x86_64/depmod-search.conf
|5
12 files changed, 572 insertions(+)
Copied:
kmod/repos/testing-i686/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch
(from rev 158816,
kmod/trunk/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch)
===
--- testing-i686/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch
(rev 0)
+++ testing-i686/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch
2012-05-11 01:49:20 UTC (rev 158817)
@@ -0,0 +1,35 @@
+From c7d5a60d3df735a3816bbc1ff1b416a803a4f7a6 Mon Sep 17 00:00:00 2001
+From: Dave Reisner dreis...@archlinux.org
+Date: Mon, 7 May 2012 19:41:41 -0400
+Subject: [PATCH 1/2] libkmod-file: gracefully handle errors from zlib
+
+zlib won't necessarily set the system errno, and this is particularly
+evident on corrupted data (which results in a double free). Use zlib's
+gzerror to detect the failure, returning a generic EINVAL when zlib
+doesn't provide us with an errno.
+---
+ libkmod/libkmod-file.c |8 +++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/libkmod/libkmod-file.c b/libkmod/libkmod-file.c
+index 46ad8d9..8beb7e3 100644
+--- a/libkmod/libkmod-file.c
b/libkmod/libkmod-file.c
+@@ -199,7 +199,13 @@ static int load_zlib(struct kmod_file *file)
+ if (r == 0)
+ break;
+ else if (r 0) {
+- err = -errno;
++ int gzerr;
++ const char *gz_errmsg = gzerror(file-gzf, gzerr);
++
++ ERR(file-ctx, gzip: %s\n, gz_errmsg);
++
++ /* gzip might not set errno here */
++ err = gzerr == Z_ERRNO ? -errno : -EINVAL;
+
[arch-commits] Commit in kmod/repos (14 files)
Date: Tuesday, January 31, 2012 @ 00:23:46 Author: dreisner Revision: 148396 archrelease: copy trunk to testing-i686, testing-x86_64 Added: kmod/repos/testing-i686/ kmod/repos/testing-i686/0001-partially-fix-parsing-of-alias-with-dots.patch (from rev 148395, kmod/trunk/0001-partially-fix-parsing-of-alias-with-dots.patch) kmod/repos/testing-i686/0002-libkmod-module-used-shared-code-in-module-creation.patch (from rev 148395, kmod/trunk/0002-libkmod-module-used-shared-code-in-module-creation.patch) kmod/repos/testing-i686/0003-modprobe-handle-all-error-returns-from-init_module.patch (from rev 148395, kmod/trunk/0003-modprobe-handle-all-error-returns-from-init_module.patch) kmod/repos/testing-i686/0004-modprobe-remove-0-refcnt-deps.patch (from rev 148395, kmod/trunk/0004-modprobe-remove-0-refcnt-deps.patch) kmod/repos/testing-i686/PKGBUILD (from rev 148395, kmod/trunk/PKGBUILD) kmod/repos/testing-i686/depmod-search.conf (from rev 148395, kmod/trunk/depmod-search.conf) kmod/repos/testing-x86_64/ kmod/repos/testing-x86_64/0001-partially-fix-parsing-of-alias-with-dots.patch (from rev 148395, kmod/trunk/0001-partially-fix-parsing-of-alias-with-dots.patch) kmod/repos/testing-x86_64/0002-libkmod-module-used-shared-code-in-module-creation.patch (from rev 148395, kmod/trunk/0002-libkmod-module-used-shared-code-in-module-creation.patch) kmod/repos/testing-x86_64/0003-modprobe-handle-all-error-returns-from-init_module.patch (from rev 148395, kmod/trunk/0003-modprobe-handle-all-error-returns-from-init_module.patch) kmod/repos/testing-x86_64/0004-modprobe-remove-0-refcnt-deps.patch (from rev 148395, kmod/trunk/0004-modprobe-remove-0-refcnt-deps.patch) kmod/repos/testing-x86_64/PKGBUILD (from rev 148395, kmod/trunk/PKGBUILD) kmod/repos/testing-x86_64/depmod-search.conf (from rev 148395, kmod/trunk/depmod-search.conf) --+ testing-i686/0001-partially-fix-parsing-of-alias-with-dots.patch | 34 + testing-i686/0002-libkmod-module-used-shared-code-in-module-creation.patch | 196 ++ testing-i686/0003-modprobe-handle-all-error-returns-from-init_module.patch | 34 + testing-i686/0004-modprobe-remove-0-refcnt-deps.patch| 52 ++ testing-i686/PKGBUILD| 69 +++ testing-i686/depmod-search.conf | 5 testing-x86_64/0001-partially-fix-parsing-of-alias-with-dots.patch | 34 + testing-x86_64/0002-libkmod-module-used-shared-code-in-module-creation.patch | 196 ++ testing-x86_64/0003-modprobe-handle-all-error-returns-from-init_module.patch | 34 + testing-x86_64/0004-modprobe-remove-0-refcnt-deps.patch | 52 ++ testing-x86_64/PKGBUILD | 69 +++ testing-x86_64/depmod-search.conf| 5 12 files changed, 780 insertions(+) Copied: kmod/repos/testing-i686/0001-partially-fix-parsing-of-alias-with-dots.patch (from rev 148395, kmod/trunk/0001-partially-fix-parsing-of-alias-with-dots.patch) === --- testing-i686/0001-partially-fix-parsing-of-alias-with-dots.patch (rev 0) +++ testing-i686/0001-partially-fix-parsing-of-alias-with-dots.patch 2012-01-31 05:23:46 UTC (rev 148396) @@ -0,0 +1,34 @@ +From cdaf4b2f3ef60365c6b8006a63410368a7b38f39 Mon Sep 17 00:00:00 2001 +From: Dave Reisner dreis...@archlinux.org +Date: Tue, 31 Jan 2012 00:12:32 -0500 +Subject: [PATCH 1/4] partially fix parsing of alias with dots + +--- + libkmod/libkmod-util.c |4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) + +diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c +index 7c2611b..6a9f697 100644 +--- a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c +@@ -134,8 +134,7 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len) + case ']': + return -EINVAL; + case '[': +- while (alias[s] != ']' +- alias[s] != '.' alias[s] != '\0') ++ while (alias[s] != ']' alias[s] != '\0') + s++; + + if (alias[s] != ']') +@@ -144,7 +143,6 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len) + s++; + break; + case '\0': +- case '.': + goto finish; + default: + buf[s] = c; +-- +1.7.9 + Copied: kmod/repos/testing-i686/0002-libkmod-module-used-shared-code-in-module-creation.patch (from rev 148395,
[arch-commits] Commit in kmod/repos (14 files)
Date: Thursday, January 12, 2012 @ 15:25:05
Author: dreisner
Revision: 146539
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
kmod/repos/testing-i686/PKGBUILD
(from rev 146538, kmod/trunk/PKGBUILD)
kmod/repos/testing-i686/depmod-search.conf
(from rev 146538, kmod/trunk/depmod-search.conf)
kmod/repos/testing-x86_64/PKGBUILD
(from rev 146538, kmod/trunk/PKGBUILD)
kmod/repos/testing-x86_64/depmod-search.conf
(from rev 146538, kmod/trunk/depmod-search.conf)
Deleted:
kmod/repos/testing-i686/PKGBUILD
kmod/repos/testing-i686/depmod-search.conf
kmod/repos/testing-i686/fix-error-path-when-loading-deps.patch
kmod/repos/testing-i686/return-non-zero-on-fail.patch
kmod/repos/testing-i686/use-path-max-for-alias-names.patch
kmod/repos/testing-x86_64/PKGBUILD
kmod/repos/testing-x86_64/depmod-search.conf
kmod/repos/testing-x86_64/fix-error-path-when-loading-deps.patch
kmod/repos/testing-x86_64/return-non-zero-on-fail.patch
kmod/repos/testing-x86_64/use-path-max-for-alias-names.patch
---+
testing-i686/PKGBUILD | 126 ++---
testing-i686/depmod-search.conf | 10 -
testing-i686/fix-error-path-when-loading-deps.patch | 35 ---
testing-i686/return-non-zero-on-fail.patch| 30 ---
testing-i686/use-path-max-for-alias-names.patch | 147
testing-x86_64/PKGBUILD | 126 ++---
testing-x86_64/depmod-search.conf | 10 -
testing-x86_64/fix-error-path-when-loading-deps.patch | 35 ---
testing-x86_64/return-non-zero-on-fail.patch | 30 ---
testing-x86_64/use-path-max-for-alias-names.patch | 147
10 files changed, 130 insertions(+), 566 deletions(-)
Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD 2012-01-12 20:24:44 UTC (rev 146538)
+++ testing-i686/PKGBUILD 2012-01-12 20:25:05 UTC (rev 146539)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner dreis...@archlinux.org
-
-pkgname=kmod
-pkgver=3
-pkgrel=5
-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
-use-path-max-for-alias-names.patch
-fix-error-path-when-loading-deps.patch)
-md5sums=('bc0e69f75c2ac22c091f05e166e86c5d'
- '4b8cbcbc54b9029c99fd730e257d4436'
- '4be6f783a7fc2d1747ccaa2536d2e88f'
- '4d801693a6788236b4ed578c24514d62'
- 'd0f01e506e825156760e6129f04eea28')
-
-build() {
- cd $pkgname-$pkgver
-
- patch -Np1 $srcdir/return-non-zero-on-fail.patch
- patch -Np1 $srcdir/use-path-max-for-alias-names.patch
- patch -Np1 $srcdir/fix-error-path-when-loading-deps.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/PKGBUILD (from rev 146538, kmod/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-01-12 20:25:05 UTC (rev 146539)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+
+pkgname=kmod
+pkgver=3
+pkgrel=6
+_snapdt=20120112
+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')
+options=('!strip')
+source=(#http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz;
+
ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.$_snapdt.tar.xz;
+depmod-search.conf)
+md5sums=('78252871325d3950bb132cde81c488b0'
+ '4b8cbcbc54b9029c99fd730e257d4436')
+
+build() {
+ cd $pkgname-$pkgver
+
+ CFLAGS+=' -g' ./configure \
+--sysconfdir=/etc \
+--enable-debug \
+
