build/core: small tweak to avoid trashing the second branch

This commit is contained in:
Franco Fichtner 2015-08-10 10:33:35 +02:00
parent 613a63a5a1
commit b27c205126
2 changed files with 2 additions and 1 deletions

View File

@ -205,6 +205,7 @@ setup_copy()
echo ">>> Setting up ${2} copy in ${1}"
# in case we want to clobber HEAD
rm -rf ${1}${2}
mkdir -p $(dirname ${1}${2})
cp -r ${2} ${1}${2}
}

View File

@ -37,7 +37,6 @@ if [ -z "${*}" ]; then
setup_clone ${STAGEDIR} ${COREDIR}
CORE_TAGS="bogus"
else
setup_copy ${STAGEDIR} ${COREDIR}
CORE_TAGS="${*}"
fi
@ -45,6 +44,7 @@ extract_packages ${STAGEDIR}
for CORE_TAG in ${CORE_TAGS}; do
if [ -n "${*}" ]; then
setup_copy ${STAGEDIR} ${COREDIR}
git_checkout ${STAGEDIR}${COREDIR} ${CORE_TAG}
fi
CORE_NAME=$(make -C ${STAGEDIR}${COREDIR} name)