| 1 |
Author: agaffney |
| 2 |
Date: 2008-11-29 02:15:02 +0000 (Sat, 29 Nov 2008) |
| 3 |
New Revision: 591 |
| 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 support for OPTIONAL_SPECS and purging |
| 12 |
|
| 13 |
Modified: trunk/tools/ChangeLog |
| 14 |
=================================================================== |
| 15 |
--- trunk/tools/ChangeLog 2008-11-05 01:49:44 UTC (rev 590) |
| 16 |
+++ trunk/tools/ChangeLog 2008-11-29 02:15:02 UTC (rev 591) |
| 17 |
@@ -2,6 +2,10 @@ |
| 18 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 19 |
# $Id$ |
| 20 |
|
| 21 |
+ 29 Nov 2008; Andrew Gaffney <agaffney@g.o> catalyst-auto, |
| 22 |
+ catalyst-auto-amd64.conf, catalyst-auto-x86.conf: |
| 23 |
+ Add support for OPTIONAL_SPECS and purging |
| 24 |
+ |
| 25 |
05 Nov 2008; Andrew Gaffney <agaffney@g.o> catalyst-auto: |
| 26 |
Make sure we don't mangle the source_subpath on our stage1 spec |
| 27 |
|
| 28 |
|
| 29 |
Modified: trunk/tools/catalyst-auto |
| 30 |
=================================================================== |
| 31 |
--- trunk/tools/catalyst-auto 2008-11-05 01:49:44 UTC (rev 590) |
| 32 |
+++ trunk/tools/catalyst-auto 2008-11-29 02:15:02 UTC (rev 591) |
| 33 |
@@ -132,7 +132,7 @@ |
| 34 |
|
| 35 |
cd ${SPECS_DIR} |
| 36 |
|
| 37 |
-for i in ${SPECS}; do |
| 38 |
+for i in ${SPECS} ${OPTIONAL_SPECS}; do |
| 39 |
cp --parents ${i} ${TMPDIR}/specs/ |
| 40 |
done |
| 41 |
|
| 42 |
@@ -175,17 +175,31 @@ |
| 43 |
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log" |
| 44 |
run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE} |
| 45 |
if [ $? != 0 ]; then |
| 46 |
- send_email "Catalyst build error - ${i}" "" "${LOGFILE}" |
| 47 |
+ send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}" |
| 48 |
exit 1 |
| 49 |
fi |
| 50 |
done |
| 51 |
|
| 52 |
+for i in ${OPTIONAL_SPECS}; do |
| 53 |
+ LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log" |
| 54 |
+ run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE} |
| 55 |
+ if [ $? != 0 ]; then |
| 56 |
+ send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}" |
| 57 |
+ break |
| 58 |
+ fi |
| 59 |
+done |
| 60 |
+ |
| 61 |
+# We'll uncomment this section when there's a released version of catalyst with --purgeonly support |
| 62 |
+#for i in ${SPECS} ${OPTIONAL_SPECS}; do |
| 63 |
+# run_cmd "catalyst -P -c ${CATALYST_CONFIG} -f ${i}" /dev/null |
| 64 |
+#done |
| 65 |
+ |
| 66 |
if ! run_cmd "post_build" "${TMPDIR}/log/post_build.log"; then |
| 67 |
send_email "Catalyst build error - post_build" "Your post_build function sucks" "${TMPDIR}/log/post_build.log" |
| 68 |
exit 1 |
| 69 |
fi |
| 70 |
|
| 71 |
-send_email "Catalyst build success" "Everything finished successfully." |
| 72 |
+send_email "Catalyst build success" "Build process complete." |
| 73 |
|
| 74 |
if [ "${keep_tmpdir}" = 0 ]; then |
| 75 |
if ! rm -rf "${TMPDIR}"; then |
| 76 |
|
| 77 |
Modified: trunk/tools/catalyst-auto-amd64.conf |
| 78 |
=================================================================== |
| 79 |
--- trunk/tools/catalyst-auto-amd64.conf 2008-11-05 01:49:44 UTC (rev 590) |
| 80 |
+++ trunk/tools/catalyst-auto-amd64.conf 2008-11-29 02:15:02 UTC (rev 591) |
| 81 |
@@ -2,11 +2,14 @@ |
| 82 |
# self-explanatory. |
| 83 |
|
| 84 |
SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/amd64 |
| 85 |
+ |
| 86 |
SPECS="stage1.spec stage2.spec stage3.spec" |
| 87 |
-SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec" |
| 88 |
+#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec" |
| 89 |
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec" |
| 90 |
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec" |
| 91 |
|
| 92 |
+OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 93 |
+ |
| 94 |
KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/amd64 |
| 95 |
|
| 96 |
EMAIL_TO=releng@g.o |
| 97 |
|
| 98 |
Modified: trunk/tools/catalyst-auto-x86.conf |
| 99 |
=================================================================== |
| 100 |
--- trunk/tools/catalyst-auto-x86.conf 2008-11-05 01:49:44 UTC (rev 590) |
| 101 |
+++ trunk/tools/catalyst-auto-x86.conf 2008-11-29 02:15:02 UTC (rev 591) |
| 102 |
@@ -2,11 +2,14 @@ |
| 103 |
# self-explanatory. |
| 104 |
|
| 105 |
SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/x86 |
| 106 |
+ |
| 107 |
SPECS="stage1.spec stage2.spec stage3.spec i686/stage2.spec i686/stage3.spec" |
| 108 |
-SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec" |
| 109 |
+#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec" |
| 110 |
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec" |
| 111 |
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec" |
| 112 |
|
| 113 |
+OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 114 |
+ |
| 115 |
KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/x86 |
| 116 |
|
| 117 |
EMAIL_TO=releng@g.o |
Archives