From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E9AC2138AE9 for ; Wed, 27 Dec 2017 02:56:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C1F1E0BE6; Wed, 27 Dec 2017 02:56:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CFF26E0BE6 for ; Wed, 27 Dec 2017 02:56:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 022A233FE49 for ; Wed, 27 Dec 2017 02:56:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52692AEBD for ; Wed, 27 Dec 2017 02:56: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: <1514343279.93bc214182bfd5ca49494c83e068f53a5b22f276.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-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: 93bc214182bfd5ca49494c83e068f53a5b22f276 X-VCS-Branch: master Date: Wed, 27 Dec 2017 02:56: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: 67d6dfec-00e8-4680-8ae1-3303d6bf3465 X-Archives-Hash: d861200cb1d3f63b38cb159fe6fab40f commit: 93bc214182bfd5ca49494c83e068f53a5b22f276 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Wed Dec 27 02:54:39 2017 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Wed Dec 27 02:54:39 2017 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=93bc2141 Sync amd64 and x86 base and experimental scripts. Add a few missing popd calls to base scripts. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> tools/catalyst-auto-amd64-experimental.conf | 85 ++++++++++++++++++++--------- tools/catalyst-auto-amd64.conf | 1 + tools/catalyst-auto-x86-experimental.conf | 43 +++++++++++---- tools/catalyst-auto-x86.conf | 1 + 4 files changed, 92 insertions(+), 38 deletions(-) diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf index a3b9f023..535f4fb5 100644 --- a/tools/catalyst-auto-amd64-experimental.conf +++ b/tools/catalyst-auto-amd64-experimental.conf @@ -10,23 +10,27 @@ source /etc/catalyst/release/build.env SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} SETS=" - multilib - nomultilib + multilib minimal_multilib + nomultilib minimal_nomultilib x32 - hardened_multilib - hardened_nomultilib + hardened_multilib minimal_hardened_multilib + hardened_nomultilib minimal_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_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec" SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec" +SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.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_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec" SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" +SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.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" @@ -38,7 +42,7 @@ EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]" give_latest_from_dates() { sed 's,-20,~20,g' | \ - sort -k +1 -n -t '~' |\ + sort -k +1 -n -t '~' | \ awk -F\~ \ 'BEGIN{i=$1; o=$0}; { if($1 != i && i != "") { print o; }; i=$1; o=$0; } @@ -46,51 +50,80 @@ give_latest_from_dates() { tr '~' '-' } -pre_build() { - pushd ${REPO_DIR} >/dev/null - git pull - popd >/dev/null - +update_symlinks() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do pushd $d >/dev/null 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 + # 20yymmddThhmmssZ + # 20yymmddhhmmss + # 20yymmdd + # 20yy.n + of=$(perl -p \ + -e 's/20\d{6}T\d{6}Z/latest/g;' \ + -e 's/20\d{6}\d{6}/latest/g;' \ + -e 's/20\d{6}/latest/g;' \ + -e 's/20\d{2}\.\d{2}/latest/g;' \ + <<<"$f") + ln -svf "$f" "$of" done popd >/dev/null done } +pre_build() { + pushd ${REPO_DIR} >/dev/null + git pull + popd >/dev/null + update_symlinks +} + post_build() { + cmd=( + rsync + -e 'ssh -i /root/.ssh/id_rsa' + -a + --omit-dir-times + --delay-updates + ) + case $HOSTNAME in + nightheron) + DEST_DEFAULT=${BUILD_DESTDIR_BASE} + DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened + ;; + *) + DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE} + DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened + ;; + esac pushd ${BUILD_SRCDIR_BASE}/default >/dev/null - - mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} - for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do + mkdir -p ${TMPDIR}/empty + "${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT} + for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do if [ -f $file ]; then - cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + "${cmd[@]}" ${file}* ${DEST_DEFAULT} fi done if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP} + "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT} + elif [ -f *${TIMESTAMP}*.iso ]; then + "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT} fi popd >/dev/null pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null - - mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} - for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do + "${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED} + for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do if [ -f $file ]; then - cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + "${cmd[@]}" $file* ${DEST_HARDENED} fi done - if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDENED} + elif [ -f *${TIMESTAMP}*.iso ]; then + "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED} fi - - + popd >/dev/null } # vim:ft=sh: diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index c9bbdc1a..b92f8314 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -127,6 +127,7 @@ post_build() { elif [ -f *${TIMESTAMP}*.iso ]; then "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED} fi + popd >/dev/null } # vim:ft=sh: diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf index 79f310dd..4d6ccd30 100644 --- a/tools/catalyst-auto-x86-experimental.conf +++ b/tools/catalyst-auto-x86-experimental.conf @@ -55,32 +55,51 @@ pre_build() { } post_build() { + cmd=( + rsync + -e 'ssh -i /root/.ssh/id_rsa' + -a + --omit-dir-times + --delay-updates + ) + case $HOSTNAME in + nightheron) + DEST_DEFAULT=${BUILD_DESTDIR_BASE} + DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened + ;; + *) + DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE} + DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened + ;; + esac pushd ${BUILD_SRCDIR_BASE}/default >/dev/null - - mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} - for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do + mkdir -p ${TMPDIR}/empty + "${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT} + for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do if [ -f $file ]; then - cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + "${cmd[@]}" ${file}* ${DEST_DEFAULT} fi done - if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT} + elif [ -f *${TIMESTAMP}*.iso ]; then + "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT} fi popd >/dev/null pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null - - mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} - for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do + "${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED} + for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do if [ -f $file ]; then - cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + "${cmd[@]}" $file* ${DEST_HARDENED} fi done - if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDEND} + elif [ -f *${TIMESTAMP}*.iso ]; then + "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED} fi + popd >/dev/null } # vim:ft=sh: diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index 5398ba10..03d51642 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -99,6 +99,7 @@ post_build() { elif [ -f *${TIMESTAMP}*.iso ]; then "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED} fi + popd >/dev/null } # vim:ft=sh: