Update catalyst tools to use git for amd64 and x86.

This commit is contained in:
Jorge Manuel B. S. Vicetto (jmbsvicetto) 2012-02-13 00:10:01 -01:00
parent f061c9fb36
commit e38dced51f
3 changed files with 13 additions and 9 deletions

View file

@ -57,7 +57,7 @@ run_cmd() {
pre_build() {
# This is a skeleton function that you can override from the config file.
# It will be executed before the build is started. You can use this to
# update a svn checkout of spec files
# update the checkout of the releng repo
local foo=bar
}

View file

@ -2,10 +2,10 @@
# self-explanatory.
BASE_DIR="/release"
SVN_DIR="${BASE_DIR}/svn-releng"
REPO_DIR="${BASE_DIR}/releng"
ARCH="amd64"
SPECS_DIR=${SVN_DIR}/trunk/releases/weekly/specs/${ARCH}
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
SETS="multilib hardened_multilib hardened_nomultilib"
@ -16,7 +16,7 @@ SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
KCONFIG_DIR=${SVN_DIR}/trunk/releases/weekly/kconfig/${ARCH}
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org
@ -38,7 +38,9 @@ give_latest_from_dates() {
}
pre_build() {
svn up ${SVN_DIR}
pushd ${REPO_DIR}
git pull
popd
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
cd $d

View file

@ -2,10 +2,10 @@
# self-explanatory.
BASE_DIR="/release"
SVN_DIR="${BASE_DIR}/svn-releng"
REPO_DIR="${BASE_DIR}/releng"
ARCH="x86"
SPECS_DIR=${SVN_DIR}/trunk/releases/weekly/specs/${ARCH}
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
SETS="i486 i686 hardened"
@ -16,7 +16,7 @@ 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=${SVN_DIR}/trunk/releases/weekly/kconfig/${ARCH}
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org
@ -38,7 +38,9 @@ give_latest_from_dates() {
}
pre_build() {
svn up ${SVN_DIR}
pushd ${REPO_DIR}
git pull
popd
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
cd $d