summaryrefslogtreecommitdiff
path: root/testing/kmod
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2012-05-04 20:00:41 +0000
committerParabola <dev@list.parabolagnulinux.org>2012-05-04 20:00:41 +0000
commitb2c353d874b85e06f355a9419852e2616613c7d0 (patch)
treef0773e0a930d308198ef5036d4f74e7f53015e6e /testing/kmod
parent0a24fb835cac4007388213ad0afb15257b035b14 (diff)
Fri May 4 20:00:31 UTC 2012
Diffstat (limited to 'testing/kmod')
-rw-r--r--testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch50
-rw-r--r--testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch93
-rw-r--r--testing/kmod/PKGBUILD61
-rw-r--r--testing/kmod/depmod-search.conf5
4 files changed, 0 insertions, 209 deletions
diff --git a/testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch b/testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
deleted file mode 100644
index bf2c3501f..000000000
--- a/testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 666ba68a0635048aea0db70cd9ec61aea9b61ed2 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@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
-
diff --git a/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch b/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
deleted file mode 100644
index f39f36ace..000000000
--- a/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@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 <teg@jklm.no>
----
- 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/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/kmod-depmod.c
-+++ b/tools/kmod-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/kmod-modinfo.c
-+++ b/tools/kmod-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, sizeof(dirname_buf), "%s" ROOTPREFIX "/lib/modules/%s",
-+ snprintf(dirname_buf, sizeof(dirname_buf), "%s/lib/modules/%s",
- root, kversion);
- dirname = dirname_buf;
- }
-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
-@@ -128,7 +128,7 @@ static void help(const char *progname)
- "\t-n, --show Same as --dry-run\n"
-
- "\t-C, --config=FILE Use FILE instead of default search paths\n"
-- "\t-d, --dirname=DIR Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n"
-+ "\t-d, --dirname=DIR Use DIR as filesystem root for /lib/modules\n"
- "\t-S, --set-version=VERSION Use VERSION instead of `uname -r`\n"
-
- "\t-s, --syslog print to syslog, not stderr\n"
-@@ -973,7 +973,7 @@ static int do_modprobe(int argc, char **orig_argv)
- kversion = u.release;
- }
- snprintf(dirname_buf, sizeof(dirname_buf),
-- "%s" ROOTPREFIX "/lib/modules/%s", root,
-+ "%s/lib/modules/%s", root,
- kversion);
- dirname = dirname_buf;
- }
---
-1.7.9.5
-
diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD
deleted file mode 100644
index 964def177..000000000
--- a/testing/kmod/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 156503 2012-04-19 23:17:12Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=kmod
-pkgver=8
-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"
- "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch"
- "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch")
-md5sums=('d4e3d038b5370b1e8ff237c55666aa64'
- 'dd62cbf62bd8f212f51ef8c43bec9a77'
- 'ba73b9e98db1abbf41274f922fcfbd55'
- 'c9af56636c5667cf4ce3a31ea56e03d9')
-
-build() {
- cd "$pkgname-$pkgver"
-
- patch -p1 -i ../0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
- patch -p1 -i ../0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
-
- ./configure \
- --sysconfdir=/etc \
- --with-zlib \
- --with-rootprefix=/usr
-
- make
-}
-
-check() {
- make -C "$pkgname-$pkgver" check
-}
-
-package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
- # extra directories
- install -dm755 "$pkgdir"/{etc,usr/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/usr/lib/depmod.d/search.conf"
-}
-
-# vim: ft=sh syn=sh et
diff --git a/testing/kmod/depmod-search.conf b/testing/kmod/depmod-search.conf
deleted file mode 100644
index 36f2cf7db..000000000
--- a/testing/kmod/depmod-search.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# /usr/lib/depmod.d/search.conf
-#
-
-search updates extramodules built-in