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 6FDD1138206 for ; Tue, 26 Apr 2016 22:35:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7056FE0848; Tue, 26 Apr 2016 22:35:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E156E0848 for ; Tue, 26 Apr 2016 22:35:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 81355340988 for ; Tue, 26 Apr 2016 22:35:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3653F968 for ; Tue, 26 Apr 2016 22:35:46 +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: <1461710119.11c84ac57d237be3aeccc69fe0d9d92b655618ce.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-amd64.conf tools/catalyst-auto-ia64.conf tools/catalyst-auto-s390.conf tools/catalyst-auto-s390x.conf tools/catalyst-auto-sparc64.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: 11c84ac57d237be3aeccc69fe0d9d92b655618ce X-VCS-Branch: master Date: Tue, 26 Apr 2016 22:35:46 +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: 10890895-f621-4463-9123-49de26ded51c X-Archives-Hash: ec419d0dd8ff64a46e04467fa435d93e commit: 11c84ac57d237be3aeccc69fe0d9d92b655618ce Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Tue Apr 26 22:35:19 2016 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Tue Apr 26 22:35:19 2016 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=11c84ac5 Whitespace. Stop hardcoding the bz2 extension and sync updates to the scripts to the experimental scripts. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> tools/catalyst-auto-amd64-experimental.conf | 22 +++++++++++++++++----- tools/catalyst-auto-amd64.conf | 4 ++-- tools/catalyst-auto-ia64.conf | 1 - tools/catalyst-auto-s390.conf | 1 - tools/catalyst-auto-s390x.conf | 1 - tools/catalyst-auto-sparc64.conf | 2 -- tools/catalyst-auto-x86-experimental.conf | 11 +++++++++-- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf index 3f2bd16..817c953 100644 --- a/tools/catalyst-auto-amd64-experimental.conf +++ b/tools/catalyst-auto-amd64-experimental.conf @@ -9,18 +9,28 @@ source /etc/catalyst/release/build.env SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} -#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux" -SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib" +SETS=" + multilib cloud_multilib + nomultilib cloud_nomultilib + x32 + hardened_multilib cloud_hardened_multilib + hardened_nomultilib cloud_hardened_nomultilib + hardened_multilib_selinux hardened_nomultilib_selinux +" SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" +SET_cloud_multilib_SPECS="stage4-cloud.spec" SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec" +SET_cloud_nomultilib_SPECS="stage4-nomultilib-cloud.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_cloud_hardened_multilib_SPECS="hardened/stage4-cloud.spec" SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" +SET_cloud_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec" SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec" SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec" @@ -28,12 +38,14 @@ SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec h KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH} +EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]" + 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; } + 'BEGIN{i=$1; o=$0}; + { if($1 != i && i != "") { print o; }; i=$1; o=$0; } END { print o; };' | \ tr '~' '-' } @@ -46,7 +58,7 @@ pre_build() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do pushd $d - for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do + for f in $(ls stage3*${EXTENSIONS} | grep -v latest | 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 diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 279ddfd..48dd9cf 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -53,8 +53,8 @@ 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; } + 'BEGIN{i=$1; o=$0}; + { if($1 != i && i != "") { print o; }; i=$1; o=$0; } END { print o; };' | \ tr '~' '-' } diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf index 20c8820..8d7e3e5 100644 --- a/tools/catalyst-auto-ia64.conf +++ b/tools/catalyst-auto-ia64.conf @@ -12,7 +12,6 @@ OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/ia64 - give_latest_from_dates() { sed 's,-20,~20,g' | \ sort -k +1 -n -t '~' |\ diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf index 7e37997..f87fb03 100644 --- a/tools/catalyst-auto-s390.conf +++ b/tools/catalyst-auto-s390.conf @@ -12,7 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec" KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390 - give_latest_from_dates() { sed 's,-20,~20,g' | \ sort -k +1 -n -t '~' |\ diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf index 39047e7..24a1384 100644 --- a/tools/catalyst-auto-s390x.conf +++ b/tools/catalyst-auto-s390x.conf @@ -12,7 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec" KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390 - give_latest_from_dates() { sed 's,-20,~20,g' | \ sort -k +1 -n -t '~' |\ diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf index 72ade0a..2f1834a 100644 --- a/tools/catalyst-auto-sparc64.conf +++ b/tools/catalyst-auto-sparc64.conf @@ -12,8 +12,6 @@ SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec multilib/stage3.sp KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc -EMAIL_SUBJECT_PREPEND="[sparc64-auto]" - give_latest_from_dates() { sed 's,-20,~20,g' | \ sort -k +1 -n -t '~' |\ diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf index ece0e5a..379adc0 100644 --- a/tools/catalyst-auto-x86-experimental.conf +++ b/tools/catalyst-auto-x86-experimental.conf @@ -9,10 +9,15 @@ source /etc/catalyst/release/build.env SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} -SETS="i486 i686 hardened" +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" @@ -20,6 +25,8 @@ SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH} +EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]" + give_latest_from_dates() { sed 's,-20,~20,g' | \ sort -k +1 -n -t '~' |\ @@ -38,7 +45,7 @@ pre_build() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do pushd $d - for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do + for f in $(ls stage3*${EXTENSIONS} | grep -v latest | 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