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 008071381F3 for ; Fri, 16 Aug 2013 01:27:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 987EEE0C71; Fri, 16 Aug 2013 01:27:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 170EBE0C71 for ; Fri, 16 Aug 2013 01:27:12 +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 BFCAD33EB13 for ; Fri, 16 Aug 2013 01:27:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 24DE9E468F for ; Fri, 16 Aug 2013 01:27:08 +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: <1376616183.6dcdad447a4df276d4f93a71473283adb822f8e2.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-alpha.conf tools/catalyst-auto-amd64-experimental.conf tools/catalyst-auto-amd64.conf tools/catalyst-auto-hppa.conf tools/catalyst-auto-ia64.conf tools/catalyst-auto-ppc.conf tools/catalyst-auto-ppc64.conf tools/catalyst-auto-sparc64.conf tools/catalyst-auto-x86-experimental.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: 6dcdad447a4df276d4f93a71473283adb822f8e2 X-VCS-Branch: master Date: Fri, 16 Aug 2013 01:27:08 +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: 5939ba39-4b5c-4ae3-ab75-7ea5055c7c4b X-Archives-Hash: a7389444340e2d6e880a5bb8d263e602 commit: 6dcdad447a4df276d4f93a71473283adb822f8e2 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Fri Aug 16 01:23:03 2013 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Fri Aug 16 01:23:03 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=6dcdad44 Fix the circular latest symlinks by taking them out of the list of stages. Sync amd64/x86 experimental script with base amd64/x86 script. --- tools/catalyst-auto-alpha.conf | 2 +- tools/catalyst-auto-amd64-experimental.conf | 7 ++++++- tools/catalyst-auto-amd64.conf | 2 +- tools/catalyst-auto-hppa.conf | 2 +- tools/catalyst-auto-ia64.conf | 2 +- tools/catalyst-auto-ppc.conf | 2 +- tools/catalyst-auto-ppc64.conf | 2 +- tools/catalyst-auto-sparc64.conf | 2 +- tools/catalyst-auto-x86-experimental.conf | 2 +- tools/catalyst-auto-x86.conf | 2 +- 10 files changed, 15 insertions(+), 10 deletions(-) diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf index b87fda8..8910913 100644 --- a/tools/catalyst-auto-alpha.conf +++ b/tools/catalyst-auto-alpha.conf @@ -41,7 +41,7 @@ pre_build() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/builds/default ; do pushd $d - for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do + for f in $(ls stage3*bz2 | 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 $ ln -sf $f $of diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf index 92f9c71..3f2bd16 100644 --- a/tools/catalyst-auto-amd64-experimental.conf +++ b/tools/catalyst-auto-amd64-experimental.conf @@ -9,6 +9,7 @@ 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" SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" @@ -21,6 +22,10 @@ SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/ 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" +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" +SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec" + KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH} give_latest_from_dates() { @@ -41,7 +46,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' | give_latest_from_dates ) ; do + for f in $(ls stage3*bz2 | 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 2331e05..8d1a079 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -46,7 +46,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 | give_latest_from_dates ) ; do + for f in $(ls stage3*bz2 | 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-hppa.conf b/tools/catalyst-auto-hppa.conf index 25199cb..8249913 100644 --- a/tools/catalyst-auto-hppa.conf +++ b/tools/catalyst-auto-hppa.conf @@ -40,7 +40,7 @@ pre_build() { for d in ${BUILD_SRCDIR_BASE}/builds/default ; do pushd $d for t in hppa1.1 hppa2.0; do - for f in $(ls stage3-${t}-*bz2 | give_latest_from_dates ) ; do + for f in $(ls stage3-${t}-*bz2 | 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 $ ln -sf $f $of diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf index 7f9352a..b9d4081 100644 --- a/tools/catalyst-auto-ia64.conf +++ b/tools/catalyst-auto-ia64.conf @@ -40,7 +40,7 @@ pre_build() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do pushd $d - for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do + for f in $(ls stage3*bz2 | 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 $ ln -sf $f $of diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf index 8ee9c35..a0c2d0c 100644 --- a/tools/catalyst-auto-ppc.conf +++ b/tools/catalyst-auto-ppc.conf @@ -39,7 +39,7 @@ pre_build() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/builds/default ; do pushd $d - for f in $(ls stage3-ppc-*bz2 | give_latest_from_dates ) ; do + for f in $(ls stage3-ppc-*bz2 | 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 $ ln -sf $f $of diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf index 73cdf6e..ff742a5 100644 --- a/tools/catalyst-auto-ppc64.conf +++ b/tools/catalyst-auto-ppc64.conf @@ -42,7 +42,7 @@ pre_build() { for d in ${BUILD_SRCDIR_BASE}/builds/default ; do pushd $d for t in ppc64-64ul ppc64-32ul; do - for f in $(ls stage3-${t}-*bz2 | give_latest_from_dates ) ; do + for f in $(ls stage3-${t}-*bz2 | 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 $ ln -sf $f $of diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf index dc11418..10124aa 100644 --- a/tools/catalyst-auto-sparc64.conf +++ b/tools/catalyst-auto-sparc64.conf @@ -40,7 +40,7 @@ pre_build() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do pushd $d - for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do + for f in $(ls stage3*bz2 | 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 $ ln -sf $f $of diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf index 38daa0e..ece0e5a 100644 --- a/tools/catalyst-auto-x86-experimental.conf +++ b/tools/catalyst-auto-x86-experimental.conf @@ -38,7 +38,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' | give_latest_from_dates ) ; do + for f in $(ls stage3*bz2 | 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-x86.conf b/tools/catalyst-auto-x86.conf index 862cc1d..7bde015 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -38,7 +38,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 | give_latest_from_dates ) ; do + for f in $(ls stage3*bz2 | 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