From patchwork Wed Dec 14 17:54:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wookey X-Patchwork-Id: 5706 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 D416C23E0E for ; Wed, 14 Dec 2011 17:55:47 +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 CA2ECA18826 for ; Wed, 14 Dec 2011 17:55:47 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id k10so972414eaa.11 for ; Wed, 14 Dec 2011 09:55:47 -0800 (PST) Received: by 10.204.157.12 with SMTP id z12mr1718786bkw.18.1323885347580; Wed, 14 Dec 2011 09:55:47 -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.129.2 with SMTP id hg2cs15400bkc; Wed, 14 Dec 2011 09:55:47 -0800 (PST) Received: by 10.52.65.1 with SMTP id t1mr5645040vds.121.1323885345302; Wed, 14 Dec 2011 09:55:45 -0800 (PST) Received: from stoneboat.aleph1.co.uk (stoneboat.aleph1.co.uk. [80.68.88.63]) by mx.google.com with ESMTPS id gd21si1993396wbb.31.2011.12.14.09.55.45 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Dec 2011 09:55:45 -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 1Rat3O-0005J9-BI; Wed, 14 Dec 2011 17:55:44 +0000 Received: from wookey by dream.aleph1.co.uk with local (Exim 4.72) (envelope-from ) id 1Rat3I-0006DZ-9v; Wed, 14 Dec 2011 17:55:36 +0000 From: wookey@linaro.org To: patches@linaro.org Cc: Wookey Date: Wed, 14 Dec 2011 17:54:29 +0000 Message-Id: <1323885273-23505-13-git-send-email-wookey@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1323885273-23505-1-git-send-email-wookey@linaro.org> References: <1323885273-23505-1-git-send-email-wookey@linaro.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=-1.9 required=4.5 tests=BAYES_00 autolearn=no version=3.3.1 Subject: [PATCH 13/17] Add TYPE info to new variables so it builds 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/Conf.pm | 6 ++++++ lib/Sbuild/ConfBase.pm | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/Sbuild/Conf.pm b/lib/Sbuild/Conf.pm index c1100c5..bb5ba03 100644 --- a/lib/Sbuild/Conf.pm +++ b/lib/Sbuild/Conf.pm @@ -254,10 +254,16 @@ sub setup ($) { HELP => 'Path to aptitude binary' }, 'XAPT' => { + TYPE => 'STRING', + VARNAME => 'xapt', + GROUP => 'Programs', CHECK => $validate_program, DEFAULT => 'xapt' }, 'EMBUILDDEPS' => { + TYPE => 'STRING', + VARNAME => 'xapt', + GROUP => 'Programs', CHECK => $validate_program, DEFAULT => 'embuilddeps' }, diff --git a/lib/Sbuild/ConfBase.pm b/lib/Sbuild/ConfBase.pm index 769f56d..41ad4f0 100644 --- a/lib/Sbuild/ConfBase.pm +++ b/lib/Sbuild/ConfBase.pm @@ -151,22 +151,23 @@ sub init_allowed_keys { # ARCH is the native (system) architecture. Not used for host/build. 'ARCH' => { TYPE => 'STRING', + VARNAME => 'arch', GROUP => '__INTERNAL', - DEFAULT => $native_arch + DEFAULT => $native_arch, HELP => 'Build architecture.' }, 'HOST_ARCH' => { TYPE => 'STRING', VARNAME => 'host_arch', GROUP => 'Build options', - DEFAULT => $native_arch + DEFAULT => $native_arch, HELP => 'Host architecture' }, 'BUILD_ARCH' => { TYPE => 'STRING', VARNAME => 'build_arch', GROUP => 'Build options', - DEFAULT => $native_arch + DEFAULT => $native_arch, HELP => 'Build architecture.' }, 'HOSTNAME' => {