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 090F81389F5 for ; Sun, 16 Nov 2014 07:44:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D6C9E094B; Sun, 16 Nov 2014 07:44:24 +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 ECB5FE094E for ; Sun, 16 Nov 2014 07:44:21 +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 3672D3402FB for ; Sun, 16 Nov 2014 07:44:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D715FA3C7 for ; Sun, 16 Nov 2014 07:44:18 +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: <1416123119.982c5145b50d15e4444755f9ff09f8f24d1aac59.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: 982c5145b50d15e4444755f9ff09f8f24d1aac59 X-VCS-Branch: master Date: Sun, 16 Nov 2014 07:44:18 +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: 6594961c-bb13-4a83-9cb7-998e30094d73 X-Archives-Hash: 0a064840f3eea30c6215a3ce93fec5c1 commit: 982c5145b50d15e4444755f9ff09f8f24d1aac59 Author: Yuta SATOH gentoo gr jp> AuthorDate: Sun Nov 16 07:31:59 2014 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Sun Nov 16 07:31:59 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=982c5145 stages_builder.sh: When check_ecompressdir fails, set update_seed=no --- scripts/mkstages/stages_builder.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh index d95eb85..856742a 100755 --- a/scripts/mkstages/stages_builder.sh +++ b/scripts/mkstages/stages_builder.sh @@ -236,6 +236,9 @@ run_catalyst() { if [ $? -ne 0 ] ; then check_ecompressdir "${C_TARGET}-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION}/usr/local/portage" if [ $? -ne 0 ] ; then + if [ "${C_TARGET}" = "stage1" ] && [ "${C_SOURCE}" != "stage3-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION}" ]; then + C_APPEND_OPT="${C_APPEND_OPT} update_seed=no" + fi catalyst -C target=${C_TARGET} version_stamp=fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION} profile=default/bsd/fbsd/${TARGETARCH}/${TARGETVER}${C_APPEND_PROFILE} snapshot=${WORKDATE} source_subpath=default/${C_SOURCE} subarch=${TARGETSUBARCH} rel_type=default portage_overlay=${WORKDIR}/gentoo-bsd ${C_APPEND_OPT} || exit 1 fi fi