[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/

[Yuta SATOH]

commit:     6bb2b0d6c1f288c71cf95941e06efc4d75031563
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Jul 12 03:56:36 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Jul 12 03:56:36 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=6bb2b0d6

stages_builder.sh: When it contains forcestage3 in FORCESTAGE3, disables 
update_seed.

 scripts/mkstages/stages_builder.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/mkstages/stages_builder.sh 
b/scripts/mkstages/stages_builder.sh
index 3414edb..f8e4a79 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -66,10 +66,10 @@ prepare(){
                cp -a "${HOME}/gentoo-bsd" ${WORKDIR}/
        else
                echo "Clone gentoo-bsd overlay snapshot..."
-               type -P git
-               [[ $? -ne 0 ]] && emerge git
-               git clone git://anongit.gentoo.org/proj/gentoo-bsd.git
+               wget -q -O "${WORKDIR}"/gentoo-bsd.tar.gz "${OVERLAY_SNAPSHOT}"
                [[ $? -ne 0 ]] && exit 1
+               mkdir -p ${WORKDIR}/gentoo-bsd
+               tar xzf "${WORKDIR}"/gentoo-bsd.tar.gz --strip-components=1 -C 
"${WORKDIR}/gentoo-bsd"
        fi
        if [ -n "${EXTRAOVERLAY}" ] ; then
                if [[ "${EXTRAOVERLAY}" =~ ^http ]]; then
@@ -142,7 +142,7 @@ prepare(){
 
 check_ecompressdir() {
        # dirty solution
-       # /dev is still mounted; performing auto-bind-umount... 
+       # /dev is still mounted; performing auto-bind-umount...
        local PID=`ps auxw | grep ebuild-helpers/ecompressdir | grep -v grep | 
awk '{ print $2 }' | xargs`
        if [ -n "${PID}" ] ; then
                echo "kill ecompressdir"
@@ -164,7 +164,7 @@ run_catalyst() {
                local specfile="${WORKDIR}/${C_TARGET}.spec"
                [[ -e "${specfile}" ]] && rm "${specfile}"
 
-               if [ "${C_TARGET}" = "stage1" ] && [ "${C_SOURCE}" != 
"stage3-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION}" 
]; then
+               if [ "${C_TARGET}" = "stage1" ] && [ "${C_SOURCE}" != 
"stage3-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION}" 
] && [[ ! "${C_SOURCE}" =~ .*forcestage3.* ]]; then
                        echo "update_seed: yes" >> "${specfile}"
                fi
                if [ "${C_TARGET}" != "stage3" ] ; then
@@ -190,9 +190,12 @@ run_catalyst() {
                        source_subpath: default/${C_SOURCE}
                        subarch: ${TARGETSUBARCH}
                        rel_type: default
-                       portage_overlay: ${WORKDIR}/gentoo-bsd
                _EOF_
 
+               if [ ! -n "${NOOVERLAY}" ] ; then
+                       echo "portage_overlay: ${WORKDIR}/gentoo-bsd" >> 
"${specfile}"
+               fi
+
                catalyst -f "${specfile}"
 
                if [ $? -ne 0 ] ; then