[Buildd-tools-devel] Patches for sbuild and buildd packages

[Roger Leigh]

Otavio Salvador <otavio at debian.org> writes:

> Since we're using buildd and sbuild here at O.S. Systems, we built
> some patches around it that I would like to whare with Debian to have
> them merged if you think it's the case.

Many thanks for the patch.

The buildd-tools project currently only maintains the sbuild part of
wanna-build, and so only that part of the patch is currently useful to
us.

I've saved a copy of the patch here for future use, should we package
the other parts of wanna-build.
http://alioth.debian.org/tracker/index.php?func=detail&aid=303307&group_id=30471&atid=411184

> Index: sbuild
> ===================================================================
> --- sbuild	(revisão 97)
> +++ sbuild	(cópia de trabalho)
> @@ -88,6 +88,9 @@
>  
>  %main::dist_order = ( 'oldstable-security' => 0, stable => 1, 'stable-security' => 1, testing => 2, 'testing-security' => 2, unstable => 3 );
>  
> +# use user setting
> +%main::dist_order = %conf::dist_order if %conf::dist_order;
> +
>  chomp( $main::arch = `$conf::dpkg --print-installation-architecture` );
>  $main::username = (getpwuid($<))[0] || $ENV{'LOGNAME'} || $ENV{'USER'};
>  $main::debug = 0;

With our version of sbuild, the distribution names are no longer
hard-coded.  Any directory (or symlink to a directory) named
chroot-$distribution is treated as a valid chroot.

http://svn.debian.org/wsvn/buildd-tools/trunk/sbuild/Sbuild/Chroot.pm?op=file&rev=0&sc=0
The function is Sbuild::Chroot::init(); the logic would easily adapt
to work with the version of sbuild you are using (to fill
%main::dist_order automatically--no configuration necessary at all!).


Regards,
Roger

-- 
Roger Leigh
                Printing on GNU/Linux?  http://gutenprint.sourceforge.net/
                Debian GNU/Linux        http://www.debian.org/
                GPG Public Key: 0x25BFB848.  Please sign and encrypt your mail.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 190 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/buildd-tools-devel/attachments/20060405/6e7083de/attachment.pgp