Bug#859178: pbuilder: source-only changes doesn't handle -sa passed to pbuilder --debbuildopts

[Yves-Alexis Perez]

On Thu, 2017-04-20 at 11:15 +0100, James Clarke wrote:
> What's in your B10_source-build hook? Looking closely at the log:
> 
> > [...]
> 
> I imagine B10_source-build is overwriting the _source.changes pbuilder just
> generated.

Indeed, it was used to generate source changes files before pbuilder gained
that support and I didn't disable it:

=
generate_change_file()
{
  echo "Generating source changes file"
  local version=$(dpkg-parsechangelog -Sversion)
  local package=$(dpkg-parsechangelog -Ssource)
  dpkg-genchanges -S > ../${package}_${version}_source.changes
}

cd /tmp/buildd/*/debian/..
generate_change_file
=

I'll remove it and update or close the bug. Thanks (feeling a bit of shame
here)

Regards,
-- 
Yves-Alexis

signature.asc
Description: This is a digitally signed message part

Bug#859178: pbuilder: source-only changes doesn't handle -sa passed to pbuilder --debbuildopts

[James Clarke]

On 20 Apr 2017, at 11:04, Yves-Alexis Perez  wrote:
> On Sat, 2017-04-08 at 15:58 +0200, Mattia Rizzolo wrote:
>> Is what you are observing specific to linux-grsec?  I'd be mostly
>> surprised by it.
> 
> Maybe. And maybe the bug doesn't lie in pbuilder but dpkg-genchanges, I'm not
> sure. The build log can be found at https://perso.corsac.net/~corsac/debian/li
> nux-grsec_4.9.18-1+grsec201703261106+1_amd64.build and we can see:
> 
> I: Running cd /build/linux-grsec-4.9.18/ && env
> PATH="/usr/lib/ccache:/usr/sbin:/usr/bin:/sbin:/bin" HOME="/nonexistent" dpkg-
> buildpackage -us -uc  -I -d -sa -rfakeroot && env
> PATH="/usr/lib/ccache:/usr/sbin:/usr/bin:/sbin:/bin" HOME="/nonexistent" dpkg-
> genchanges -S '-sa' > ../linux-grsec_4.9.18-
> 1+grsec201703261106+1_source.changes

What's in your B10_source-build hook? Looking closely at the log:

> make[1]: Leaving directory '/build/linux-grsec-4.9.18'
>  dpkg-genbuildinfo
>  dpkg-genchanges -sa 
> >../linux-grsec_4.9.18-1+grsec201703261106+1_amd64.changes
> dpkg-genchanges: info: including full source code in upload

This is the binary dpkg-genchanges done by dpkg-buildpackage

>  dpkg-source -I --after-build linux-grsec-4.9.18
> dpkg-source: info: using options from 
> linux-grsec-4.9.18/debian/source/options: --compression=xz 
> --tar-ignore=debian/*.local
> dpkg-buildpackage: info: full upload (original source is included)
> dpkg-genchanges: info: including full source code in upload

This is the source-only dpkg-genchanges done by pbuilder, *with* -sa.

> I: copying local configuration
> I: user script /var/cache/pbuilder/build/23492/tmp/hooks/B10_source-build 
> starting
> Generating source changes file
> dpkg-genchanges: info: not including original source code in upload

I imagine B10_source-build is overwriting the _source.changes pbuilder just
generated.

Regards,
James

Bug#859178: pbuilder: source-only changes doesn't handle -sa passed to pbuilder --debbuildopts

[Yves-Alexis Perez]

On Sat, 2017-04-08 at 15:58 +0200, Mattia Rizzolo wrote:
> Is what you are observing specific to linux-grsec?  I'd be mostly
> surprised by it.

Maybe. And maybe the bug doesn't lie in pbuilder but dpkg-genchanges, I'm not
sure. The build log can be found at https://perso.corsac.net/~corsac/debian/li
nux-grsec_4.9.18-1+grsec201703261106+1_amd64.build and we can see:

I: Running cd /build/linux-grsec-4.9.18/ && env
PATH="/usr/lib/ccache:/usr/sbin:/usr/bin:/sbin:/bin" HOME="/nonexistent" dpkg-
buildpackage -us -uc  -I -d -sa -rfakeroot && env
PATH="/usr/lib/ccache:/usr/sbin:/usr/bin:/sbin:/bin" HOME="/nonexistent" dpkg-
genchanges -S '-sa' > ../linux-grsec_4.9.18-
1+grsec201703261106+1_source.changes

Feel free to reassign to dpkg if needed.

Regards,
-- 
Yves-Alexis

signature.asc
Description: This is a digitally signed message part

Bug#859178: pbuilder: source-only changes doesn't handle -sa passed to pbuilder --debbuildopts

[Mattia Rizzolo]

Control: tag -1 unreproducible

On Fri, Mar 31, 2017 at 10:18:01AM +0200, Yves-Alexis Perez wrote:
> I'm forcing the addition of orig.tar by using:
> 
> pdebuild --debbuildopts -sa
> 
> It works fine for _amd64.changes, but not for _sources.changes.

I can't reproduce it.  I haven't tried with linux-grsec, but with
dehydrated:

% pdebuild --debbuildopts -sa
...
 dpkg-genbuildinfo
 dpkg-genchanges -sa >../dehydrated_0.3.1-3_amd64.changes
dpkg-genchanges: info: including full source code in upload< this 
warning comes from the dpkg-genchanges called by dpkg-buildpackage, building 
the _amd64
 dpkg-source --after-build dehydrated-0.3.1
dpkg-buildpackage: info: full upload (original source is included)
dpkg-genchanges: info: including full source code in upload< this 
warning comes from the dpkg-genchanges called by pbuilder, building the _source
% grep orig ~/pbuilder/result/sid/amd64/dehydrated_0.3.1-3_source.changes 
 405ac61cfc74a22b710d3b8bde398bd697b714c6 71375 dehydrated_0.3.1.orig.tar.gz
 405bca85af3a29e1ad2c7c2c0a48fe8bb8ca10ba 488 dehydrated_0.3.1.orig.tar.gz.asc
 7c9b9475b442dd19dbc33a26426444054781e14a2f122d2a2405f81093484239 71375 
dehydrated_0.3.1.orig.tar.gz
 b3c052c0ee14a2646a85329280d5e0018561a80c71b5ecff1697f6c7c4db9972 488 
dehydrated_0.3.1.orig.tar.gz.asc
 7a3b92b963da6469c4a53f051d6efa24 71375 misc optional 
dehydrated_0.3.1.orig.tar.gz
 be73251799134241d786064d9151753e 488 misc optional 
dehydrated_0.3.1.orig.tar.gz.asc
% 


Is what you are observing specific to linux-grsec?  I'd be mostly
surprised by it.

-sa is properly supported by this switch here, as you can see:
https://anonscm.debian.org/git/pbuilder/pbuilder.git/tree/pbuilder-modules#n965

-- 
regards,
Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540  .''`.
more about me:  https://mapreri.org : :'  :
Launchpad user: https://launchpad.net/~mapreri  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-


signature.asc
Description: PGP signature

Bug#859178: pbuilder: source-only changes doesn't handle -sa passed to pbuilder --debbuildopts

[Yves-Alexis Perez]

Package: pbuilder
Version: 0.228.6
Severity: normal

Hi,

I'm using SOURCE_ONLY_CHANGES=yes in my pbuilderrc in order to be able
to do source-only uploads later. The numbering scheme for my uploads
might a bit weird (it's for linux-grsec package which is based on
src:linux and has version numbers like 4.9.18-1+grsec201703261106+1) so
I'm forcing the addition of orig.tar by using:

pdebuild --debbuildopts -sa

It works fine for _amd64.changes, but not for _sources.changes.

Regards,
-- 
Yves-Alexis

-- System Information:
Debian Release: 9.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (500, 
'oldstable'), (450, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-2-grsec-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages pbuilder depends on:
ii  cdebootstrap   0.7.7
ii  debconf [debconf-2.0]  1.5.60
ii  debootstrap1.0.89
ii  dpkg-dev   1.18.23
ii  util-linux 2.29.2-1
ii  wget   1.19.1-3

Versions of packages pbuilder recommends:
ii  devscripts  2.17.5
ii  eatmydata   105-5
ii  fakeroot1.21-3.1
ii  iproute24.9.0-1
ii  net-tools   1.60+git20161116.90da8a0-1
ii  sudo1.8.19p1-1

Versions of packages pbuilder suggests:
pn  cowdancer   
ii  gdebi-core  0.9.5.7+nmu1

-- debconf information:
  pbuilder/nomirror:
  pbuilder/rewrite: false
  pbuilder/mirrorsite: http://ftp.fr.debian.org/debian