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 25D981382C5 for ; Wed, 6 Jan 2021 15:49:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CDC6E092E; Wed, 6 Jan 2021 15:49:27 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1667BE092E for ; Wed, 6 Jan 2021 15:49:26 +0000 (UTC) Received: (nullmailer pid 1637 invoked by uid 1000); Wed, 06 Jan 2021 15:46:16 -0000 From: "Andreas K. Huettel" To: gentoo-catalyst@lists.gentoo.org Cc: "Andreas K. Huettel" Subject: [gentoo-catalyst] [PATCH] Add catalyst-auto option --nonetwork Date: Wed, 6 Jan 2021 17:46:02 +0200 Message-Id: <20210106154602.1556-1-dilfridge@gentoo.org> X-Mailer: git-send-email 2.26.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 997b3491-8935-46ac-bb8d-01f3ded7179f X-Archives-Hash: b67812acc2222748ea56925345987d16 Signed-off-by: Andreas K. Huettel --- tools/catalyst-auto | 16 +++++++++++++++- tools/catalyst-auto-riscv.conf | 15 ++++----------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/tools/catalyst-auto b/tools/catalyst-auto index d71ad5a2..203abe81 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -24,6 +24,7 @@ preclean=0 lastrun=0 lock_file= parallel_sets=1 +nonetwork=0 usage() { local msg=$1 @@ -45,12 +46,16 @@ Options: -t|--test Stop after mangling specs and copying files --interval Exit if last successful run was less than ago -l|--lock File to grab a lock on to prevent multiple invocations + -X|--nonetwork Do not perform network operations (like uploading result) + This needs to be supported by the config file as well. -h|--help Show this message and quit EOH } send_email() { + if [[ ${nonetwork} == 0 ]]; then + local subject="${EMAIL_SUBJECT_PREPEND} $1" local message=$2 local logfile=$3 @@ -65,6 +70,8 @@ send_email() { printf 'From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n%b' \ "${EMAIL_FROM}" "${EMAIL_TO}" "${subject}" "${body}" | \ /usr/sbin/sendmail -f "${EMAIL_FROM}" ${EMAIL_TO//,/ } + + fi } # Usage: run_cmd @@ -151,6 +158,9 @@ parse_args() { -C|--preclean) preclean=1 ;; + -X|--nonetwork) + nonetwork=1 + ;; --interval) lastrun=$1 shift @@ -215,7 +225,7 @@ containerize() { # the script whenever there's an update. git_update() { # If we've already relaunched, nothing to do. - if [[ ${GIT_UPDATE} == "true" ]] ; then + if [[ ${GIT_UPDATE} == "true" || ${nonetwork} == 1 ]] ; then return fi @@ -240,6 +250,8 @@ git_update() { # SSH fingerprint from DNS. To do this securely, we need to ensure DNSSEC is # working. verify_dnssec() { + if [[ ${nonetwork} == 0 ]]; then + which dig >/dev/null || { echo "net-dns/bind-tools is needed to verify DNSSEC is working" exit 1 @@ -254,6 +266,8 @@ verify_dnssec() { echo "DNSSEC is not enabled in /etc/resolv.conf" exit 1 fi + + fi } run_catalyst_commands() { diff --git a/tools/catalyst-auto-riscv.conf b/tools/catalyst-auto-riscv.conf index 4a5d40b5..6a7e8657 100644 --- a/tools/catalyst-auto-riscv.conf +++ b/tools/catalyst-auto-riscv.conf @@ -24,15 +24,6 @@ SET_ilp32_SPECS="stage1-ilp32.spec stage2-ilp32.spec stage3-ilp32.spec" #KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH} -send_email() { - : -} - -# no upload -> no dnssec needed -verify_dnssec() { - : -} - update_symlinks() { # Symlink the latest stages3 to build from local d f @@ -47,8 +38,10 @@ update_symlinks() { } upload() { - echo NOT Uploading "$@" -# rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" alpha@releng-incoming.gentoo.org: + if [[ ${nonetwork} == 0 ]]; then + echo Uploading "$@" + rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" riscv@releng-incoming.gentoo.org: + fi } post_build() { -- 2.26.2