From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 94FDE1381F4 for ; Sat, 13 Oct 2012 04:19:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CCC0E055B; Sat, 13 Oct 2012 04:19:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F0A63E055B for ; Sat, 13 Oct 2012 04:19:37 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35C0A33DA0E for ; Sat, 13 Oct 2012 04:19:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BBF23E5436 for ; Sat, 13 Oct 2012 04:19:34 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <1350101196.f42a40df9abfbb3b0b8ff9bc1f5c112d1c7bf27d.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto tools/catalyst-auto-amd64.conf tools/catalyst-auto-x86.conf X-VCS-Directories: tools/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: f42a40df9abfbb3b0b8ff9bc1f5c112d1c7bf27d X-VCS-Branch: master Date: Sat, 13 Oct 2012 04:19:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3756f2e8-a79e-46a6-9a00-35bbba2457a5 X-Archives-Hash: da8343599a8cd7b8d7642c919fc94364 commit: f42a40df9abfbb3b0b8ff9bc1f5c112d1c7bf27d Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Sat Oct 13 04:06:36 2012 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Sat Oct 13 04:06:36 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=f42a40df Move hardcoded paths out of the script files. --- tools/catalyst-auto | 2 +- tools/catalyst-auto-amd64.conf | 19 +++++++------------ tools/catalyst-auto-x86.conf | 19 ++++++------------- 3 files changed, 14 insertions(+), 26 deletions(-) diff --git a/tools/catalyst-auto b/tools/catalyst-auto index 9503cb7..9e89d39 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -108,7 +108,7 @@ fi source ${config_file} -TMPDIR=/release/tmp/catalyst-auto.${PID} +TMPDIR=${TMP_PATH}/catalyst-auto.${PID} DATESTAMP=$(date +%Y%m%d) if [ ${verbose} = 1 ]; then diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 96f8ce8..47777a3 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -1,9 +1,11 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -BASE_DIR="/release" -REPO_DIR="${BASE_DIR}/releng" ARCH="amd64" +TYPE="auto" +host=$(hostname) + +source /etc/catalyst/release/build.env SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} @@ -12,22 +14,15 @@ SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib" SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec" + SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" +SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH} -EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org -EMAIL_FROM=catalyst@skimmer.gentoo.org -EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]" - -CATALYST_CONFIG=/etc/catalyst/release/${ARCH}-auto.conf - -BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/ -BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/ - give_latest_from_dates() { sed 's,-20,~20,g' | \ sort -k +1 -n -t '~' |\ @@ -41,8 +36,8 @@ give_latest_from_dates() { pre_build() { pushd ${REPO_DIR} git pull - popd + # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do pushd $d diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index 4ab5038..8acc833 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -1,9 +1,11 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -BASE_DIR="/release" -REPO_DIR="${BASE_DIR}/releng" ARCH="x86" +TYPE="auto" +host=$(hostname) + +source /etc/catalyst/release/build.env SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} @@ -11,22 +13,13 @@ SETS="i486 i686 hardened" SET_i486_SPECS="stage1.spec stage2.spec 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" +SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH} -EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org -EMAIL_FROM=catalyst@skimmer.gentoo.org -EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]" - -CATALYST_CONFIG=/etc/catalyst/release/${ARCH}-auto.conf - -BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/ -BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/ - give_latest_from_dates() { sed 's,-20,~20,g' | \ sort -k +1 -n -t '~' |\ @@ -40,8 +33,8 @@ give_latest_from_dates() { pre_build() { pushd ${REPO_DIR} git pull - popd + # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do pushd $d