summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Rosengren <robert.rosengren@stericsson.com>2011-02-07 15:49:50 +0100
committerMichael BRANDT <michael.brandt@stericsson.com>2011-02-09 12:34:42 +0100
commitb165b6d89e45961d08a32a9476b81b6d888b566c (patch)
tree80aa774c5ae228d62614f65fcb8ba6601ad6c214
parente663de63c2e94465741c26ff80d5fe5cc24e8d8e (diff)
[MEEGO] Adapt .git2obs to new setlocalversion
.git2obs passes version to setlocalversion to get correct git version, i.e. from latest real u-boot tag and not the in-house repo tags. ST-Ericsson ID: None ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I1ea64bbd70cb929fc5ddccf2ddff3161d370094a Signed-off-by: Robert Rosengren <robert.rosengren@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/14579 Reviewed-by: QATOOLS Reviewed-by: Michael BRANDT <michael.brandt@stericsson.com>
-rwxr-xr-x.git2obs4
1 files changed, 3 insertions, 1 deletions
diff --git a/.git2obs b/.git2obs
index dbe129c0e..f1217bc20 100755
--- a/.git2obs
+++ b/.git2obs
@@ -12,6 +12,8 @@ fi
# Grab archive name
+MODULE_NAME=$(rpm --eval "$(head -n 200 $SPEC)" | grep -r "^Name:" | sed -re 's/.*?:[\t ]+(.*?)[\t ]*/\1/g')
+MODULE_VERSION=$(rpm --eval "$(head -n 200 $SPEC)" | grep -r "^Version:" | sed -re 's/.*?:[\t ]+(.*?)[\t ]*/\1/g')
MODULE_ARCHIVE_NAME=$(basename "$(rpm --eval "$(head -n 200 $SPEC)" | grep -r "^Source0:" | sed -re 's/.*?:[\t ]+(.*?)[\t ]*/\1/g')")
[ -z $MODULE_ARCHIVE_NAME ] && MODULE_ARCHIVE_NAME=$(basename "$(rpm --eval "$(head -n 200 $SPEC)" | grep -r "^Source:" | sed -re 's/.*?:[\t ]+(.*?)[\t ]*/\1/g')")
MODULE_ARCHIVE_NAME="$(echo "$MODULE_ARCHIVE_NAME" | sed -e "s|%{name}|$MODULE_NAME|" -e "s|%{version}|$MODULE_VERSION|")"
@@ -32,4 +34,4 @@ fi
#Generate git version file
TOPDIR="`pwd`"
-$TOPDIR/tools/setlocalversion $TOPDIR > $TEMP_DIR/localversion-meegobuild
+$TOPDIR/tools/setlocalversion $TOPDIR v$MODULE_VERSION> $TEMP_DIR/localversion-meegobuild