Package: git-debpush Version: 16.3~bpo13+1 I did a tag2upload of 'knot' which has a peculiar upstream tarball filtering, using gbp import-orig filter. As a side note: this configuration is not my invention, and I consider changing it to use upstream git instead (which has PGP signed tags), although they use git submodules so not compatible with tag2upload anyway IIRC.
Quoting debian/watch: Version: 5 Source: https://secure.nic.cz/files/knot-dns/ Matching-Pattern: (?:|.*/)knot(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) Dversionmangle: s/\+hotfix// Pgpsigurlmangle: s/$/.asc/ Uversionmangle: s/-((alpha|beta|rc)\d*)$/~$1/ So that fetches the "real" upstream tarball with PGP signature. I think it puts the unfiltered tarball into the pristine-tar branch. Then there is debian/gbp.conf: [DEFAULT] debian-branch = debian/master pristine-tar = True upstream-branch = upstream/3.5 upstream-vcs-tag = v%(version)s sign-tags = True [dch] meta = 1 [import-orig] filter = [ 'configure', '*/Makefile.in', '*/*/Makefile.in', '*/*/*/Makefile.in', 'install-sh', 'ltmain.sh', 'm4/libtool.m4', '/src/lib*/version.h', 'INSTALL', 'aclocal.m4', 'ar-lib', 'depcomp', 'compile', 'missing', 'test-driver', 'config.guess', 'config.sub', ] filter-pristine-tar = False Which filters out files when doing the git import. Is this mode supported? I'm having trouble translating the error message I got below into actions to make tag2upload work for 'knot'. /Simon Debian tag2upload service <[email protected]> writes: > job id: 5733 > url: https://salsa.debian.org/dns-team/knot-dns.git > tag: debian/3.5.6-2 > preparing > tag signature verified > tag parsed ok > source: knot > version: 3.5.6-2 > tag signer authorised for package > source code fetched > changelog parsed ok > target: debian unstable > using existing orig(s) > processing failed with error exit status 255 > > oracle$ dgit --version > dgit version 16.3~bpo13+1 > # builder: oracle$ ./ssh-builder > '[email protected]' ... > builder$ dgit --version > dgit version 16.3 > builder$ dpkg-source --version > Debian dpkg-source version 1.23.7. > ... > > builder:work$ tag2upload-fetch-inputs tag=debian/3.5.6-2 > upstream_tag=upstream/3.5.6 > pristine_tar=57f24716d6f9e29e2c6de861eb63ec60297b4db9 > + git fetch origin --no-tags > refs/tags/debian/3.5.6-2:refs/tags/debian/3.5.6-2 > refs/tags/upstream/3.5.6:refs/tags/upstream/3.5.6 > refs/heads/pristine-tar:refs/heads/pristine-tar > From https://salsa.debian.org/dns-team/knot-dns > * [new tag] debian/3.5.6-2 -> debian/3.5.6-2 > * [new tag] upstream/3.5.6 -> upstream/3.5.6 > * [new branch] pristine-tar -> pristine-tar > * [new branch] pristine-tar -> origin/pristine-tar > > builder:work$ git checkout -q refs/tags/debian/3.5.6-2 > # [ok] > # source code fetched > # changelog parsed ok > # target: debian unstable > > builder:work$ tag2upload-obtain-origs p=knot v=3.5.6-2 s=unstable > u=c410fe951569779f86147fed5ac586f8b29f2b5c > pristine_tar=57f24716d6f9e29e2c6de861eb63ec60297b4db9 > + dgit --build-products-dir=../bpd -pknot download-unfetched-origs > --write-sha256sums=.git/dgit/t2uoo/origs.sha256sums > canonical suite name for unstable is sid > suite has origs for this upstream version > downloading knot_3.5.6.orig.tar.xz... > downloading knot_3.5.6.orig.tar.xz.asc... > # using existing orig(s) > > oracle$ dgit -wn -pknot --build-products-dir=../bpd > --force-uploading-source-only --quilt=unapplied --ssh=./ssh-builder > --dgit=dgit -k374D8CE4DB96E9CBD4C0972A606D084E4683C079 --dput:-u > --package=knot --expect-suite=unstable --expect-version=3.5.6-2 > --tag2upload-builder-mode --split-view=always --new --trust-changelog > --t2u-upstream=upstream/3.5.6 > --t2u-upstream-commit=c410fe951569779f86147fed5ac586f8b29f2b5c > '--t2u-control-add=Git-Tag-Tagger=Simon Josefsson > <[email protected]>' > '--t2u-control-add=Git-Tag-Info=tag=966a806b5e968dca5b115e8f4321f4730d49944c > fp=a3cc9c870b9d310abad4cf2f51722b08fe4745a2' rpush-source > '[email protected]:/srv/builder.tag2upload.debian.org/tmp/autopkgtest-virt-docker.shared.teo1pjuj/downtmp/work' > > Format `3.0 (quilt)', need to check/update patch stack > canonical suite name for unstable is sid > dgit: split brain (separate dgit view) may be needed (--quilt=unapplied). > examining quilt state (multiple patches, unapplied mode) > dgit (build host): base trees orig=7b0a6b8dd5629f326034 > o+d/p=7b0a6b8dd5629f326034 > dgit (build host): quilt differences: src: ## orig == gitignores: == > orig == > dgit (build host): quilt differences: HEAD ## o+d/p HEAD == o+d/p > Unexpected differences between orig and HEAD: > Makefile.in | 1001 -- > aclocal.m4 | 1725 --- > ar-lib | 279 - > compile | 351 - > config.guess | 1815 --- > config.sub | 2354 ---- > configure | 25004 > ------------------------------------- > depcomp | 792 -- > distro/Makefile.in | 544 - > doc/Makefile.in | 850 -- > install-sh | 541 - > ltmain.sh | 11523 ----------------- > m4/libtool.m4 | 8513 ------------- > missing | 236 - > python/Makefile.in | 723 -- > python/knot_exporter/Makefile.in | 563 - > python/libknot/Makefile.in | 565 - > samples/Makefile.in | 571 - > src/Makefile.in | 8795 ------------- > src/libknot/xdp/Makefile.in | 556 - > src/redis/Makefile.in | 773 -- > test-driver | 160 - > tests-fuzz/Makefile.in | 1541 --- > tests-redis/Makefile.in | 563 - > tests/Makefile.in | 2848 ----- > 25 files changed, 73186 deletions(-) > > dgit (build host): error: --quilt=unapplied specified, implying > patches-unapplied git tree > dgit (build host): but git tree differs from orig in upstream files. > dgit (build host): > dgit (build host): You should be able to reproduce the problem > locally, as follows: > dgit (build host): 1. Install dgit (version 16.3; try Debian testing) > dgit (build host): 2. cd to your package's working tree > dgit (build host): 3. run the following commands > dgit (build host): git checkout debian/3.5.6-2 > dgit (build host): tag2upload-obtain-origs v=3.5.6-2 p=knot > bpd=.. s=unstable u=c410fe951569779f86147fed5ac586f8b29f2b5c > dgit (build host): dgit --build-products-dir=.. --quilt=unapplied > build-source > dgit (build host): 4. It should fail and suggest you should run > dgit (build host): git diff 7b0a6b8dd5629f326034d085df9a107a50818d54 > HEAD -- :/ ':!debian' > dgit (build host): > dgit (build host): ... debian/patches is missing; perhaps this is a > patch queue branch? > dgit: failed command: ./ssh-builder > '[email protected]' 'dgit -wn -pknot > --build-products-dir=../bpd --force-uploading-source-only > --quilt=unapplied --ssh=./ssh-builder --dgit=dgit > -k374D8CE4DB96E9CBD4C0972A606D084E4683C079 --dput:-u --package=knot > --expect-suite=unstable --expect-version=3.5.6-2 > --tag2upload-builder-mode --batch --split-view=always --new > --overwrite --t2u-upstream=upstream/3.5.6 > --t2u-upstream-commit=c410fe951569779f86147fed5ac586f8b29f2b5c > '\''--t2u-control-add=Git-Tag-Tagger=Simon Josefsson > <[email protected]>'\'' > '\''--t2u-control-add=Git-Tag-Info=tag=966a806b5e968dca5b115e8f4321f4730d49944c > fp=a3cc9c870b9d310abad4cf2f51722b08fe4745a2'\'' > remote-push-source-build-host 2 > /srv/builder.tag2upload.debian.org/tmp/autopkgtest-virt-docker.shared.teo1pjuj/downtmp/work > '\''7,6,5,4'\''' > > dgit: error: subprocess failed with error exit status 253 > ! Push failed, before we got started. > t2u processor [dgit-repos-server]: failed command: dgit -wn -pknot > --build-products-dir=../bpd --force-uploading-source-only > --quilt=unapplied --ssh=./ssh-builder --dgit=dgit > -k374D8CE4DB96E9CBD4C0972A606D084E4683C079 --dput:-u --package=knot > --expect-suite=unstable --expect-version=3.5.6-2 > --tag2upload-builder-mode --split-view=always --new --trust-changelog > --t2u-upstream=upstream/3.5.6 > --t2u-upstream-commit=c410fe951569779f86147fed5ac586f8b29f2b5c > '--t2u-control-add=Git-Tag-Tagger=Simon Josefsson > <[email protected]>' > '--t2u-control-add=Git-Tag-Info=tag=966a806b5e968dca5b115e8f4321f4730d49944c > fp=a3cc9c870b9d310abad4cf2f51722b08fe4745a2' rpush-source > '[email protected]:/srv/builder.tag2upload.debian.org/tmp/autopkgtest-virt-docker.shared.teo1pjuj/downtmp/work' > > t2u processor [dgit-repos-server]: error: subprocess failed with error > exit status 255 > > object ceee328da0201e94c07410c4056c50a6a5d37b7a > type commit > tag debian/3.5.6-2 > tagger Simon Josefsson <[email protected]> 1786086444 +0200 > > knot release 3.5.6-2 for unstable > > [dgit please-upload source=knot version=3.5.6-2] > [dgit distro=debian split --quilt=unapplied] > [dgit upstream-tag=upstream/3.5.6 > upstream=c410fe951569779f86147fed5ac586f8b29f2b5c > !pristine-tar=57f24716d6f9e29e2c6de861eb63ec60297b4db9] > -----BEGIN PGP SIGNATURE----- > > iQNTBAAWCgL7FiEEo8ychwudMQq61M8vUXIrCP5HRaIFAmp1hCzCHCYAmDMEXJLO > tBYJKwYBBAHaRw8BAQdACIcrZIvhrxDBkK9fV+QlTmXxo2naObDuGtw58YaxlOu0 > JVNpbW9uIEpvc2Vmc3NvbiA8c2ltb25Aam9zZWZzc29uLm9yZz6IlgQTFggAPgIb > AwULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgBYhBLHSvRN1vst4TPT4xNc89jjFPAa+ > BQJp4fWRBQkOa+rdAAoJENc89jjFPAa+hWIA/1lQvrJeGlQq50lP6tm99D1zDy7J > 1tQ3ha4x0Jx7rkFTAP9hpUKuTvm6m1fXyiZVYZlu2+Id/Dq3CIAZvNF+XEr2BLgz > BFySz4EWCSsGAQQB2kcPAQEHQOxTCIOaeXAxI2hIX4HK9bQTpNVei708oNr1Klm8 > qCGKiPUEGBYIACYCGwIWIQSx0r0Tdb7LeEz0+MTXPPY4xTwGvgUCaeCW1wUJDmqL > VgCBdiAEGRYIAB0WIQSjzJyHC50xCrrUzy9RcisI/kdFogUCXJLPgQAKCRBRcisI > /kdFoqdMAQCgH45aseZgIrwKOvUOA9QfsmeE8GZHYNuFHmM9FEQS6AD6A4x5aYvo > Y6lo98pgtw2HPDhmcCXFItjXCrV4A0GmJA4JENc89jjFPAa+s7AA+gIIHpBApDpc > Dj1sKhzDngmpvwQf0VkHme6s+EG7qSgpAQDe/XMrU0c0Pa3ji85cMqZhvzJOFI/s > oe662lzL0QY3Bbg4BFySz2oSCisGAQQBl1UBBQEBB0AxlRumDW6nZY7A+VCfek9V > pEx6PJmdJyYPt3lNHMd6HAMBCAeIfgQYFggAJgIbDBYhBLHSvRN1vst4TPT4xNc8 > 9jjFPAa+BQJp4JbXBQkOaottAAoJENc89jjFPAa+RNUA/2faQO/nFT06E+MlhlQd > o/0chlQXC5TZMPTVvVBFwoLOAP9xLJK0ow5EjTzYJB4K810AL/Iv6PEOAEgA4cPT > HVlbCQAKCRBRcisI/kdForEkAQD5dl1UrNNqHztLIdN7fdafU9U1jbCm2ASEccO8 > PP2aDwD6AlctS97d/lwwvSTsBwCM38wfXvvfYiM0Eei/al+7TgY= > =E2ut > -----END PGP SIGNATURE----- > > #!/bin/sh > # ** autogenerated for t2u job 5733 ** > # by dgit-repos-server tag2upload_hide_builder_rune_in_attachment. > # > # ssh wrapper, embodying runes to to enter builder VM from the builder host. > # See TAG2UPLOAD-DESIGN.txt. > > set -e > export GIT_SSH_COMMAND='ssh -oBatchMode=yes -oConnectTimeout=30 > -oServerAliveInterval=120 -oServerAliveCountMax=8 > -oConnectionAttempts=10' > host="$1"; shift > exec ssh -oBatchMode=yes "$host" 'podman exec -i > 90cb84a7ba76778fd7b08bb81de9acf6e4f1048a2f02d2258e2ce786f67846d9 env > -i bash -c '\''set -a; [ -r /etc/environment ] && . /etc/environment > 2>/dev/null || true; [ -r /etc/default/locale ] && > . /etc/default/locale 2>/dev/null || true; [ -r /etc/profile ] && > . /etc/profile 2>/dev/null || true; set +a;"$@"; RC=$?; [ $RC != 255 ] > || RC=253; set -e;myout=$(readlink /proc/$$/fd/1);myerr=$(readlink > /proc/$$/fd/2);myout="${myout/[/'\'''\\''\\''\'''\'''\\''\\''\''[}"; > myout="${myout/]/'\'''\\''\\''\'''\'''\\''\\''\'']}";myerr="${myerr/[/'\'''\\''\\''\'''\'''\\''\\''\''[}"; > myerr="${myerr/]/'\'''\\''\\''\'''\'''\\''\\''\'']}";PS=$(ls -l > /proc/[0-9]*/fd/* 2>/dev/null | sed -nr > '\'''\\''\'''\'''\'''\\''\\''\''#('\'''\\''\'''\''"$myout"'\'''\\''\'''\''|'\'''\\''\'''\''"$myerr"'\'''\\''\'''\'')# > { s#^.*/proc/([0-9]+)/.*$#'\'''\\''\\''\''1#; p}'\'''\\''\'''\''|sort > -u);KILL="";for pid in $PS; do [ $pid -ne $$ ] && [ $pid -ne $PPID ] > || continue; KILL="$KILL $pid";done;[ -z "$KILL" ] || kill -9 $KILL >>/dev/null 2>&1 || true;exit $RC'\'' -- su - builder -- -ec '\''exec > "$@";x'\'' --' "$@" >
signature.asc
Description: PGP signature
