| 1 |
Author: agaffney |
| 2 |
Date: 2009-06-27 19:09:30 +0000 (Sat, 27 Jun 2009) |
| 3 |
New Revision: 652 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/tools/ChangeLog |
| 7 |
trunk/tools/catalyst-auto |
| 8 |
trunk/tools/catalyst-auto-amd64.conf |
| 9 |
trunk/tools/catalyst-auto-x86.conf |
| 10 |
Log: |
| 11 |
Add concept of build sets to catalyst-auto |
| 12 |
|
| 13 |
Modified: trunk/tools/ChangeLog |
| 14 |
=================================================================== |
| 15 |
--- trunk/tools/ChangeLog 2009-05-26 19:05:11 UTC (rev 651) |
| 16 |
+++ trunk/tools/ChangeLog 2009-06-27 19:09:30 UTC (rev 652) |
| 17 |
@@ -2,6 +2,10 @@ |
| 18 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 19 |
# $Id$ |
| 20 |
|
| 21 |
+ 27 Jun 2009; Andrew Gaffney <agaffney@g.o> catalyst-auto, |
| 22 |
+ catalyst-auto-amd64.conf, catalyst-auto-x86.conf: |
| 23 |
+ Add concept of build sets to catalyst-auto |
| 24 |
+ |
| 25 |
14 May 2009; Andrew Gaffney <agaffney@g.o> catalyst-auto: |
| 26 |
run find specifically in KCONFIG_DIR |
| 27 |
|
| 28 |
|
| 29 |
Modified: trunk/tools/catalyst-auto |
| 30 |
=================================================================== |
| 31 |
--- trunk/tools/catalyst-auto 2009-05-26 19:05:11 UTC (rev 651) |
| 32 |
+++ trunk/tools/catalyst-auto 2009-06-27 19:09:30 UTC (rev 652) |
| 33 |
@@ -138,8 +138,20 @@ |
| 34 |
|
| 35 |
cd ${SPECS_DIR} |
| 36 |
|
| 37 |
-for i in ${SPECS} ${OPTIONAL_SPECS}; do |
| 38 |
- cp --parents ${i} ${TMPDIR}/specs/ |
| 39 |
+for a in "" ${SETS}; do |
| 40 |
+ local specs_var, optional_specs_var; |
| 41 |
+ |
| 42 |
+ if [ -z "${a}" ]; then |
| 43 |
+ specs_var="SPECS" |
| 44 |
+ optional_specs_var="OPTIONAL_SPECS" |
| 45 |
+ else |
| 46 |
+ specs_var="SET_${a}_SPECS" |
| 47 |
+ optional_specs_var="SET_${a}_OPTIONAL_SPECS" |
| 48 |
+ fi |
| 49 |
+ |
| 50 |
+ for i in ${!specs_var} ${!optional_specs_var}; do |
| 51 |
+ cp --parents ${i} ${TMPDIR}/specs/ |
| 52 |
+ done |
| 53 |
done |
| 54 |
|
| 55 |
find ${KCONFIG_DIR} -type f -exec cp {} ${TMPDIR}/kconfig \; |
| 56 |
@@ -187,27 +199,41 @@ |
| 57 |
exit 1 |
| 58 |
fi |
| 59 |
|
| 60 |
-for i in ${SPECS}; do |
| 61 |
- LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log" |
| 62 |
- run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE} |
| 63 |
- if [ $? != 0 ]; then |
| 64 |
- send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}" |
| 65 |
- exit 1 |
| 66 |
- fi |
| 67 |
-done |
| 68 |
+for a in "" ${SETS}; do |
| 69 |
+ local specs_var |
| 70 |
+ local optional_specs_var |
| 71 |
|
| 72 |
-for i in ${OPTIONAL_SPECS}; do |
| 73 |
- LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log" |
| 74 |
- run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE} |
| 75 |
- if [ $? != 0 ]; then |
| 76 |
- send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}" |
| 77 |
- break |
| 78 |
+ if [ -z "${a}" ]; then |
| 79 |
+ specs_var="SPECS" |
| 80 |
+ optional_specs_var="OPTIONAL_SPECS" |
| 81 |
+ else |
| 82 |
+ specs_var="SET_${a}_SPECS" |
| 83 |
+ optional_specs_var="SET_${a}_OPTIONAL_SPECS" |
| 84 |
fi |
| 85 |
-done |
| 86 |
|
| 87 |
-for i in ${SPECS} ${OPTIONAL_SPECS}; do |
| 88 |
- LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log" |
| 89 |
- run_cmd "catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}" |
| 90 |
+ for i in ${!specs_var}; do |
| 91 |
+ LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log" |
| 92 |
+ run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE} |
| 93 |
+ if [ $? != 0 ]; then |
| 94 |
+ send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}" |
| 95 |
+ continue 2 |
| 96 |
+ fi |
| 97 |
+ done |
| 98 |
+ |
| 99 |
+ for i in ${!optional_specs_var}; do |
| 100 |
+ LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log" |
| 101 |
+ run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE} |
| 102 |
+ if [ $? != 0 ]; then |
| 103 |
+ send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}" |
| 104 |
+ break |
| 105 |
+ fi |
| 106 |
+ done |
| 107 |
+ |
| 108 |
+ for i in ${!specs_var} ${!optional_specs_var}; do |
| 109 |
+ LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log" |
| 110 |
+ run_cmd "catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}" |
| 111 |
+ done |
| 112 |
+ |
| 113 |
done |
| 114 |
|
| 115 |
if ! run_cmd "post_build" "${TMPDIR}/log/post_build.log"; then |
| 116 |
|
| 117 |
Modified: trunk/tools/catalyst-auto-amd64.conf |
| 118 |
=================================================================== |
| 119 |
--- trunk/tools/catalyst-auto-amd64.conf 2009-05-26 19:05:11 UTC (rev 651) |
| 120 |
+++ trunk/tools/catalyst-auto-amd64.conf 2009-06-27 19:09:30 UTC (rev 652) |
| 121 |
@@ -3,15 +3,15 @@ |
| 122 |
|
| 123 |
SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/amd64 |
| 124 |
|
| 125 |
-SPECS="stage1.spec stage2.spec stage3.spec" |
| 126 |
-#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec" |
| 127 |
-#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec" |
| 128 |
-#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec" |
| 129 |
+SETS="multilib hardened_multilib hardened_nomultilib" |
| 130 |
|
| 131 |
-OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 132 |
-OPTIONAL_SPECS="${OPTIONAL_SPECS} hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
| 133 |
-OPTIONAL_SPECS="${OPTIONAL_SPECS} hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" |
| 134 |
+SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" |
| 135 |
+SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 136 |
|
| 137 |
+SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
| 138 |
+ |
| 139 |
+SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" |
| 140 |
+ |
| 141 |
KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/amd64 |
| 142 |
|
| 143 |
EMAIL_TO=releng@g.o |
| 144 |
|
| 145 |
Modified: trunk/tools/catalyst-auto-x86.conf |
| 146 |
=================================================================== |
| 147 |
--- trunk/tools/catalyst-auto-x86.conf 2009-05-26 19:05:11 UTC (rev 651) |
| 148 |
+++ trunk/tools/catalyst-auto-x86.conf 2009-06-27 19:09:30 UTC (rev 652) |
| 149 |
@@ -3,14 +3,15 @@ |
| 150 |
|
| 151 |
SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/x86 |
| 152 |
|
| 153 |
-SPECS="stage1.spec stage2.spec stage3.spec i686/stage1.spec i686/stage2.spec i686/stage3.spec" |
| 154 |
-#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec" |
| 155 |
-#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec" |
| 156 |
-#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec" |
| 157 |
+SETS="i486 i686 hardened" |
| 158 |
|
| 159 |
-OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 160 |
-OPTIONAL_SPECS="${OPTIONAL_SPECS} hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
| 161 |
+SET_i486_SPECS="stage1.spec stage2.spec stage3.spec" |
| 162 |
+SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 163 |
|
| 164 |
+SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec" |
| 165 |
+ |
| 166 |
+SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
| 167 |
+ |
| 168 |
KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/x86 |
| 169 |
|
| 170 |
EMAIL_TO=releng@g.o |
Archives