[buildd-tools-devel] [PATCH 1/3] Use new dpkg 1.16.2 --add-architecture syntax so sbuild crosses-builds on Debian chroots
Wookey
wookey at wookware.org
Wed May 30 11:59:57 UTC 2012
---
lib/Sbuild/ResolverBase.pm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/Sbuild/ResolverBase.pm b/lib/Sbuild/ResolverBase.pm
index e629614..e040e3e 100644
--- a/lib/Sbuild/ResolverBase.pm
+++ b/lib/Sbuild/ResolverBase.pm
@@ -142,16 +142,17 @@ sub setup_dpkg {
# If cross-building, set the correct foreign-arch
if ($self->get('Host Arch') ne $self->get('Build Arch')) {
$session->run_command(
- { COMMAND => ['sh', '-c', 'echo "foreign-architecture ' . $self->get('Host Arch') . '" > /etc/dpkg/dpkg.cfg.d/sbuild'],
+ # this is the ubuntu dpkg 1.16.2 interface - we need to check (or configure) which to use with check_dpkg_version
+# { COMMAND => ['sh', '-c', 'echo "foreign-architecture ' . $self->get('Host Arch') . '" > /etc/dpkg/dpkg.cfg.d/sbuild'],
+# USER => 'root' });
+ # This is the Debian dpkg >= 1.16.3 interface
+ { COMMAND => ['dpkg', '--add-architecture', $self->get('Host Arch')],
USER => 'root' });
- # We should get this much nicer interface with new dpkg upload.
- # { COMMAND => ['dpkg', '--add-foreign-architecture ', $self->get('Host Arch')],
- # USER => 'root' });
if ($?) {
$self->log_error("E: Failed to set dpkg foreign-architecture config\n");
return 0;
}
- $self->log("Setting dpkg foreign-architecture to ".$self->get('Host Arch')."\n");
+ $self->log("Adding dpkg foreign-architecture ".$self->get('Host Arch')."\n");
}
}
--
1.7.9.5
More information about the Buildd-tools-devel
mailing list