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 10CE01384B4 for ; Sun, 27 Dec 2015 02:37:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFC22E07C9; Sun, 27 Dec 2015 02:37:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 04690E07D5 for ; Sun, 27 Dec 2015 02:37:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D3ADB340504 for ; Sun, 27 Dec 2015 02:37:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B877BCF0 for ; Sun, 27 Dec 2015 02:37: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: <1451183832.e7ded9f8dd423ecb57edf9cc25192cb46add05ec.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: 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: e7ded9f8dd423ecb57edf9cc25192cb46add05ec X-VCS-Branch: master Date: Sun, 27 Dec 2015 02:37: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: 23aa4fb1-565f-49e1-9e6b-db7b17075545 X-Archives-Hash: 01b9858927faf902df4c44ad1d93fa3f commit: e7ded9f8dd423ecb57edf9cc25192cb46add05ec Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Sun Dec 27 02:37:12 2015 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Sun Dec 27 02:37:12 2015 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e7ded9f8 Update catalyst-auto scripts for amd64 / x86 to add support for more targets and improve the detection / copy of stages. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> tools/catalyst-auto-amd64.conf | 47 ++++++++++++++++++++++++++++-------------- tools/catalyst-auto-x86.conf | 28 +++++++++++++++---------- 2 files changed, 48 insertions(+), 27 deletions(-) diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 92162fa..5a4ec54 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -10,19 +10,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 stage4-cloud.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_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-cloud.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 hardened/stage4-cloud.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_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.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" @@ -30,6 +39,8 @@ 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 '~' |\ @@ -48,7 +59,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 @@ -59,22 +70,26 @@ pre_build() { post_build() { pushd ${BUILD_SRCDIR_BASE}/default - if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then - mkdir -p ${BUILD_DESTDIR_BASE} - cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE} - if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE} + mkdir -p ${BUILD_DESTDIR_BASE} + for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do + if [ -f $file ]; then + cp $file* ${BUILD_DESTDIR_BASE} fi + done + if [ -f *${DATESTAMP}*.iso ]; then + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE} 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 -p ${BUILD_DESTDIR_BASE}/hardened - cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened - if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened + mkdir -p ${BUILD_DESTDIR_BASE}/hardened + for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do + if [ -f $file ]; then + cp $file* ${BUILD_DESTDIR_BASE}/hardened fi + done + if [ -f *${DATESTAMP}*.iso ]; then + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened fi } diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index 7bde015..9b60c81 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -20,6 +20,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 +40,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 @@ -49,22 +51,26 @@ pre_build() { post_build() { pushd ${BUILD_SRCDIR_BASE}/default - if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then - mkdir -p ${BUILD_DESTDIR_BASE} - cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE} - if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE} + mkdir -p ${BUILD_DESTDIR_BASE} + for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do + if [ -f $file ]; then + cp $file* ${BUILD_DESTDIR_BASE} fi + done + if [ -f *${DATESTAMP}*.iso ]; then + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE} fi popd pushd ${BUILD_SRCDIR_BASE}/hardened - if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then - mkdir -p ${BUILD_DESTDIR_BASE}/hardened - cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened - if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened + mkdir -p ${BUILD_DESTDIR_BASE}/hardened + for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do + if [ -f $file ]; then + cp $file* ${BUILD_DESTDIR_BASE}/hardened fi + done + if [ -f *${DATESTAMP}*.iso ]; then + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened fi }