[gentoo-commits] proj/eselect:master commit in: /, modules/

[Ulrich Müller]

commit:     2595c33ecfc5d1604a421f420ca6786c98968ba8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 28 13:02:04 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 28 13:02:04 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=2595c33e

Changed heuristic for recognising kernel source trees.

* modules/kernel.eselect (find_targets): Changed heuristic for
recognising kernel source trees: Check for both Makefile and
Kconfig being present, but don't require digits in the directory
name any more. Bug 516754.

---
 ChangeLog              | 5 +++++
 modules/kernel.eselect | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 92d7730..ca4c7c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-08-28  Ulrich Müller  <ulm@g.o>
 
+	* modules/kernel.eselect (find_targets): Changed heuristic for
+	recognising kernel source trees: Check for both Makefile and
+	Kconfig being present, but don't require digits in the directory
+	name any more. Bug 516754.
+
 	* libs/core.bash.in (inherit):
 	* libs/tests.bash.in (has):
 	* modules/config.eselect (generic_handle_one_file, accept_handler)

diff --git a/modules/kernel.eselect b/modules/kernel.eselect
index d21b748..c327f3c 100644
--- a/modules/kernel.eselect
+++ b/modules/kernel.eselect
@@ -28,8 +28,8 @@ sort_kernel_versions() {
 # find a list of kernel symlink targets
 find_targets() {
 	local f
-	for f in "${EROOT}"/usr/src/linux-[[:digit:]]*; do
-		[[ -f ${f}/Makefile ]] && basename "${f}"
+	for f in "${EROOT}"/usr/src/linux-*; do
+		[[ -f ${f}/Makefile && -f ${f}/Kconfig ]] && basename "${f}"
 	done | sort_kernel_versions
 }