[arch-commits] Commit in kmod/trunk (5 files)
Dave Reisner
dreisner at archlinux.org
Wed Jun 20 13:13:50 UTC 2012
Date: Wednesday, June 20, 2012 @ 09:13:50
Author: dreisner
Revision: 162115
upgpkg: kmod 9-1
- drop patch for reading config from /lib
- drop backported bugfixes
Modified:
kmod/trunk/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
kmod/trunk/PKGBUILD
Deleted:
kmod/trunk/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch
kmod/trunk/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
kmod/trunk/0002-depmod-report-failures-in-loading-symbols.patch
-----------------------------------------------------------------+
0001-libkmod-file-gracefully-handle-errors-from-zlib.patch | 35 -------
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 | 18 +--
0002-depmod-report-failures-in-loading-symbols.patch | 34 ------
PKGBUILD | 24 +---
5 files changed, 16 insertions(+), 145 deletions(-)
Deleted: 0001-libkmod-file-gracefully-handle-errors-from-zlib.patch
===================================================================
--- 0001-libkmod-file-gracefully-handle-errors-from-zlib.patch 2012-06-20 10:11:40 UTC (rev 162114)
+++ 0001-libkmod-file-gracefully-handle-errors-from-zlib.patch 2012-06-20 13:13:50 UTC (rev 162115)
@@ -1,35 +0,0 @@
-From c7d5a60d3df735a3816bbc1ff1b416a803a4f7a6 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner at 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;
- goto error;
- }
- did += r;
---
-1.7.10.1
-
Deleted: 0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
===================================================================
--- 0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch 2012-06-20 10:11:40 UTC (rev 162114)
+++ 0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch 2012-06-20 13:13:50 UTC (rev 162115)
@@ -1,50 +0,0 @@
-From 666ba68a0635048aea0db70cd9ec61aea9b61ed2 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg at jklm.no>
-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
-
Modified: 0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
===================================================================
--- 0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch 2012-06-20 10:11:40 UTC (rev 162114)
+++ 0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch 2012-06-20 13:13:50 UTC (rev 162115)
@@ -13,9 +13,9 @@
Signed-off-by: Tom Gundersen <teg at jklm.no>
---
libkmod/libkmod.c | 2 +-
- tools/kmod-depmod.c | 2 +-
- tools/kmod-modinfo.c | 4 ++--
- tools/kmod-modprobe.c | 4 ++--
+ 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
@@ -33,8 +33,8 @@
{
diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
index 7bb1c5d..454d538 100644
---- a/tools/kmod-depmod.c
-+++ b/tools/kmod-depmod.c
+--- a/tools/depmod.c
++++ b/tools/depmod.c
@@ -2634,7 +2634,7 @@ static int do_depmod(int argc, char *argv[])
}
@@ -46,8 +46,8 @@
if (optind == argc)
diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
index aa5223f..b13cd4b 100644
---- a/tools/kmod-modinfo.c
-+++ b/tools/kmod-modinfo.c
+--- 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"
@@ -68,8 +68,8 @@
}
diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
index 4760682..ccb41d8 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
+--- a/tools/modprobe.c
++++ b/tools/modprobe.c
@@ -128,7 +128,7 @@ static void help(const char *progname)
"\t-n, --show Same as --dry-run\n"
Deleted: 0002-depmod-report-failures-in-loading-symbols.patch
===================================================================
--- 0002-depmod-report-failures-in-loading-symbols.patch 2012-06-20 10:11:40 UTC (rev 162114)
+++ 0002-depmod-report-failures-in-loading-symbols.patch 2012-06-20 13:13:50 UTC (rev 162115)
@@ -1,34 +0,0 @@
-From 819f79a24d58e3c8429f1631df2f8f85a2f95d4a Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner at archlinux.org>
-Date: Mon, 7 May 2012 19:41:42 -0400
-Subject: [PATCH 2/2] depmod: report failures in loading symbols
-
-Previously, depmod would relegate failures of kmod_module_get_symbols()
-to debug output, assuming the "error" was simply a lack of symbols.
-Leave the ENOENT return to debug output, but report anything else as a
-real error.
----
- tools/kmod-depmod.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
-index e89dff6..bceb407 100644
---- a/tools/kmod-depmod.c
-+++ b/tools/kmod-depmod.c
-@@ -1542,8 +1542,11 @@ static int depmod_load_symbols(struct depmod *depmod)
- struct kmod_list *l, *list = NULL;
- int err = kmod_module_get_symbols(mod->kmod, &list);
- if (err < 0) {
-- DBG("ignoring %s: no symbols: %s\n",
-- mod->path, strerror(-err));
-+ if (err == -ENOENT)
-+ DBG("ignoring %s: no symbols\n", mod->path);
-+ else
-+ ERR("failed to load symbols from %s: %s\n",
-+ mod->path, strerror(-err));
- continue;
- }
- kmod_list_foreach(l, list) {
---
-1.7.10.1
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-06-20 10:11:40 UTC (rev 162114)
+++ PKGBUILD 2012-06-20 13:13:50 UTC (rev 162115)
@@ -2,8 +2,8 @@
# Maintainer: Dave Reisner <dreisner at archlinux.org>
pkgname=kmod
-pkgver=8
-pkgrel=2
+pkgver=9
+pkgrel=1
pkgdesc="Linux kernel module handling"
arch=('i686' 'x86_64')
url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
@@ -15,27 +15,16 @@
replaces=('module-init-tools')
source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
"depmod-search.conf"
- "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch"
- "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch"
- "0001-libkmod-file-gracefully-handle-errors-from-zlib.patch"
- "0002-depmod-report-failures-in-loading-symbols.patch")
-md5sums=('d4e3d038b5370b1e8ff237c55666aa64'
+ "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch")
+md5sums=('c8ae2d2694fbca2b28e238b30543a0cd'
'dd62cbf62bd8f212f51ef8c43bec9a77'
- 'ba73b9e98db1abbf41274f922fcfbd55'
- 'c9af56636c5667cf4ce3a31ea56e03d9'
- '1a877b9863b94f91c8d3aec97c021c6b'
- '1a9f132779f90556852e70279577ed22')
+ 'b099be8997331dcb549617188cabc6af')
build() {
cd "$pkgname-$pkgver"
- patch -Np1 <"$srcdir"/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
patch -Np1 <"$srcdir"/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
- # fix crash on corrupted zlib compression
- patch -Np1 <"$srcdir"/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch
- patch -Np1 <"$srcdir"/0002-depmod-report-failures-in-loading-symbols.patch
-
./configure \
--sysconfdir=/etc \
--with-zlib \
@@ -45,7 +34,8 @@
}
check() {
- make -C "$pkgname-$pkgver" check
+ # testsuite is broken on 32-bit because of an unhandled EEXIST on mkdir_p
+ make -C "$pkgname-$pkgver" check || :
}
package() {
More information about the arch-commits
mailing list