From 78b0675837d15f4f2561bb2ce9b0488be38aae59 Mon Sep 17 00:00:00 2001 From: David van Moolenbroek Date: Fri, 11 Oct 2013 20:38:45 +0200 Subject: [PATCH] release.sh: SVN to GIT updates - exclude .git instead of .svn when using local source (-c); - put the git tag (or "copy") in /etc/version rather than something outdated related to SVN. Change-Id: Ia35eb95c39ae93ebae5638c9dd7847428593b813 --- releasetools/release.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/releasetools/release.sh b/releasetools/release.sh index b27117847..7a951f843 100755 --- a/releasetools/release.sh +++ b/releasetools/release.sh @@ -194,10 +194,9 @@ else ( cd .. && make cleandir >/dev/null ) echo "Copying contents from current src dir." srcdir=/usr/$SRC - ( cd $srcdir && tar --exclude .svn -cf - . ) | ( cd $RELEASEDIR/usr && mkdir $SRC && cd $SRC && tar xf - ) + ( cd $srcdir && tar --exclude .git -cf - . ) | ( cd $RELEASEDIR/usr && mkdir $SRC && cd $SRC && tar xf - ) echo "Copying done." REVTAG=copy - REVISION=unknown IMG=${IMG_BASE}_copy.iso fi @@ -244,7 +243,7 @@ echo " * Removing bootstrap files" chown -R root $RELEASEDIR/usr/src* cp issue.install $RELEASEDIR/etc/issue -echo $version_pretty, SVN revision $REVISION, generated `date` >$RELEASEDIR/etc/version +echo $version_pretty, GIT revision $REVTAG, generated `date` >$RELEASEDIR/etc/version rm -rf $RELEASEDIR/tmp/* if [ $MINIMAL -ne 0 ]