| 2020-07-16 16:11:12 |
Dan Streetman |
description |
[impact]
when building with git-ubuntu checkout of qemu, the bionic package contains a file in the orig tarball 'ui/keycodemapdb/.git', however since git doesn't allow having dirs/files named '.git' it's renamed to '..git' in git-ubuntu.
Unfortunately, this introduces an expected change to the source, which fails the build, e.g.:
dpkg-source: info: using options from 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.11+dfsg.orig.tar.xz
dpkg-source: info: local changes detected, the modified files are:
qemu/ui/keycodemapdb/..git
dpkg-source: info: you can integrate the local changes with dpkg-source --commit
dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/qemu_2.11+dfsg-1ubuntu7.28.diff.jFgC6Q
dpkg-buildpackage: error: dpkg-source -b qemu subprocess returned exit status 2
[test case]
use git-ubuntu to checkout qemu, and change to pkg/ubuntu/bionic-devel. Then, due to bug 1887535, move the top-level '.git' dir out of the way (e.g. 'mv .git ../GITDIR') and run dpkg-buildpackage, which will fail as shown in the impact section above.
[regression potential]
any regression from removing the '..git' file from the git-ubuntu tree would likely result in a failure to build; it's unlikely it would have any other effect post-build.
[scope]
this is needed only for bionic.
the original '.git' file is only in the orig tarball for bionic, not in the orig tarball for x/f/g.
[other info]
note that this is seen *only* when using source from git-ubuntu checkout, because the '.git' file contained in the orig tarball has been renamed in the git-ubuntu source. I'm not sure if git itself renamed the file, or if git-ubuntu renamed it. |
[impact]
when building with git-ubuntu checkout of qemu, the bionic package contains a file in the orig tarball 'ui/keycodemapdb/.git', however since git doesn't allow having dirs/files named '.git' it's renamed to '..git' in git-ubuntu.
Unfortunately, this introduces an expected change to the source, which fails the build, e.g.:
dpkg-source: info: using options from 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.11+dfsg.orig.tar.xz
dpkg-source: info: local changes detected, the modified files are:
qemu/ui/keycodemapdb/..git
dpkg-source: info: you can integrate the local changes with dpkg-source --commit
dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/qemu_2.11+dfsg-1ubuntu7.28.diff.jFgC6Q
dpkg-buildpackage: error: dpkg-source -b qemu subprocess returned exit status 2
[test case]
use git-ubuntu to checkout qemu, and change to pkg/ubuntu/bionic-devel. Then, due to bug 1887535, move the top-level '.git' dir out of the way (e.g. 'mv .git ../GITDIR') and run dpkg-buildpackage, which will fail as shown in the impact section above.
[regression potential]
any regression from removing the '..git' file from the git-ubuntu tree would likely result in a failure to build; it's unlikely it would have any other effect post-build.
[scope]
this is needed only for bionic.
the original '.git' file is only in the orig tarball for bionic, not in the orig tarball for x/f/g.
[other info]
note that this is seen *only* when using source from git-ubuntu checkout, because the '.git' file contained in the orig tarball has been renamed in the git-ubuntu source. I'm not sure if git itself renamed the file, or if git-ubuntu renamed it.
this is related to bug 1887535, since building from a git repo fails due to that bug also. |
|
