From 68998b64e2d81f7e77184b7f23ee141da1d0e2ff Mon Sep 17 00:00:00 2001 From: Parabola Date: Fri, 17 Feb 2012 19:21:14 +0000 Subject: Fri Feb 17 19:21:14 UTC 2012 --- ...ule-probe-Fix-ignore-loaded-flag-not-bein.patch | 28 ---------- ...ule-probe-fix-infinite-loop-with-softdeps.patch | 39 ------------- testing/kmod/PKGBUILD | 64 ---------------------- testing/kmod/depmod-search.conf | 5 -- 4 files changed, 136 deletions(-) delete mode 100644 testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch delete mode 100644 testing/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch delete mode 100644 testing/kmod/PKGBUILD delete mode 100644 testing/kmod/depmod-search.conf (limited to 'testing/kmod') diff --git a/testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch b/testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch deleted file mode 100644 index 4ffc3e53b..000000000 --- a/testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch +++ /dev/null @@ -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 - diff --git a/testing/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch b/testing/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch deleted file mode 100644 index 95e7f859a..000000000 --- a/testing/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch +++ /dev/null @@ -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 - diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD deleted file mode 100644 index 028413d8c..000000000 --- a/testing/kmod/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 150255 2012-02-16 00:05:20Z dreisner $ -# 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-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 diff --git a/testing/kmod/depmod-search.conf b/testing/kmod/depmod-search.conf deleted file mode 100644 index 3feb67b05..000000000 --- a/testing/kmod/depmod-search.conf +++ /dev/null @@ -1,5 +0,0 @@ -# -# /etc/depmod.d/depmod.conf -# - -search updates extramodules built-in -- cgit v1.2.3-54-g00ecf