summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuta SATOH <nigoro@gentoo.gr.jp>2012-08-23 23:46:58 +0900
committerYuta SATOH <nigoro@gentoo.gr.jp>2012-08-23 23:46:58 +0900
commit8816a0853a4f55b5d4a6f75d1fd2ae20cc63b4eb (patch)
tree3e68d4d63639d4e5ec1dbdefc9127e58120c01f3 /scripts/mkstages
parentfixes so that x86-fbsd stage files can be created on amd64-fbsd (diff)
downloadgentoo-bsd-8816a0853a4f55b5d4a6f75d1fd2ae20cc63b4eb.tar.gz
gentoo-bsd-8816a0853a4f55b5d4a6f75d1fd2ae20cc63b4eb.tar.bz2
gentoo-bsd-8816a0853a4f55b5d4a6f75d1fd2ae20cc63b4eb.zip
remove cdrtools fixed in official tree, close bug #395163
Diffstat (limited to 'scripts/mkstages')
-rwxr-xr-xscripts/mkstages/stages_builder.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh
index 97bdb1c..c422076 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -56,7 +56,7 @@ prepare(){
mv gentoo-bsd-* ${WORKDIR}/portage.bsd-overlay
echo "emerging catalyst..."
- PORTDIR_OVERLAY=${WORKDIR}/portage.bsd-overlay ACCEPT_KEYWORDS=~x86-fbsd emerge -uq =app-cdr/cdrtools-3.00 '<app-text/build-docbook-catalog-1.19' =dev-util/catalyst-2.0.10.1 =app-arch/libarchive-3.0.3 || exit 1
+ PORTDIR_OVERLAY=${WORKDIR}/portage.bsd-overlay ACCEPT_KEYWORDS=~x86-fbsd emerge -uq app-cdr/cdrtools '<app-text/build-docbook-catalog-1.19' =dev-util/catalyst-2.0.10.1 =app-arch/libarchive-3.0.3 || exit 1
grep "^export MAKEOPTS" /etc/catalyst/catalystrc > /dev/null 2>&1
if [ $? -ne 0 ] ; then
echo "export MAKEOPTS=\"-j`sysctl hw.ncpu | awk '{ print $2 + 1 }'`"\" >> /etc/catalyst/catalystrc