| 1 |
Author: agaffney |
| 2 |
Date: 2008-09-04 12:44:33 +0000 (Thu, 04 Sep 2008) |
| 3 |
New Revision: 573 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/tools/ChangeLog |
| 7 |
trunk/tools/catalyst-auto |
| 8 |
trunk/tools/catalyst-auto-amd64.conf |
| 9 |
Log: |
| 10 |
Copy kconfigs and mangle path in spec |
| 11 |
|
| 12 |
Modified: trunk/tools/ChangeLog |
| 13 |
=================================================================== |
| 14 |
--- trunk/tools/ChangeLog 2008-09-04 02:33:23 UTC (rev 572) |
| 15 |
+++ trunk/tools/ChangeLog 2008-09-04 12:44:33 UTC (rev 573) |
| 16 |
@@ -2,6 +2,10 @@ |
| 17 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 18 |
# $Id$ |
| 19 |
|
| 20 |
+ 04 Sep 2008; Andrew Gaffney <agaffney@g.o> catalyst-auto, |
| 21 |
+ catalyst-auto-amd64.conf: |
| 22 |
+ Copy kconfigs and mangle path in spec |
| 23 |
+ |
| 24 |
04 Sep 2008; Andrew Gaffney <agaffney@g.o> catalyst-auto: |
| 25 |
Exit if snapshot creation fails |
| 26 |
|
| 27 |
|
| 28 |
Modified: trunk/tools/catalyst-auto |
| 29 |
=================================================================== |
| 30 |
--- trunk/tools/catalyst-auto 2008-09-04 02:33:23 UTC (rev 572) |
| 31 |
+++ trunk/tools/catalyst-auto 2008-09-04 12:44:33 UTC (rev 573) |
| 32 |
@@ -93,22 +93,22 @@ |
| 33 |
fi |
| 34 |
fi |
| 35 |
|
| 36 |
-if ! mkdir -p "${TMPDIR}/specs"; then |
| 37 |
- echo "Couldn't create temp spec dir at ${TMPDIR}/specs!" |
| 38 |
- exit 1 |
| 39 |
-fi |
| 40 |
+for i in ${TMPDIR} ${TMPDIR}/specs ${TMPDIR}/kconfig ${TMPDIR}/log; do |
| 41 |
+ if ! mkdir -p "${i}"; then |
| 42 |
+ echo "Couldn't create dir ${i}!" |
| 43 |
+ exit 1 |
| 44 |
+ fi |
| 45 |
+done |
| 46 |
|
| 47 |
-if ! mkdir -p "${TMPDIR}/log"; then |
| 48 |
- echo "Couldn't create log dir at ${TMPDIR}/log!" |
| 49 |
- exit 1 |
| 50 |
-fi |
| 51 |
- |
| 52 |
cd ${SPECS_DIR} |
| 53 |
|
| 54 |
for i in ${SPECS}; do |
| 55 |
cp --parents ${i} ${TMPDIR}/specs/ |
| 56 |
done |
| 57 |
|
| 58 |
+cd ${KCONFIG_DIR} |
| 59 |
+find -type f -exec cp {} ${TMPDIR}/kconfig \; |
| 60 |
+ |
| 61 |
cd ${TMPDIR}/specs |
| 62 |
|
| 63 |
# Fix up specs with datestamp |
| 64 |
@@ -122,6 +122,13 @@ |
| 65 |
if [ "${old_version_stamp}" = "${old_source_subpath}" ]; then |
| 66 |
sed -i 's|^source_subpath: \(.\+-\).\+$|source_subpath: \1'${DATESTAMP}'|' ${i} |
| 67 |
fi |
| 68 |
+ |
| 69 |
+ kconfig_line=$(grep '^boot/kernel/[^/]\+/config:' ${i}) |
| 70 |
+ if [ -n "${kconfig_line}" ]; then |
| 71 |
+ key=$(echo "${kconfig_line}" | cut -d: -f1) |
| 72 |
+ filename=$(basename $(echo "${kconfig_line}" | cut -d: -f2)) |
| 73 |
+ sed -i "s|^${key}:.*\$|${key}: ${TMPDIR}/kconfig/${filename}|" ${i} |
| 74 |
+ fi |
| 75 |
done |
| 76 |
|
| 77 |
# Create snapshot |
| 78 |
|
| 79 |
Modified: trunk/tools/catalyst-auto-amd64.conf |
| 80 |
=================================================================== |
| 81 |
--- trunk/tools/catalyst-auto-amd64.conf 2008-09-04 02:33:23 UTC (rev 572) |
| 82 |
+++ trunk/tools/catalyst-auto-amd64.conf 2008-09-04 12:44:33 UTC (rev 573) |
| 83 |
@@ -7,6 +7,8 @@ |
| 84 |
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec" |
| 85 |
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec" |
| 86 |
|
| 87 |
+KCONFIG_DIR=/release/svn-releng/trunk/releases/2008.0/kconfig/amd64 |
| 88 |
+ |
| 89 |
#EMAIL_TO=releng@g.o |
| 90 |
EMAIL_TO=agaffney@g.o |
| 91 |
EMAIL_FROM=catalyst@×××××××××××××××××××××××××.org |
Archives