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

Add concept of build sets to catalyst-auto

Browse source 
svn path=/trunk/; revision=652
This commit is contained in:
Andrew Gaffney 2009-06-27 19:09:30 +00:00
parent aeebc831e3
commit bb10ef43bb
4 changed files with 64 additions and 33 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-2009 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Id$ # $Id$
27 Jun 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto,
catalyst-auto-amd64.conf, catalyst-auto-x86.conf:
Add concept of build sets to catalyst-auto
14 May 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto: 14 May 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto:
run find specifically in KCONFIG_DIR run find specifically in KCONFIG_DIR

40
tools/catalyst-auto
View file

@ -138,8 +138,20 @@ fi
cd ${SPECS_DIR} cd ${SPECS_DIR}
for i in ${SPECS} ${OPTIONAL_SPECS}; do for a in "" ${SETS}; do
local specs_var, optional_specs_var;
if [ -z "${a}" ]; then
specs_var="SPECS"
optional_specs_var="OPTIONAL_SPECS"
else
specs_var="SET_${a}_SPECS"
optional_specs_var="SET_${a}_OPTIONAL_SPECS"
fi
for i in ${!specs_var} ${!optional_specs_var}; do
cp --parents ${i} ${TMPDIR}/specs/ cp --parents ${i} ${TMPDIR}/specs/
done
done done
find ${KCONFIG_DIR} -type f -exec cp {} ${TMPDIR}/kconfig \; find ${KCONFIG_DIR} -type f -exec cp {} ${TMPDIR}/kconfig \;
@ -187,27 +199,41 @@ if ! run_cmd "catalyst -c ${CATALYST_CONFIG} -s ${DATESTAMP}" "${TMPDIR}/log/sna
exit 1 exit 1
fi fi
for i in ${SPECS}; do for a in "" ${SETS}; do
local specs_var
local optional_specs_var
if [ -z "${a}" ]; then
specs_var="SPECS"
optional_specs_var="OPTIONAL_SPECS"
else
specs_var="SET_${a}_SPECS"
optional_specs_var="SET_${a}_OPTIONAL_SPECS"
fi
for i in ${!specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log" LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE} run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
if [ $? != 0 ]; then if [ $? != 0 ]; then
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}" send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
exit 1 continue 2
fi fi
done done
for i in ${OPTIONAL_SPECS}; do for i in ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log" LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE} run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
if [ $? != 0 ]; then if [ $? != 0 ]; then
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}" send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
break break
fi fi
done done
for i in ${SPECS} ${OPTIONAL_SPECS}; do for i in ${!specs_var} ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log" LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log"
run_cmd "catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}" run_cmd "catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
done
done done
if ! run_cmd "post_build" "${TMPDIR}/log/post_build.log"; then if ! run_cmd "post_build" "${TMPDIR}/log/post_build.log"; then

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

@ -3,14 +3,14 @@
SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/amd64 SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/amd64
SPECS="stage1.spec stage2.spec stage3.spec" SETS="multilib hardened_multilib hardened_nomultilib"
#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" SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/amd64 KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/amd64

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

@ -3,13 +3,14 @@
SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/x86 SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/x86
SPECS="stage1.spec stage2.spec stage3.spec i686/stage1.spec i686/stage2.spec i686/stage3.spec" SETS="i486 i686 hardened"
#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" SET_i486_SPECS="stage1.spec stage2.spec stage3.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/x86 KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/x86