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 8487A138010 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 DC0EEE0552; Sat, 13 Oct 2012 04:19:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4B3D3E0552 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 541B133D9ED for ; Sat, 13 Oct 2012 04:19:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EAA02E543E 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: <1350101774.ccfa82019425ca5e707aae05ba50d0894e1fcbe7.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-amd64-experimental.conf tools/catalyst-auto-x86-experimental.conf X-VCS-Directories: tools/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: ccfa82019425ca5e707aae05ba50d0894e1fcbe7 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: 7dabfadf-e6df-4e9c-b1a7-2ec147ae8338 X-Archives-Hash: a08244ca1b1ed80ad67c1b2a1c66b6fb commit: ccfa82019425ca5e707aae05ba50d0894e1fcbe7 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Sat Oct 13 04:16:14 2012 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Sat Oct 13 04:16:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=ccfa8201 Add experimental conf files for amd64/x86. --- tools/catalyst-auto-amd64-experimental.conf | 74 +++++++++++++++++++++++++++ tools/catalyst-auto-x86-experimental.conf | 71 +++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 0 deletions(-) diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf new file mode 100644 index 0000000..90c6aab --- /dev/null +++ b/tools/catalyst-auto-amd64-experimental.conf @@ -0,0 +1,74 @@ +# This is the config file for the catalyst-auto script. It should be pretty +# self-explanatory. + +ARCH="amd64" +TYPE="experimental" +host=$(hostname) + +source /etc/catalyst/release/build.env + +SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} + +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} + +give_latest_from_dates() { + sed 's,-20,~20,g' | \ + sort -k +1 -n -t '~' |\ + awk -F\~ \ + 'BEGIN{i=$1; o=$0}; + { if($1 != i && i != "") { print o; }; i=$1; o=$0; } + END { print o; };' | \ + tr '~' '-' +} + +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 + for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do + of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff + of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff + ln -sf $f $of + done + popd + done +} + +post_build() { + pushd ${BUILD_SRCDIR_BASE}/default + if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then + mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + if [ -f *${DATESTAMP}*.iso ]; then + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + fi + fi + popd + + pushd ${BUILD_SRCDIR_BASE}/hardened + if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then + mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + if [ -f *${DATESTAMP}*.iso ]; then + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + fi + fi +} + +# vim:ft=sh: diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf new file mode 100644 index 0000000..002b85c --- /dev/null +++ b/tools/catalyst-auto-x86-experimental.conf @@ -0,0 +1,71 @@ +# This is the config file for the catalyst-auto script. It should be pretty +# self-explanatory. + +ARCH="x86" +TYPE="experimental" +host=$(hostname) + +source /etc/catalyst/release/build.env + +SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} + +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} + +give_latest_from_dates() { + sed 's,-20,~20,g' | \ + sort -k +1 -n -t '~' |\ + awk -F\~ \ + 'BEGIN{i=$1; o=$0}; + { if($1 != i && i != "") { print o; }; i=$1; o=$0; } + END { print o; };' | \ + tr '~' '-' +} + +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 + for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do + of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff + of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff + ln -sf $f $of + done + popd + done +} + +post_build() { + pushd ${BUILD_SRCDIR_BASE}/default + if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then + mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + if [ -f *${DATESTAMP}*.iso* ]; then + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + fi + fi + popd + + pushd ${BUILD_SRCDIR_BASE}/hardened + if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then + mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + if [ -f *${DATESTAMP}*.iso ]; then + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + fi + fi +} + +# vim:ft=sh: