From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D0063138D03 for ; Sun, 12 Jul 2015 04:43:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38B6C14020; Sun, 12 Jul 2015 04:43:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D73314012 for ; Sun, 12 Jul 2015 04:43:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0F5A340861 for ; Sun, 12 Jul 2015 04:43:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CB03753 for ; Sun, 12 Jul 2015 04:43:30 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1436673396.6bb2b0d6c1f288c71cf95941e06efc4d75031563.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: scripts/mkstages/stages_builder.sh X-VCS-Directories: scripts/mkstages/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 6bb2b0d6c1f288c71cf95941e06efc4d75031563 X-VCS-Branch: master Date: Sun, 12 Jul 2015 04:43:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e1ee7011-225e-4d42-ba7c-b19b7ea971f1 X-Archives-Hash: 13accc4eaef99e098899a2c5d98d02ae commit: 6bb2b0d6c1f288c71cf95941e06efc4d75031563 Author: Yuta SATOH gentoo gr jp> AuthorDate: Sun Jul 12 03:56:36 2015 +0000 Commit: Yuta SATOH gentoo gr 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