From patchwork Mon Dec 19 12:53:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wookey X-Patchwork-Id: 5872 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id BC0F623E04 for ; Mon, 19 Dec 2011 12:53:51 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id B2524A183F1 for ; Mon, 19 Dec 2011 12:53:51 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id c11so1864142eaa.11 for ; Mon, 19 Dec 2011 04:53:51 -0800 (PST) Received: by 10.204.154.7 with SMTP id m7mr1372442bkw.71.1324299231482; Mon, 19 Dec 2011 04:53:51 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs5284bkc; Mon, 19 Dec 2011 04:53:51 -0800 (PST) Received: by 10.216.132.213 with SMTP id o63mr7132162wei.11.1324299227923; Mon, 19 Dec 2011 04:53:47 -0800 (PST) Received: from stoneboat.aleph1.co.uk (stoneboat.aleph1.co.uk. [80.68.88.63]) by mx.google.com with ESMTPS id c20si1618426wbh.120.2011.12.19.04.53.47 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 19 Dec 2011 04:53:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of wookey@aleph1.co.uk designates 80.68.88.63 as permitted sender) client-ip=80.68.88.63; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of wookey@aleph1.co.uk designates 80.68.88.63 as permitted sender) smtp.mail=wookey@aleph1.co.uk Received: from host-78-151-164-206.static.as13285.net ([78.151.164.206] helo=dream.aleph1.co.uk) by stoneboat.aleph1.co.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Rccir-0003dG-8h; Mon, 19 Dec 2011 12:53:47 +0000 Received: from wookey by dream.aleph1.co.uk with local (Exim 4.72) (envelope-from ) id 1Rccil-0003oc-6y; Mon, 19 Dec 2011 12:53:35 +0000 From: wookey@wookware.org To: buildd-tools-devel@lists.alioth.debian.org Cc: patches@linaro.org, Wookey Date: Mon, 19 Dec 2011 12:53:13 +0000 Message-Id: <1324299198-14640-2-git-send-email-wookey@wookware.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1324299198-14640-1-git-send-email-wookey@wookware.org> References: <1324299198-14640-1-git-send-email-wookey@wookware.org> X-SA-Exim-Connect-IP: 78.151.164.206 X-SA-Exim-Mail-From: wookey@aleph1.co.uk X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on stoneboat.aleph1.co.uk X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.5 tests=AWL,BAYES_00 autolearn=no version=3.3.1 Subject: [PATCH 2/7] Merge in last missing bits in Build.pm for packages Not clear if this should be $self->get('Host_Arch') or $self->get_conf('HOST_ARCH') throughout. X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on stoneboat.aleph1.co.uk) From: Wookey --- lib/Sbuild/Build.pm | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm index b7ab733..e8ac807 100644 --- a/lib/Sbuild/Build.pm +++ b/lib/Sbuild/Build.pm @@ -273,7 +273,7 @@ sub run { $self->set('Pkg End Time', $self->get('Pkg Start Time')); # Acquire the architecture we're building for. - $self->set('Arch', $self->get_conf('ARCH')); + $self->set('Host_Arch', $self->get_conf('HOST_ARCH')); my $dist = $self->get_conf('DISTRIBUTION'); if (!defined($dist) || !$dist) { @@ -1002,7 +1002,7 @@ sub fetch_source_files { } } - debug("Arch check ok ($arch included in $dscarchs)\n"); + debug("Arch check ok ($host_arch included in $dscarchs)\n"); $self->set('Build Depends', $build_depends); $self->set('Build Depends Arch', $build_depends_arch); @@ -2056,7 +2056,7 @@ sub open_build_log { my $filename = $self->get_conf('LOG_DIR') . '/' . $self->get('Package_SVersion') . '-' . - $self->get('Arch') . + $self->get_conf('HOST_ARCH') . "-$date"; open($saved_stdout, ">&STDOUT") or warn "Can't redirect stdout\n"; @@ -2074,7 +2074,7 @@ sub open_build_log { $SIG{'QUIT'} = 'IGNORE'; $SIG{'PIPE'} = 'IGNORE'; - $PROGRAM_NAME = 'package log for ' . $self->get('Package_SVersion') . '_' . $self->get('Arch'); + $PROGRAM_NAME = 'package log for ' . $self->get('Package_SVersion') . '_' . $self->get('Host_Arch'); if (!$self->get_conf('NOLOG') && $self->get_conf('LOG_DIR_AVAILABLE')) { @@ -2093,7 +2093,7 @@ sub open_build_log { $self->log_symlink($filename, $self->get_conf('BUILD_DIR') . '/' . $self->get('Package_SVersion') . '_' . - $self->get('Arch') . '.build'); + $self->get('Host_Arch') . '.build'); } } @@ -2192,7 +2192,7 @@ sub open_build_log { $self->log("Version: " . $self->get('Version') . "\n"); $self->log("Source Version: " . $self->get('OVersion') . "\n"); $self->log("Distribution: " . $self->get_conf('DISTRIBUTION') . "\n"); - $self->log("Architecture: " . $self->get_conf('BUILD_ARCH') . "\n"); + $self->log("Machine Architecture: " . $self->get_conf('ARCH') . "\n"); $self->log("Host Architecture: " . $self->get_conf('HOST_ARCH') . "\n"); $self->log("Build Architecture: " . $self->get_conf('BUILD_ARCH') . "\n"); $self->log("\n"); @@ -2237,15 +2237,15 @@ sub close_build_log { if (defined($self->get_conf('KEY_ID')) && $self->get_conf('KEY_ID')) { my $key_id = $self->get_conf('KEY_ID'); $self->log(sprintf("Signature with key '%s' requested:\n", $key_id)); - my $changes = $self->get('Package_SVersion') . '_' . $self->get('Arch') . '.changes'; + my $changes = $self->get('Package_SVersion') . '_' . $self->get('Host_Arch') . '.changes'; system (sprintf('debsign -k%s %s', $key_id, $changes)); } } my $subject = "Log for " . $self->get_status() . " build of " . $self->get('Package_Version'); - if ($self->get('Arch')) { - $subject .= " on " . $self->get('Arch'); + if ($self->get_conf('HOST_ARCH')) { + $subject .= " on " . $self->get_conf('HOST_ARCH'); } if ($self->get_conf('ARCHIVE')) { $subject .= " (" . $self->get_conf('ARCHIVE') . "/" . $self->get_conf('DISTRIBUTION') . ")"; @@ -2344,7 +2344,7 @@ sub send_mime_build_log { ); } - my $changes = $self->get('Package_SVersion') . '_' . $self->get('Arch') . '.changes'; + my $changes = $self->get('Package_SVersion') . '_' . $self->get('Host_Arch') . '.changes'; if ($self->get_status() eq 'successful' && -r $changes) { my $log_part = MIME::Lite->new( Type => 'text/plain',