From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RwkTp-0005bG-0L for garchives@archives.gentoo.org; Mon, 13 Feb 2012 01:13:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2A34E08F8; Mon, 13 Feb 2012 01:13:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 99E12E08F8 for ; Mon, 13 Feb 2012 01:13:10 +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 D07DA1B4007 for ; Mon, 13 Feb 2012 01:13:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B8C95E5400 for ; Mon, 13 Feb 2012 01:13:07 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: 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: e38dced51fc45730d8ae00635b9a45ad0d9a2c42 Date: Mon, 13 Feb 2012 01:13:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c8e7063c-a938-4210-a1b4-c97691d4a8cf X-Archives-Hash: 54d646b93a7704bc04d802c524338212 commit: e38dced51fc45730d8ae00635b9a45ad0d9a2c42 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Mon Feb 13 01:10:01 2012 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Mon Feb 13 01:10:01 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/releng.git;a=3D= commit;h=3De38dced5 Update catalyst tools to use git for amd64 and x86. --- tools/catalyst-auto | 2 +- tools/catalyst-auto-amd64.conf | 10 ++++++---- tools/catalyst-auto-x86.conf | 10 ++++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tools/catalyst-auto b/tools/catalyst-auto index 4da3f42..f49df56 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -57,7 +57,7 @@ run_cmd() { pre_build() { # This is a skeleton function that you can override from the config fi= le. # 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=3Dbar } =20 diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.c= onf index 3c2ed6f..76e9405 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -2,10 +2,10 @@ # self-explanatory. =20 BASE_DIR=3D"/release" -SVN_DIR=3D"${BASE_DIR}/svn-releng" +REPO_DIR=3D"${BASE_DIR}/releng" ARCH=3D"amd64" =20 -SPECS_DIR=3D${SVN_DIR}/trunk/releases/weekly/specs/${ARCH} +SPECS_DIR=3D${REPO_DIR}/releases/weekly/specs/${ARCH} =20 SETS=3D"multilib hardened_multilib hardened_nomultilib" =20 @@ -16,7 +16,7 @@ SET_hardened_multilib_SPECS=3D"hardened/stage1.spec har= dened/stage2.spec hardened/ =20 SET_hardened_nomultilib_SPECS=3D"hardened/stage1-nomultilib.spec hardene= d/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" =20 -KCONFIG_DIR=3D${SVN_DIR}/trunk/releases/weekly/kconfig/${ARCH} +KCONFIG_DIR=3D${REPO_DIR}/releases/weekly/kconfig/${ARCH} =20 EMAIL_TO=3Dreleng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org EMAIL_FROM=3Dcatalyst@poseidon.amd64.dev.gentoo.org @@ -38,7 +38,9 @@ give_latest_from_dates() { } =20 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 diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index 5166e3e..e7f48be 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -2,10 +2,10 @@ # self-explanatory. =20 BASE_DIR=3D"/release" -SVN_DIR=3D"${BASE_DIR}/svn-releng" +REPO_DIR=3D"${BASE_DIR}/releng" ARCH=3D"x86" =20 -SPECS_DIR=3D${SVN_DIR}/trunk/releases/weekly/specs/${ARCH} +SPECS_DIR=3D${REPO_DIR}/releases/weekly/specs/${ARCH} =20 SETS=3D"i486 i686 hardened" =20 @@ -16,7 +16,7 @@ SET_i686_SPECS=3D"i686/stage1.spec i686/stage2.spec i68= 6/stage3.spec" =20 SET_hardened_SPECS=3D"hardened/stage1.spec hardened/stage2.spec hardened= /stage3.spec" =20 -KCONFIG_DIR=3D${SVN_DIR}/trunk/releases/weekly/kconfig/${ARCH} +KCONFIG_DIR=3D${REPO_DIR}/releases/weekly/kconfig/${ARCH} =20 EMAIL_TO=3Dreleng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org EMAIL_FROM=3Dcatalyst@poseidon.amd64.dev.gentoo.org @@ -38,7 +38,9 @@ give_latest_from_dates() { } =20 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