On Sun, Jan 02, 2022 at 02:53:23AM +0800, Shengjing Zhu wrote: > On Sun, Jan 2, 2022 at 2:47 AM tony mancill <tmancill@debian.org> wrote: > > > > On Sat, Jan 01, 2022 at 01:38:55PM -0500, Federico Grau wrote: > > > On Sun, Jan 02, 2022 at 01:46:22AM +0800, Shengjing Zhu wrote: > > > > git checkout upstream > > > > git merge --ff upstream/0.12.0 > > > > > > > > > > Thanks for the feedback Shengjing Zhu, > > > > > > I've completed the suggested steps and pushed them to salsa. > > > Ready for further review, feedback, or upload as cycles are available. > > > > Hi Federico, > > > > Do you mind also pushing your pristine-tar branch to Salsa? If you > > don't have one, you should be able to run the following command from the > > same directory as your git repo - that is the same directory where you > > can successfully run gbp buildpackage: > > > > pristine-tar commit ../build-area/pat_0.12.0.orig.tar.gz > > > > or > > > > pristine-tar commit ../tarballs/pat_0.12.0.orig.tar.gz > > > > (or pat_0.12.0.orig.tar.xz, if that's what you have) > > > > The reason your build is working locally is that the build system can > > find the orig.tar.gz. On my system, after pulling the latest from > > Salsa, the error is: > > > > $ gbp buildpackage > > gbp:info: Tarballs 'pat_0.12.0.orig.tar.gz' not found at '../tarballs/' > > gbp:warning: Pristine-tar branch "pristine-tar" not found > > gbp:info: Creating /data/debian/sponsor/pat/build-area/pat_0.12.0.orig.tar.gz > > gbp:error: Error creating pat_0.12.0.orig.tar.gz: Pristine-tar couldn't checkout "pat_0.12.0.orig.tar.gz": pristine-tar: no pristine-tar branch found, use "pristine-tar commit" first > > > > You can get rid of this error by running `gbp buildpackage > --git-no-pristine-tar`, or adding `pristine-tar=False` to > debian/gbp.conf . > Does the --git-no-pristine-tar option fit tony? I'm initially hesitant to introduce pristine-tar into this project, as it's not been used for past releases, and Taowa (currently on VAC) and I had elected not to use pristine-tar here. If that's the only path forward ok. However, I am able to build from a freshly cloned directory without errors (though I've only use sbuild; trying default gbp buildpackage errors at signing changes for me, given I've no key). # console review of builds donfede@saltdev14:~$ rm -fr hack_pat00 donfede@saltdev14:~$ mkdir hack_pat00 donfede@saltdev14:~$ cd hack_pat00 donfede@saltdev14:~/hack_pat00$ gbp clone git@salsa.debian.org:debian-hamradio-team/pat.git gbp:info: Cloning from 'git@salsa.debian.org:debian-hamradio-team/pat.git' donfede@saltdev14:~/hack_pat00$ cd pat donfede@saltdev14:~/hack_pat00/pat$ donfede@saltdev14:~/hack_pat00/pat$ gbp buildpackage --git-builder=sbuild -A -v -d unstable gbp:info: Creating pat_0.12.0.orig.tar.gz from 'upstream/0.12.0' gbp:info: Performing the build dpkg-source: info: using patch list from debian/patches/series dpkg-source: info: applying 01_remove_ptc-go.patch ... Package: pat Package-Time: 46 Source-Version: 0.12.0-1 Space: 152888 Status: successful Version: 0.12.0-1 -------------------------------------------------------------------------------- Finished at 2022-01-01T19:13:28Z Build needed 00:00:46, 152888k disk space donfede@saltdev14:~/hack_pat00/pat$ donfede@saltdev14:~/hack_pat00/pat$ donfede@saltdev14:~/hack_pat00/pat$ cd donfede@saltdev14:~$ donfede@saltdev14:~$ rm -fr hack_pat00 donfede@saltdev14:~$ mkdir hack_pat00 donfede@saltdev14:~$ cd hack_pat00 donfede@saltdev14:~/hack_pat00$ gbp clone git@salsa.debian.org:debian-hamradio-team/pat.git gbp:info: Cloning from 'git@salsa.debian.org:debian-hamradio-team/pat.git' donfede@saltdev14:~/hack_pat00$ cd pat/ donfede@saltdev14:~/hack_pat00/pat$ origtargz Trying uscan --download --download-current-version ... uscan: Newest version of pat on remote site is 0.12.0, specified download version is 0.12.0 Successfully renamed ../pat-0.12.0.tar.gz to ../pat_0.12.0.orig.tar.gz. donfede@saltdev14:~/hack_pat00/pat$ sbuild -A -v -d unstable dpkg-source: info: using patch list from debian/patches/series dpkg-source: info: applying 01_remove_ptc-go.patch ... Space: 152888 Status: successful Version: 0.12.0-1 -------------------------------------------------------------------------------- Finished at 2022-01-01T19:15:56Z Build needed 00:00:47, 152888k disk space donfede@saltdev14:~/hack_pat00/pat$ regards, donfede
Attachment:
signature.asc
Description: PGP signature