[v2] scripts/make-release: Don't archive .git files

[Qemu-devel] [PATCH v2] scripts/make-release: Don't archive .git files

Cole Robinson posted 1 patch 7 years, 9 months ago

Diff against v3
Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/00583a19439a026a47fcb4d12cb185130347c636.1515275715.git.crobinso@redhat.com

Test checkpatch passed

Test docker passed

Test ppc passed

Test s390x passed

There is a newer version of this series

scripts/make-release | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Expand all Fold all

[Qemu-devel] [PATCH v2] scripts/make-release: Don't archive .git files

Posted by Cole Robinson 7 years, 9 months ago

As was last done in 379e21c25, we don't want .git files for
submodules here, which we aren't presently doing for capstone and
keycodemapdb.

Rather than delete the offending files before archiving, ask tar
to --exclude=.git

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
v2:
    Use armbru's --exclude suggestion, requires tweaking
    existing tar options a bit.

 scripts/make-release | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/make-release b/scripts/make-release
index 3917df7142..7cbce29475 100755
--- a/scripts/make-release
+++ b/scripts/make-release
@@ -19,11 +19,10 @@ pushd ${destination}
 git checkout "v${version}"
 git submodule update --init
 (cd roms/seabios && git describe --tags --long --dirty > .version)
-rm -rf .git roms/*/.git dtc/.git pixman/.git
 # FIXME: The following line is a workaround for avoiding filename collisions
 # when unpacking u-boot sources on case-insensitive filesystems. Once we
 # update to something with u-boot commit 610eec7f0 we can drop this line.
 tar cfj roms/u-boot.tar.bz2 -C roms u-boot && rm -rf roms/u-boot
 popd
-tar cfj ${destination}.tar.bz2 ${destination}
+tar --exclude=.git -cjf ${destination}.tar.bz2 ${destination}
 rm -rf ${destination}
-- 
2.14.3

Re: [Qemu-devel] [PATCH v2] scripts/make-release: Don't archive .git files

Posted by Thomas Huth 7 years, 9 months ago

On 06.01.2018 22:56, Cole Robinson wrote:
> As was last done in 379e21c25, we don't want .git files for
> submodules here, which we aren't presently doing for capstone and
> keycodemapdb.
> 
> Rather than delete the offending files before archiving, ask tar
> to --exclude=.git
> 
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---
> v2:
>     Use armbru's --exclude suggestion, requires tweaking
>     existing tar options a bit.
> 
>  scripts/make-release | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/scripts/make-release b/scripts/make-release
> index 3917df7142..7cbce29475 100755
> --- a/scripts/make-release
> +++ b/scripts/make-release
> @@ -19,11 +19,10 @@ pushd ${destination}
>  git checkout "v${version}"
>  git submodule update --init
>  (cd roms/seabios && git describe --tags --long --dirty > .version)
> -rm -rf .git roms/*/.git dtc/.git pixman/.git
>  # FIXME: The following line is a workaround for avoiding filename collisions
>  # when unpacking u-boot sources on case-insensitive filesystems. Once we
>  # update to something with u-boot commit 610eec7f0 we can drop this line.
>  tar cfj roms/u-boot.tar.bz2 -C roms u-boot && rm -rf roms/u-boot

What about the above tar command? Shouldn't this get the --exclude=.git
as well?

>  popd
> -tar cfj ${destination}.tar.bz2 ${destination}
> +tar --exclude=.git -cjf ${destination}.tar.bz2 ${destination}
>  rm -rf ${destination}

 Thomas