Hi Ian,
Thanks for the quick response!
On Apr 27 2020, Ian Jackson <ijack...@chiark.greenend.org.uk> wrote:
> Nikolaus Rath writes ("Bug#958989: dgit-user(7): building instructions don't
> work"):
>> I'm trying to follow dgit-user(7) to build a modified version of a package.
>> I did:
>
> Hi. This is a thing you should be able to do.
>
>> $ dgit clone valgrind
>> $ cd valgrind
>> $ git apply ../my_special_patch.diff
>> $ git commit -m "Way better than vanilla!"
>> $ gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit
>> $ git clean -xdf
>> $ sbuild -c buster-amd64 -A --no-clean-source --dpkg-source-opts='-Zgzip -z1
>> --format=1.0 -sn'
>>
>> But this eventually fails with:
> ...
>> dpkg-source -b .
>> dpkg-source: error: can't build with source format '3.0 (quilt)': no
>> upstream tarball
>> found at ../valgrind_3.15.0.orig.tar.{bz2,gz,lzma,xz}
>> dpkg-buildpackage: error: dpkg-source -b . subprocess returned exit status 25
>
> How sad.
>
> There are two things wrong here.
>
> One is that sbuild seems to be ignoring the --dpkg-source-opts, or
> maybe the rune was always wrong. I think I will have to investigate.
> I *thought* we had a test for this rune but maybe not one involving
> sbuild.
>
> ... yes, we do. tests/tests/sbuild-gitish. Obviously the test isn't
> working right.
>
> The other oddity, is that this complaint about
> valgrind_3.15.0.orig.tar.* implies that there isn't a
> valgrind_3.15.0.orig.tar.bz2 but when I tried dgit clone valgrind it
> left me one in my "..".
Yes, I have one too:
$ ls -d ../valgrind*
../valgrind/
../valgrind_3.15.0.orig.tar.bz2
../valgrind_3.15.0-1.debian.tar.xz
../valgrind_3.15.0-1.dsc
../valgrind_3.15.0-1.tar.gz
../valgrind_3.15.0-1_amd64.build@
../valgrind_3.15.0-1_amd64-2020-04-27T18:01:38Z.build
../valgrind_3.15.0-1_amd64-2020-04-27T18:05:35Z.build
../valgrind_3.15.0-2~1.gbpd4e99a.dsc
../valgrind_3.15.0-2~1.gbpd4e99a.tar.gz
../valgrind_3.15.0-2~1.gbpd4e99a_amd64.build@
../valgrind_3.15.0-2~1.gbpd4e99a_amd64-2020-04-27T18:06:33Z.build
> I conjecture that you have a non-default
> build-products dir for dgit but your sbuild doesn't have that
> configured ? This ought not to matter with the --format=1.0 -sn rune.
> I don't think this is in your way but it would be nice to confirm that
> there isn't another bug here.
I don't remember setting something like this, but I may have
forgotten. Where would I look for that?
I do not have a ~/.dgit*, nor is dgit mentioned in ~/.gitconfig.
Best,
-Nikolaus
--
GPG Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F
»Time flies like an arrow, fruit flies like a Banana.«
