From: John Mylchreest Date: Wed, 1 Dec 2004 18:08:57 +0000 (+0000) Subject: Updating PV to PVR X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=137eff085308312668b86bfa18d16e44304abbad;p=gentoo.git Updating PV to PVR --- diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 4d312ba0943d..d4280aca9757 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.4 2004/11/28 09:47:31 johnm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.5 2004/12/01 18:08:57 johnm Exp $ # # This eclass provides functions for querying the installed kernel # source version, selected kernel options etc. @@ -20,11 +20,10 @@ KERNEL_DIR="${KERNEL_DIR:-/usr/src/linux}" # getfilevar getfilevar() { -local ERROR +local ERROR curpwd ERROR=0 [ -z "${1}" ] && ERROR=1 - [ -z "${2}" ] && ERROR=1 [ ! -f "${2}" ] && ERROR=1 if [ "${ERROR}" = 1 ] @@ -32,7 +31,11 @@ local ERROR eerror "getfilevar requires 2 variables, with the second a valid file." eerror " getfilevar " else - grep -e "^$1[= ]" $2 | sed 's: = :=:' | cut -d= -f2- + curpwd="${PWD}" + cd $(dirname ${2}) + echo $(echo -e "include $(basename ${2})\ne:\n\t@echo \$(${1})" | make -f - e) + cd ${curpwd} + # grep -e "^$1[= ]" $2 | sed 's: = :=:' | cut -d= -f2- fi }