diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index 020d33e588..b6268212d5 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -89,8 +89,7 @@ for sp in $subprojects; do done git rev-parse HEAD 2>/dev/null | tr -d '\n' > XEMU_COMMIT -git symbolic-ref --short HEAD > XEMU_BRANCH git describe --tags --match 'v*' | cut -c 2- | tr -d '\n' > XEMU_VERSION -tar -r --file "$tar_file" XEMU_COMMIT XEMU_BRANCH XEMU_VERSION +tar -r --file "$tar_file" XEMU_COMMIT XEMU_VERSION exit 0 diff --git a/scripts/xemu-version.sh b/scripts/xemu-version.sh index 0e5b827acc..906330fcdc 100755 --- a/scripts/xemu-version.sh +++ b/scripts/xemu-version.sh @@ -11,13 +11,6 @@ XEMU_COMMIT=$( \ elif test -e XEMU_COMMIT; then \ cat XEMU_COMMIT; \ fi) -XEMU_BRANCH=$( \ - cd "$dir"; \ - if test -e .git; then \ - git symbolic-ref --short HEAD || echo $XEMU_COMMIT; \ - elif test -e XEMU_BRANCH; then \ - cat XEMU_BRANCH; \ - fi) XEMU_VERSION=$( \ cd "$dir"; \ if test -e .git; then \ @@ -49,7 +42,6 @@ cat <