diff options
| author |   Yuta SATOH <nigoro.dev@gmail.com> | 2016-04-02 20:36:34 +0900 |
|---|---|---|
| committer | Yuta SATOH <nigoro.dev@gmail.com> | 2016-04-02 20:36:34 +0900 |
| commit | 760a00260e75654e5819f33eae67fa70466284cb (patch) | |
| tree | 831e095a69faa1d4c5db72f188b37debcddad785 | |
| parent | Ready to 10.3 (diff) | |
| download | gentoo-bsd-760a00260e75654e5819f33eae67fa70466284cb.tar.gz gentoo-bsd-760a00260e75654e5819f33eae67fa70466284cb.tar.bz2 gentoo-bsd-760a00260e75654e5819f33eae67fa70466284cb.zip | |
stages_builder.sh: update for catalyst 3.0_rc
| -rwxr-xr-x | scripts/mkstages/stages_builder.sh | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh index f8e4a79..964e41e 100755 --- a/scripts/mkstages/stages_builder.sh +++ b/scripts/mkstages/stages_builder.sh @@ -86,9 +86,11 @@ prepare(){ fi fi - echo "emerging catalyst..." - PORTDIR_OVERLAY=${WORKDIR}/gentoo-bsd ACCEPT_KEYWORDS=~x86-fbsd emerge -uq app-cdr/cdrtools app-text/build-docbook-catalog || exit 1 - PORTDIR_OVERLAY=${WORKDIR}/gentoo-bsd ACCEPT_KEYWORDS=~x86-fbsd emerge -q dev-util/catalyst::gentoo-bsd || exit 1 + if [[ ! -e /usr/bin/catalyst ]] ; then + echo "emerging catalyst..." + PORTDIR_OVERLAY=${WORKDIR}/gentoo-bsd ACCEPT_KEYWORDS=~x86-fbsd emerge -uq app-cdr/cdrtools app-text/build-docbook-catalog || exit 1 + PORTDIR_OVERLAY=${WORKDIR}/gentoo-bsd ACCEPT_KEYWORDS=~x86-fbsd emerge -q dev-util/catalyst::gentoo-bsd || exit 1 + fi if [ ! -e /usr/portage/profiles/releases/freebsd-${TARGETVER} ] ; then echo "prepare new ${TARGETVER} profiles" @@ -164,9 +166,6 @@ 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}" ] && [[ ! "${C_SOURCE}" =~ .*forcestage3.* ]]; then - echo "update_seed: yes" >> "${specfile}" - fi if [ "${C_TARGET}" != "stage3" ] ; then echo "chost: ${CATALYST_CHOST}" >> "${specfile}" fi @@ -201,9 +200,6 @@ 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 -f "${specfile}" ${C_APPEND_OPT} fi fi |