summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Pagano <mpagano@gentoo.org>2014-01-14 20:50:23 +0000
committerMike Pagano <mpagano@gentoo.org>2014-01-14 20:50:23 +0000
commitf461242819b07372d0381d78063e9549b7f97966 (patch)
tree0a78d9abde9bad976695fd5dcefde7e6deb070d2 /eclass
parentrename aarch64 keyword to arm64 (diff)
downloadgentoo-2-f461242819b07372d0381d78063e9549b7f97966.tar.gz
gentoo-2-f461242819b07372d0381d78063e9549b7f97966.tar.bz2
gentoo-2-f461242819b07372d0381d78063e9549b7f97966.zip
Remove use of sed in linux-mod.eclass. Replace with bash.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/linux-mod.eclass6
2 files changed, 7 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 63ee590256b4..41bdfe467ac2 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1112 2014/01/13 06:02:35 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1113 2014/01/14 20:50:23 mpagano Exp $
+
+ 14 Jan 2014; Michael Pagano <mpagano@gentoo.org> linux-mod.eclass:
+ Remove use of sed in linux-mod.eclass. Replace with bash.
13 Jan 2014; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
Add EAPI 0 compatible USE defaults (bug #372663).
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index 6af1c7e9410f..4890e7f6b399 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.115 2013/12/01 19:11:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.116 2014/01/14 20:50:23 mpagano Exp $
# @ECLASS: linux-mod.eclass
# @MAINTAINER:
@@ -431,7 +431,7 @@ generate_modulesd() {
for t in ${module_modinfo}
do
- myVAR="$(echo ${t#*:} | grep -e " [0-9][ =]" | sed "s:.*\([01][= ]\).*:\1:")"
+ myVAR="$(echo ${t#*:} | grep -o "[^ ]*[0-9][ =][^ ]*" | tail -1 | grep -o "[0-9]")"
if [[ -n ${myVAR} ]]
then
module_opts="${module_opts} ${t%%:*}:${myVAR}"