Gentoo Archives: gentoo-commits

From: "Andrew Gaffney (agaffney)" <agaffney@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] releng r623 - trunk/tools
Date: Fri, 13 Mar 2009 12:51:57
Message-Id: E1Li6rk-0005L4-2z@stork.gentoo.org
1 Author: agaffney
2 Date: 2009-03-13 12:51:55 +0000 (Fri, 13 Mar 2009)
3 New Revision: 623
4
5 Modified:
6 trunk/tools/ChangeLog
7 trunk/tools/catalyst-auto
8 Log:
9 Fix typo with multiple kernel code
10
11 Modified: trunk/tools/ChangeLog
12 ===================================================================
13 --- trunk/tools/ChangeLog 2009-03-13 12:34:18 UTC (rev 622)
14 +++ trunk/tools/ChangeLog 2009-03-13 12:51:55 UTC (rev 623)
15 @@ -3,6 +3,9 @@
16 # $Id$
17
18 13 Mar 2009; Andrew Gaffney <agaffney@g.o> catalyst-auto:
19 + Fix typo with multiple kernel code
20 +
21 + 13 Mar 2009; Andrew Gaffney <agaffney@g.o> catalyst-auto:
22 Add --test flag
23
24 02 Mar 2009; Andrew Gaffney <agaffney@g.o> catalyst-auto:
25
26 Modified: trunk/tools/catalyst-auto
27 ===================================================================
28 --- trunk/tools/catalyst-auto 2009-03-13 12:34:18 UTC (rev 622)
29 +++ trunk/tools/catalyst-auto 2009-03-13 12:51:55 UTC (rev 623)
30 @@ -166,9 +166,9 @@
31
32 sed -i '/^livecd\/iso/s|'${old_version_stamp}'|'${new_version_stamp}'|' ${i}
33
34 - kconfig_line=$(grep '^boot/kernel/[^/]\+/config:' ${i})
35 - if [ -n "${kconfig_line}" ]; then
36 - echo "${kconfig_file}" | while read line; do
37 + kconfig_lines=$(grep '^boot/kernel/[^/]\+/config:' ${i})
38 + if [ -n "${kconfig_lines}" ]; then
39 + echo "${kconfig_lines}" | while read line; do
40 key=$(echo "${line}" | cut -d: -f1)
41 filename=$(basename $(echo "${line}" | cut -d: -f2))
42 sed -i "s|^${key}:.*\$|${key}: ${TMPDIR}/kconfig/${filename}|" ${i}