| 1 |
robbat2 09/09/06 23:12:29 |
| 2 |
|
| 3 |
Modified: linux-info.eclass |
| 4 |
Log: |
| 5 |
Bug 283320: Fix minor typo for config.gz. Improve ewarn output, more migration. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.64 eclass/linux-info.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-info.eclass?rev=1.64&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-info.eclass?rev=1.64&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-info.eclass?r1=1.63&r2=1.64 |
| 13 |
|
| 14 |
Index: linux-info.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v |
| 17 |
retrieving revision 1.63 |
| 18 |
retrieving revision 1.64 |
| 19 |
diff -p -w -b -B -u -u -r1.63 -r1.64 |
| 20 |
--- linux-info.eclass 6 Sep 2009 23:04:37 -0000 1.63 |
| 21 |
+++ linux-info.eclass 6 Sep 2009 23:12:29 -0000 1.64 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2006 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.63 2009/09/06 23:04:37 robbat2 Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.64 2009/09/06 23:12:29 robbat2 Exp $ |
| 27 |
# |
| 28 |
# Original author: John Mylchreest <johnm@g.o> |
| 29 |
# Maintainer: kernel-misc@g.o |
| 30 |
@@ -202,7 +202,7 @@ getfilevar_noexec() { |
| 31 |
|
| 32 |
[ -z "${1}" ] && ERROR=1 |
| 33 |
[ ! -f "${2}" ] && ERROR=1 |
| 34 |
- [ "${2#.gz}" != "${2}" ] && mycat='zcat' |
| 35 |
+ [ "${2%.gz}" != "${2}" ] && mycat='zcat' |
| 36 |
|
| 37 |
if [ "${ERROR}" = 1 ] |
| 38 |
then |
| 39 |
@@ -625,7 +625,8 @@ check_extra_config() { |
| 40 |
# code later will cause a failure due to missing .config. |
| 41 |
if ! linux_config_exists; then |
| 42 |
ewarn "Unable to check for the following kernel config options due" |
| 43 |
- ewarn "to absence of any configured kernel sources:" |
| 44 |
+ ewarn "to absence of any configured kernel sources or compiled" |
| 45 |
+ ewarn "config:" |
| 46 |
for config in ${CONFIG_CHECK}; do |
| 47 |
ewarn " - ${config#\~}" |
| 48 |
done |
| 49 |
@@ -633,7 +634,7 @@ check_extra_config() { |
| 50 |
return 0 |
| 51 |
fi |
| 52 |
else |
| 53 |
- require_configured_kernel |
| 54 |
+ [ -n "${I_KNOW_WHAT_I_AM_DOING}" ] && require_configured_kernel |
| 55 |
fi |
| 56 |
|
| 57 |
einfo "Checking for suitable kernel configuration options..." |
Archives