diff options
| author |   Yuta SATOH <nigoro@gentoo.gr.jp> | 2012-08-23 23:44:51 +0900 |
|---|---|---|
| committer | Yuta SATOH <nigoro@gentoo.gr.jp> | 2012-08-23 23:44:51 +0900 |
| commit | 11c05eab40e8ee93718525790772a5550bd7f20c (patch) | |
| tree | 35fb5e930e2d945b46a36e687b1fdcf1322596a0 /scripts/mkstages | |
| parent | rename 9.1_beta1 --> 9.1_rc1.ebuild, tested upgrade from 9.1_beta1 on amd64-f... (diff) | |
| download | gentoo-bsd-11c05eab40e8ee93718525790772a5550bd7f20c.tar.gz gentoo-bsd-11c05eab40e8ee93718525790772a5550bd7f20c.tar.bz2 gentoo-bsd-11c05eab40e8ee93718525790772a5550bd7f20c.zip | |
fixes so that x86-fbsd stage files can be created on amd64-fbsd
Diffstat (limited to 'scripts/mkstages')
| -rwxr-xr-x | scripts/mkstages/stages_builder.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh index 9160347..97bdb1c 100755 --- a/scripts/mkstages/stages_builder.sh +++ b/scripts/mkstages/stages_builder.sh @@ -89,7 +89,6 @@ prepare(){ do cd ${dir} gsed -i "/${TARGETVER}/d" Manifest - rm *8.1*.ebuild ls -1 *.ebuild > /dev/null 2>&1 if [ $? -eq 0 ] ; then @@ -175,13 +174,17 @@ mk_stages(){ catalyst -C target=stage3 version_stamp=fbsd-${TARGETVER}-${WORKDATE} profile=default/bsd/fbsd/${TARGETARCH}/${TARGETVER} snapshot=${WORKDATE} source_subpath=default/stage2-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE} subarch=${TARGETSUBARCH} rel_type=default portage_overlay=${WORKDIR}/portage.bsd-overlay chost=${CATALYST_CHOST} || exit 1 } -prepare +prepare $1 + if [ ! -e "/var/tmp/catalyst/snapshots/portage-${WORKDATE}.tar.bz2" ] ; then catalyst -C target=snapshot version_stamp=${WORKDATE} || exit 1 fi -if [ ! -e /var/tmp/catalyst/builds/default/stage3tmp-${TARGETSUBARCH}-freebsd-${TARGETVER}.tar.bz2 ] && [ "${OLDVER}" != "${TARGETVER}" ] ; then + +if [ ! -e "/var/tmp/catalyst/builds/default/stage3tmp-${TARGETSUBARCH}-freebsd-${TARGETVER}.tar.bz2" ] && [ "${OLDVER}" != "${TARGETVER}" ] ; then upgrade_src_stage3 + echo "upgrade done" fi + mk_stages_tmp mk_stages |