diff options
| -rw-r--r-- | nextgen/common-functions | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/nextgen/common-functions b/nextgen/common-functions index 2f06c6f..2b02f2d 100644 --- a/nextgen/common-functions +++ b/nextgen/common-functions @@ -2,20 +2,15 @@ LINARO_EDK2_TOOL_DIR=`dirname $0` LINARO_EDK2_UPSTREAM="ssh://git@git.linaro.org/uefi/linaro-edk2.git" LINARO_EDK2_PREP_BRANCH=release-prep TIANOCORE_EDK2_UPSTREAM="https://github.com/tianocore/edk2.git" -TIANOCORE_EDK2_SVN_UPSTREAM="https://svn.code.sf.net/p/edk2/code/trunk/edk2" check_work_dir() { - URL=`git config --get remote.origin.pushurl` - if [ $? -ne 0 ]; then - URL=`git config --get remote.origin.url` - fi - if [ $? -ne 0 ] || [ "X$URL" != "X$TIANOCORE_EDK2_UPSTREAM" ]; then - echo "#############################" >&2 - echo "Not in edk2 source directory!" >&2 - echo "#############################" >&2 - exit 1 - fi + [ -d BaseTools -a -d OvmfPkg ] && return 0 + + echo "#############################" >&2 + echo "Not in edk2 source directory!" >&2 + echo "#############################" >&2 + exit 1 } # Always invoke, for every command @@ -45,7 +40,6 @@ current_branch() fetch_tianocore() { git fetch "$TIANOCORE_EDK2_UPSTREAM" master - git sfetch || die "SVN remote not found" } fetch_linaro() @@ -58,8 +52,8 @@ checkout_prep_branch() set -e git checkout master git branch -D release-prep 2>/dev/null || true - git checkout --track linaro/release-prep git clean -fdxf # Extra f to force deletion of submodule directories + git checkout --track linaro/release-prep } reset_prep_branch() |