← Back to branch summary

~ubuntu-branches/ubuntu/utopic/sbuild/utopic

« back to all changes in this revision

Viewing changes to lib/Sbuild/ConfBase.pm

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-06-23 22:27:58 UTC
  • mfrom: (8.1.24) (3.3.23 sid)
  • Revision ID: package-import@ubuntu.com-20120623222758-48ljspppdh7xzu9i
Tags: 0.63.1-1ubuntu1
https://launchpad.net/bugs/940410
* Resynchronize with Debian testing. Remaining changes:
  - debian/patches/do-not-install-debfoster-into-chroots.patch:
    do not install debfoster into the chroots because it is in universe and
    not needed for package building itself.
  - debian/patches/run-pre-build-hooks-as-root.patch:
    run pre-build hooks as root
* Drop run-lintian-inside-chroot.patch: It hasn't been picked up
  by Debian and doesn't work quite right (LP: #940410)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Sbuild/ConfBase.pm
102
102
    chomp(my $hostname = `hostname -f`);
103
103
 
104
104
    # Not user-settable.
105
 
    chomp(my $host_arch =
 
105
    chomp(my $native_arch =
106
106
          readpipe("dpkg --print-architecture"));
107
107
 
108
108
    my %common_keys = (
148
148
            HELP => 'Program to use to send mail'
149
149
        },
150
150
        # TODO: Check if defaulted in code assuming undef
 
151
        # ARCH is the native (build-system) architecture.  Not used for host/build.
151
152
        'ARCH'                                  => {
152
153
            TYPE => 'STRING',
153
 
            VARNAME => 'arch',
154
 
            GROUP => 'Build options',
155
 
            DEFAULT => $host_arch,
156
 
            HELP => 'Build architecture.'
 
154
            GROUP => '__INTERNAL',
 
155
            DEFAULT => $native_arch,
 
156
            HELP => 'Build architecture (Arch we are building on).'
157
157
        },
158
158
        'HOST_ARCH'                             => {
159
159
            TYPE => 'STRING',
160
 
            GROUP => '__INTERNAL',
161
 
            DEFAULT => $host_arch,
162
 
            HELP => 'Host architecture'
 
160
            VARNAME => 'host_arch',
 
161
            GROUP => 'Build options',
 
162
            DEFAULT => $native_arch,
 
163
            HELP => 'Host architecture (Arch we are building for)'
 
164
        },
 
165
        'BUILD_ARCH'                            => {
 
166
            TYPE => 'STRING',
 
167
            VARNAME => 'build_arch',
 
168
            GROUP => 'Build options',
 
169
            DEFAULT => $native_arch,
 
170
            HELP => 'Build architecture (Arch we are building on).'
163
171
        },
164
172
        'HOSTNAME'                              => {
165
173
            TYPE => 'STRING',