diff options
| author | Simo Fält <simo.falt@nokia.com> | 2012-07-10 08:55:57 +0300 |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2012-07-11 05:50:09 +0200 |
| commit | f3fb1854e4a19592e59313159e90979bc98be60e (patch) | |
| tree | 0a5a2455c533862fdf5d26261c97ecae48555712 | |
| parent | fd1cc6ce5b91c8baf6ad66763bebb788cfc14995 (diff) | |
Fixing mksrc.sh to update the sha1 values correctly.
The mksrc.sh didn't cleanup possible old files containing sha1
values. Also removed unnecessary move of submodules.txt.
Change-Id: I24d71caf0167911003f8bb6eaf07c0fd227fc224
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| -rwxr-xr-x | release-tools/mksrc.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/release-tools/mksrc.sh b/release-tools/mksrc.sh index 15e35d7..1c26320 100755 --- a/release-tools/mksrc.sh +++ b/release-tools/mksrc.sh @@ -174,6 +174,7 @@ tar xzf $BIG_TAR rm -f $BIG_TAR cd $REPO_DIR _SHA=`cat .git/refs/heads/master` +rm -f $_TMP_DIR/$QTGITTAG echo "qt5=$_SHA">$_TMP_DIR/$QTGITTAG #archive all the submodules and generate file from sha1's @@ -199,7 +200,7 @@ while read submodule; do rm -f $_file cd $REPO_DIR done < $MODULES -mv $MODULES $CUR_DIR +#mv $MODULES $CUR_DIR #------------------------------------------------------------------ # Step 2, remove rest of the unnecessary files and ignored submodules @@ -240,10 +241,10 @@ while read submodule; do echo "------------------------------------------------------------------------">>$CUR_DIR/_tmp_shas fi __skip_sub=no -done < $CUR_DIR/$MODULES -cat $CUR_DIR/_tmp_mod > $CUR_DIR/$MODULES +done < $MODULES +cat $CUR_DIR/_tmp_mod > $MODULES +rm -f $CUR_DIR/$PACKAGE_NAME/$QTGITTAG cat $CUR_DIR/_tmp_shas > $CUR_DIR/$PACKAGE_NAME/$QTGITTAG - #------------------------------------------------------------------ # Step 3, replace version strings with correct version, and # patch Qt_PACKAGE_TAG and QT_PACKAGEDATE_STR defines |