chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add support for OPTIONAL_SPECS and purging

Browse source 
svn path=/trunk/; revision=591
This commit is contained in:
Andrew Gaffney 2008-11-29 02:15:02 +00:00
parent b35186ee73
commit feff7ba1fa
4 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/ChangeLog
View file

@ -2,6 +2,10 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Id$
29 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto,
catalyst-auto-amd64.conf, catalyst-auto-x86.conf:
Add support for OPTIONAL_SPECS and purging
05 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto:
Make sure we don't mangle the source_subpath on our stage1 spec

20
tools/catalyst-auto
View file

@ -132,7 +132,7 @@ fi
cd ${SPECS_DIR}
for i in ${SPECS}; do
for i in ${SPECS} ${OPTIONAL_SPECS}; do
cp --parents ${i} ${TMPDIR}/specs/
done
@ -175,17 +175,31 @@ for i in ${SPECS}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
if [ $? != 0 ]; then
send_email "Catalyst build error - ${i}" "" "${LOGFILE}"
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
exit 1
fi
done
for i in ${OPTIONAL_SPECS}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
if [ $? != 0 ]; then
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
break
fi
done
# We'll uncomment this section when there's a released version of catalyst with --purgeonly support
#for i in ${SPECS} ${OPTIONAL_SPECS}; do
# run_cmd "catalyst -P -c ${CATALYST_CONFIG} -f ${i}" /dev/null
#done
if ! run_cmd "post_build" "${TMPDIR}/log/post_build.log"; then
send_email "Catalyst build error - post_build" "Your post_build function sucks" "${TMPDIR}/log/post_build.log"
exit 1
fi
send_email "Catalyst build success" "Everything finished successfully."
send_email "Catalyst build success" "Build process complete."
if [ "${keep_tmpdir}" = 0 ]; then
if ! rm -rf "${TMPDIR}"; then

5
tools/catalyst-auto-amd64.conf
View file

@ -2,11 +2,14 @@
# self-explanatory.
SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/amd64
SPECS="stage1.spec stage2.spec stage3.spec"
SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/amd64
EMAIL_TO=releng@gentoo.org

5
tools/catalyst-auto-x86.conf
View file

@ -2,11 +2,14 @@
# self-explanatory.
SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/x86
SPECS="stage1.spec stage2.spec stage3.spec i686/stage2.spec i686/stage3.spec"
SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/x86
EMAIL_TO=releng@gentoo.org