Re: Re: live-boot + FAI fails
Hi,
I tried to bisect the individual commits, however I did not manage
to build the package. I am not yet familliar with git-buildpackage,
perhaps someone can give me a hint what I got wrong. The error seems
do boil down to the message "error: aborting due to unexpected
upstream changes"
Find below the command sequence I used and the resulting output.
Thanks in advance and best regards,
Andi
git clone git://live.debian.net/git/live-boot.git
cd live-boot
git bisect start
git bisect good 1c158e15ba2d4b2e9cb1660243
git bisect bad 8e5f30cd75feedd2ccbb56
git-buildpackage --git-ignore-new --git-ignore-branch --git-upstream-branch=origin/upstream -us -uc
root@wheezy:~/live-boot# git-buildpackage --git-ignore-new --git-ignore-branch --git-upstream-branch=origin/upstream -us -uc
dh clean
dh_testdir
dh_auto_clean
make[1]: Entering directory `/root/live-boot'
Nothing to clean.
Nothing to distclean.
make[1]: Leaving directory `/root/live-boot'
dh_clean
fatal: ref HEAD is not a symbolic ref
gbp:info: live-boot_3.0~a26.orig.tar.gz does not exist, creating from 'upstream/3.0_a26'
dpkg-buildpackage -rfakeroot -D -us -uc -i -I
dpkg-buildpackage: warning: using a gain-root-command while being root
dpkg-buildpackage: source package live-boot
dpkg-buildpackage: source version 3.0~a26-1
dpkg-buildpackage: source changed by Daniel Baumann <daniel@debian.org>
dpkg-source -i -I --before-build live-boot
dpkg-buildpackage: host architecture amd64
dpkg-source: info: using options from live-boot/debian/source/options: --compression=gzip --compression-level=9
fakeroot debian/rules clean
dh clean
dh_testdir
dh_auto_clean
make[1]: Entering directory `/root/live-boot'
Nothing to clean.
Nothing to distclean.
make[1]: Leaving directory `/root/live-boot'
dh_clean
dpkg-source -i -I -b live-boot
dpkg-source: info: using options from live-boot/debian/source/options: --compression=gzip --compression-level=9
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building live-boot using existing ./live-boot_3.0~a26.orig.tar.gz
dpkg-source: warning: ignoring deletion of file manpages/po/de/live.persist.5.po
dpkg-source: warning: ignoring deletion of file manpages/en/live.persist.5
dpkg-source: warning: ignoring deletion of file manpages/de/live.persist.5.de.persist
dpkg-source: warning: ignoring deletion of file manpages/pot/live.persist.5.pot
dpkg-source: warning: ignoring deletion of file scripts/live-bottom/24preseed
dpkg-source: warning: ignoring deletion of file scripts/live-bottom/30accessibility
dpkg-source: info: local changes detected, the modified files are:
live-boot/bin/live-snapshot
live-boot/hooks/live
live-boot/manpages/Makefile
live-boot/manpages/de/live-boot.de.7
live-boot/manpages/de/live-persistence.conf.de.5
live-boot/manpages/de/live-snapshot.de.1
live-boot/manpages/en/live-boot.7
live-boot/manpages/en/live-persistence.conf.5
live-boot/manpages/en/live-snapshot.1
live-boot/manpages/po/de/live-boot.7.po
live-boot/manpages/po/de/live-persistence.conf.5.po
live-boot/manpages/po/de/live-snapshot.1.po
live-boot/manpages/po4a.cfg
live-boot/manpages/pot/live-boot.7.pot
live-boot/manpages/pot/live-persistence.conf.5.pot
live-boot/manpages/pot/live-snapshot.1.pot
live-boot/scripts/live
live-boot/scripts/live-bottom/08persistence_excludes
live-boot/scripts/live-bottom/12fstab
live-boot/scripts/live-helpers
dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/live-boot_3.0~a26-1.diff.OpCSZk
dpkg-source: info: you can integrate the local changes with dpkg-source --commit
dpkg-buildpackage: error: dpkg-source -i -I -b live-boot gave error exit status 2
debuild: fatal error at line 1357:
dpkg-buildpackage -rfakeroot -D -us -uc -i -I failed
gbp:error: Couldn't run 'debuild -i -I -us -uc': debuild -i -I returned 29
Reply to: