Bug#1095135: sbuild: binary .changes file is missing the .orig.tar for new packages

[Michael R. Crusoe]

Package: sbuild
Version: 0.88.3
Severity: normal
X-Debbugs-Cc: cru...@debian.org

Dear Maintainers,

Thank you for sbuild and the --unshare backend, it has really improved my 
packaging workflow!

The last remaining usage of pbuilder in my workflow was producing a binary 
.changes file that included a reference to the .orig.tar archive. Typical 
scenario for me is a first-time upload of a brand new package from a checkout 
of the Salsa package repository.

In #debian-devel today I learned that I can get sbuild to do this, but it 
requires passing `--source` on the command line, or setting `$build_source = 
1;` in my sbuild.conf

This seems counterintuitive, am I missing something? Or perhaps there should be a new 
option or default behavior to include the .orig.tar for "-1" versions of 
packages and especially for packages with only one entry in d/changelog.

I've attached my .sbuildrc to this report, in case my configuration is causing 
a confusion.

Thanks!


-- System Information:
Debian Release: 12.9
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'stable-security'), (100, 
'bookworm-fasttrack'), (100, 'bookworm-backports-staging'), (1, 
'stable-updates'), (1, 'proposed-updates'), (1, 'unstable'), (1, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.12.9+bpo-amd64 (SMP w/8 CPU threads; PREEMPT)
Kernel taint flags: TAINT_USER, TAINT_WARN, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages sbuild depends on:
ii  adduser         3.134
ii  libsbuild-perl  0.88.3
ii  perl            5.36.0-7+deb12u1

Versions of packages sbuild recommends:
ii  autopkgtest  5.42
ii  debootstrap  1.0.140~bpo12+1
ii  iproute2     6.1.0-3
ii  mmdebstrap   1.5.6-2
ii  schroot      1.6.13-3+b2
ii  uidmap       1:4.13+dfsg1-1+b1

Versions of packages sbuild suggests:
ii  e2fsprogs  1.47.0-2
ii  kmod       30+20221128-1
ii  wget       1.21.3-1+b2

-- no debconf information

$chroot_mode = 'unshare';
$run_lintian = 1;
#$lintian_opts = ['-i', '-I'];
$lintian_opts = ['--display-info', '--verbose', '--fail-on', 'error,warning', 
'--info'];
$run_piuparts = 0;
$piuparts_root_args = ['PATH=/usr/sbin:/usr/bin:/sbin:/bin', 'unshare', 
'--pid', '--fork', '--mount-proc', '--map-root-user', '--map-auto'];
#$piuparts_opts = ["--basetgz=$HOME/.cache/sbuild/%r-%a.tar.zst", 
'--fake-essential-packages=systemd-sysv', '--distribution=%r'];
#$piuparts_opts = ['--distribution=%r', '--bootstrapcmd=mmdebstrap 
--skip=check/empty --variant=minbase --aptopt="Acquire::http { Proxy 
\"http://127.0.0.1:3142\";; }"'];
$piuparts_opts = ['--no-eatmydata', '--distribution=%r', 
'--fake-essential-packages=systemd-sysv'];
$run_autopkgtest = 1;
$autopkgtest_root_args = '';
#$autopkgtest_opts = [ '--apt-upgrade', '--env=CCACHE_DIR=/build/ccache', 
'--env=PATH=/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games',
 '--', 'unshare', '--release', '%r', '--arch', '%a', 
'--prefix=/dev/shm/tmp.autopkgtest.', '--bind', '$HOME/.cache/ccache', 
'/build/ccache' ];
# Specify autopkgtest options.  The commented example below is the default 
since trixie.
#$autopkgtest_opts = [ '--apt-upgrade', '--', 'unshare', '--release', '%r', 
'--arch', '%a' ];

$external_commands = {
                        "chroot-update-failed-commands" => [ [ '%SBUILD_SHELL' 
] ],
                        "build-deps-failed-commands" => [ [ '%SBUILD_SHELL' ] ],
                        "build-failed-commands" => [ [ '%SBUILD_SHELL' ] ],
};

$build_environment = { "CCACHE_DIR" => "/build/ccache" };
$path = 
"/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games";
#$build_path = "/build/package/";
$dsc_dir = "package";
$unshare_bind_mounts = [ { directory => "$HOME/.cache/ccache", mountpoint => 
"/build/ccache" } ];

$unshare_mmdebstrap_keep_tarball = 1;

$build_arch_all = 1;
#$build_source = 1;
$source_only_changes = 1;

$unshare_mmdebstrap_extra_args = [
        "%r", ["--include=ccache", "--aptopt='Acquire::http { Proxy 
\"http://127.0.0.1:3142\";; }'", "--customize-hook=chroot \"\$1\" 
update-ccache-symlinks"] 
]

OpenPGP_signature.asc
Description: OpenPGP digital signature