Le 22/04/2016 11:55, Mattia Rizzolo a écrit : > On Fri, Apr 22, 2016 at 11:14:16AM +0200, Julien Lamy wrote: >> >> >> Le 22/04/2016 08:42, Ghislain Vaillant a écrit : >>> On 22/04/16 07:03, Julien Lamy wrote: >>>> It seems that my fix actually made things worse since the builds have >>>> failed for almost all architectures [1]. I think the cause is me not >>>> reading correctly pbuilder's man page and build testing my previous >>>> version with "--debbuildopts -B" instead of "--binary-arch". I've >>>> committed a new version, with a better separation of arch and indep in >>>> d/rules [2]. I've checked that "pbuilder --debbuildopts -A" builds only >>>> indep packages, that "pbuilder --binary-arch" build only arch packages >>>> and that packages are usable. >>>> >>>> Does this new version seem correct ? Are there other tests to run than >>>> my pbuilder ones ? >>>> >>>> Sorry for the noise ! >>>> >>>> [1] https://buildd.debian.org/status/package.php?p=odil >>>> [2] https://anonscm.debian.org/cgit/debian-med/odil.git/commit/ >>>> >>>> Cheers, >>> >>> Hey Julien, >>> >>> Indeed if you want to achieve true separation between -arch and -indep >>> only builds, then the additional overrides you listed with a no-op in it >>> are required. >>> >>> This however: >>> +override_dh_auto_build-arch: >>> dh_auto_build >>> >>> ...should not be needed I believe. >> >> You're right, it is not necessary. With the latest commit, I think the >> package is now ready for a new upload (full/arch/indep builds OK, >> lintian OK). > > I can do it this day. Thanks! > Have you really tested that `dpkg-buildpackage -B` (what is done on > arch-dep builds in buildds) and `dpkg-buildpackage -A` (for the -indep) > work as expected? For the pbuilder setup, I used --binary-arch instead "--debbuildopts -B" as per their man page (it seem that they modify debbuildopts with more than just -B) and -A in a separate builds. I also tried directly with dpkg-buildpackage outside the pbuilder (both with -B and -A), and it behaves as expected. This yields another question: should I switch from pbuilder to sbuild to be closer to the buildd setup? > I'm going to test them out, and check if that works as expected, if not, > well, I'll try to have it working :) (hope you're ok with it) Hope it works for you! Any modification is welcome, and if you can't get it working, just tell me and I'll try to fix it on my side. > From a quick glance on git, to me it seems that you forgot about the > override_dh_configure override (as you don't want it for -indep, but you > do for -arch). This is by choice: since dh_configure is very fast for this package, I favored a smaller d/rules. If it's a bad choice, just tell me :-) > Also, it would imho be nice to have Build-Depends splitted on > Build-Depends-Arch too, but the support for it is pretty limited, and > only 5 packages in the whole archive currently use it, so maybe this is > not something to care about now :) Since the wiki (https://wiki.debian.org/Build-Depends-Indep) says "There is currently no build-depends-arch field", I did not split the dependencies :-) But I'll keep this in mind for a later version. Cheers, -- Julien
Attachment:
signature.asc
Description: OpenPGP digital signature