@christian.ehrha...@canonical.com Thanks for keeping that thread alive.
There is some confusion indeed due partly to the fact that gbp does not
appear to be widely used in your community.
If you look closely at my first post in *this* thread, you will see that I
have previously integrated the results of our past conversation on another
channel with:
echo -----------------------
echo Building debian/control
echo -----------------------
sudo -u actionmystique -H ./debian/rules debian/control
If you try *your simple workflow**, you will see that it does not work*:
# git log -1
commit e76f48435cf9d436b4bfa8fe4fb145e94b1b584b
Author: Michael Tokarev <m...@tls.msk.ru>
Date: Mon Apr 24 16:38:28 2017 +0300
9pfs-local-set-path-of-export-root-to-dot-CVE-2017-7471.patch (#860785)
# git branch
build_actionmystique
* debian-unstable
master
upstream
# ./debian/rules debian/control
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
echo '# autogenerated file, please edit debian/control-in' >
debian/control.tmp
sed -e 's/^:ubuntu://' \
-e '/^:[a-z]*:/D' debian/control-in >> debian/control.tmp
mv -f debian/control.tmp debian/control
chmod -w debian/control
# gbp buildpackage --git-debian-branch=debian-unstable
*gbp:error: upstream/2.8+dfsg is not a valid treeish*
With *my workflow, even modified by your latest comment*, we hit the same
issue described in this thread corresponding to the latest tag (
*debian/qemu_2.8+dfsg-4*):
# making sure that upstream branch is created locally
sudo -u actionmystique -H git checkout -b upstream origin/upstream
# updating local upstream
sudo -u actionmystique -H git-reset-clean-pull-checkout.sh upstream
# upating local $branch (debian-unstable here)
sudo -u actionmystique -H git-reset-clean-pull-checkout.sh $branch
echo ---------------------------
echo Checking Build Dependencies
echo ---------------------------
dpkg-check-build-dependencies.sh
echo --------
echo Building
echo --------
sudo -u actionmystique -H gbp buildpackage --git-verbose
--git-debian-branch=debian-unstable
--git-upstream-tree=BRANCH --git-upstream-branch=upstream
--git-prebuild='./debian/rules debian/control'
leads to:
...
--------
Building
--------
gbp:debug: ['git', 'rev-parse', '--show-cdup']
gbp:debug: ['git', 'rev-parse', '--is-bare-repository']
gbp:debug: ['git', 'rev-parse', '--git-dir']
gbp:debug: /bin/true [] []
gbp:debug: ['git', 'status', '--porcelain']
gbp:debug: ['git', 'symbolic-ref', 'HEAD']
gbp:debug: ['git', 'show-ref', 'refs/heads/debian-unstable']
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'HEAD']
gbp:debug: ['git', 'show-ref', 'refs/heads/pristine-tar']
gbp:debug: ['git', 'show-ref', 'refs/heads/upstream']
gbp:debug: ['git', 'ls-tree', 'upstream']
gbp:info: Creating qemu_2.8+dfsg.orig.tar.gz from 'upstream'
gbp:debug: Building upstream tarball with compression 'gzip'
gbp:debug: ./debian/rules debian/control [] []
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
dh_listpackages: cannot read debian/control: No such file or directory
echo '# autogenerated file, please edit debian/control-in' >
debian/control.tmp
sed -e 's/^:ubuntu://' \
-e '/^:[a-z]*:/D' debian/control-in >> debian/control.tmp
mv -f debian/control.tmp debian/control
chmod -w debian/control
gbp:debug: debuild -i -I [] []
dpkg-buildpackage -rfakeroot -D -us -uc -i -I
dpkg-buildpackage: info: source package qemu
dpkg-buildpackage: info: source version 1:2.8+dfsg-4
dpkg-buildpackage: info: source distribution unstable
dpkg-buildpackage: info: source changed by Michael Tokarev <m...@tls.msk.ru>
dpkg-source -i -I --before-build git-qemu
dpkg-buildpackage: info: host architecture amd64
dpkg-source: info: using options from git-qemu/debian/source/options:
--extend-diff-ignore=^dtc/|pixman/|^roms/.*/
dpkg-source: info: applying 02_kfreebsd.patch
dpkg-source: info: applying use-fixed-data-path.patch
dpkg-source: info: applying use-data-path.patch
dpkg-source: info: applying v2.8.1.diff
dpkg-source: info: applying doc-don-t-mention-memory-it-is-m.patch
dpkg-source: info: applying xhci-fix-event-queue-IRQ-handling.patch
dpkg-source: info: applying xhci-only-free-completed-transfers.patch
dpkg-source: info: applying
char-drop-data-written-to-a-disconnected-pty.patch
dpkg-source: info: applying
linux-user-fix-apt-get-update-on-linux-user-hppa.patch
dpkg-source: info: applying slirp-make-RA-build-more-flexible.patch
dpkg-source: info: applying
slirp-send-RDNSS-in-RA-only-if-host-has-an-IPv6-DNS.patch
dpkg-source: info: applying audio-ac97-add-exit-function-CVE-2017-5525.patch
dpkg-source: info: applying
audio-es1370-add-exit-function-CVE-2017-5526.patch
dpkg-source: info: applying
watchdog-6300esb-add-exit-function-CVE-2016-10155.patch
dpkg-source: info: applying
serial-fix-memory-leak-in-serial-exit-CVE-2017-5579.patch
dpkg-source: info: applying
sd-sdhci-check-transfer-mode-register-in-multi-block-CVE-2017-5987.patch
dpkg-source: info: applying
megasas-fix-guest-triggered-memory-leak-CVE-2017-5856.patch
dpkg-source: info: applying
usb-ccid-check-ccid-apdu-length-CVE-2017-5898.patch
dpkg-source: info: applying xhci-apply-limits-to-loops-CVE-2017-5973.patch
dpkg-source: info: applying
net-imx-limit-buffer-descriptor-count-CVE-2016-7907.patch
dpkg-source: info: applying
virtio-gpu-fix-resource-leak-in-virgl_cmd_resource-CVE-2017-5857.patch
dpkg-source: info: applying
usb-ohci-limit-the-number-of-link-eds-CVE-2017-6505.patch
dpkg-source: info: applying
9pfs-fix-file-descriptor-leak-CVE-2017-7377.patch
dpkg-source: info: applying
dma-rc4030-limit-interval-timer-reload-value-CVE-2016-8667.patch
dpkg-source: info: applying
9pfs-local-set-path-of-export-root-to-dot-CVE-2017-7471.patch
fakeroot debian/rules clean
dh_testdir
rm -rf qemu-build user-static-build
rm -f configure-stamp build-stamp
find scripts/ -name '*.pyc' -delete || :
dh_clean
dpkg-source -i -I -b git-qemu
dpkg-source: info: using options from git-qemu/debian/source/options:
--extend-diff-ignore=^dtc/|pixman/|^roms/.*/
dpkg-source: info: using source format '3.0 (quilt)'
dpkg-source: info: building qemu using existing ./qemu_2.8+dfsg.orig.tar.gz
patching file configure
*Hunk #1 FAILED at 3135.*
Hunk #2 succeeded at 2274 (offset -878 lines).
1 out of 2 hunks FAILED
dpkg-source: info: the patch has fuzz which is not allowed, or is malformed
dpkg-source: info: if patch '02_kfreebsd.patch' is correctly applied by
quilt, use 'quilt refresh' to update it
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -E -b -B
.pc/02_kfreebsd.patch/ --reject-file=- <
git-qemu.orig.YF8TNQ/debian/patches/02_kfreebsd.patch gave error exit
status 1
dpkg-buildpackage: error: dpkg-source -i -I -b git-qemu gave error exit
status 2
debuild: fatal error at line 1376:
dpkg-buildpackage -rfakeroot -D -us -uc -i -I failed
gbp:error: 'debuild -i -I' failed: it exited with 29
Please try it for yourself all the way to the end.
Probably worth noting I use the latest:
gbp --version
gbp 0.8.14
Regards.
Jean-Christophe
