| Message ID | 2a250f8d59f1eedd7728d94a9dae1a6de54d0c14.1517340741.git.crobinso@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] scripts/make-release: Don't archive .git files | expand |
On 30.01.2018 20:33, 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. > > v3: > thuth's suggestion to use --exclude for both tar commands > > scripts/make-release | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/scripts/make-release b/scripts/make-release > index 3917df7142..04fa9defdc 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 Thanks, this also fixes the dead pixman/.git path :-) Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/scripts/make-release b/scripts/make-release index 3917df7142..04fa9defdc 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 +tar --exclude=.git -cjf 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}
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. v3: thuth's suggestion to use --exclude for both tar commands scripts/make-release | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)