diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-05 15:51:34 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-05 16:53:53 -0400 |
| commit | 42bed116b411eb25ebd8368b2b4ed6c56ffd85e7 (patch) | |
| tree | 60af1c21adda46878ccf9a0c6ab1b3640fa61a4a /tools/make-tarball | |
| parent | 10f82bd474c5bc91b330beccd883da06b0014a99 (diff) | |
| download | vyos-cloud-init-42bed116b411eb25ebd8368b2b4ed6c56ffd85e7.tar.gz vyos-cloud-init-42bed116b411eb25ebd8368b2b4ed6c56ffd85e7.zip | |
drop modification of version during make-tarball, tools changes.
Modification of the tarball became problematic, as it meant that
any tool extracting source would find the orig source tarball different.
I found this unusable when trying to use 'gbp buildpackage'.
Other changes here are to better support using python3 or python2
for the build. Makefile will try to call the right python version
and can be told which python to use.
read-version: by adding 'tiny_p' and avoiding the import of
cloudinit.util, we need less dependencies to run this.
Diffstat (limited to 'tools/make-tarball')
| -rwxr-xr-x | tools/make-tarball | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/make-tarball b/tools/make-tarball index bd7399c1..57358447 100755 --- a/tools/make-tarball +++ b/tools/make-tarball @@ -62,11 +62,5 @@ if [ "$rev" = HEAD ] && ! git diff-index --quiet HEAD --; then fi fi -git archive --format=tar --prefix="$archive_base/" "$rev" | - ( cd "$TEMP_D" && tar xpf - ) - -sed -i "s,@@EXPORT_VERSION@@,$version," "$archive_base/cloudinit/version.py" - -( cd "$TEMP_D" && tar cpzf - "$archive_base/" ) > "$output" - +git archive --format=tar.gz --prefix="$archive_base/" "$rev" > "$output" echo "$output" |