[buildd-tools-devel] [PATCH 13/17] Add TYPE info to new variables so it builds
wookey at wookware.org
wookey at wookware.org
Tue Dec 13 02:37:38 UTC 2011
From: Wookey <wookey at wookware.org>
---
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' => {
--
1.7.5.4
More information about the Buildd-tools-devel
mailing list