summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuta SATOH <nigoro@gentoo.gr.jp>2012-10-06 16:13:10 +0900
committerYuta SATOH <nigoro@gentoo.gr.jp>2012-10-06 16:13:10 +0900
commit8153c33158e0aad4bbdc9de788b70d867fd57032 (patch)
treeee109f548642831cce0c812f7b8bd185ac03ab7d /scripts/mkstages
parentremove freebsd-lib-9.1_rc1 fixed in official tree, close bug #435422 (diff)
downloadgentoo-bsd-8153c33158e0aad4bbdc9de788b70d867fd57032.tar.gz
gentoo-bsd-8153c33158e0aad4bbdc9de788b70d867fd57032.tar.bz2
gentoo-bsd-8153c33158e0aad4bbdc9de788b70d867fd57032.zip
gfbsd stages builder, updated for latest portage tree
Diffstat (limited to 'scripts/mkstages')
-rwxr-xr-xscripts/mkstages/chroot_prepare_upgrade.sh18
-rwxr-xr-xscripts/mkstages/stages_builder.sh6
2 files changed, 18 insertions, 6 deletions
diff --git a/scripts/mkstages/chroot_prepare_upgrade.sh b/scripts/mkstages/chroot_prepare_upgrade.sh
index 3938cc3..89c01d6 100755
--- a/scripts/mkstages/chroot_prepare_upgrade.sh
+++ b/scripts/mkstages/chroot_prepare_upgrade.sh
@@ -1,15 +1,21 @@
#!/bin/bash
# fixes bug #412319
-emerge -q sys-devel/gcc-config
+emerge -q sys-devel/gcc-config || exit
gcc-config 1
# fixes bug #413865
-emerge -q app-arch/libarchive
+emerge -q app-arch/libarchive || exit
# upgrade sys-freebsd packages
-rm /etc/make.profile
-ln -s ../usr/portage/profiles/default/bsd/fbsd/${TARGETARCH}/${TARGETVER} /etc/make.profile
+emerge -q sys-apps/portage || exit
+emerge -q sys-devel/libtool || exit
+# fixes bug 425530
+emerge -q app-admin/eselect || exit
+
+rm /etc/make.profile /etc/portage/make.profile
+ln -s ../../usr/portage/profiles/default/bsd/fbsd/${TARGETARCH}/${TARGETVER} /etc/portage/make.profile
+
emerge -1q sys-freebsd/freebsd-mk-defs
USE=build emerge -1q --nodeps sys-freebsd/freebsd-lib
emerge -Cq sys-freebsd/boot0
@@ -22,6 +28,10 @@ CHOST=${CATALYST_CHOST} emerge -q sys-devel/gcc || exit
# libtool has the old CHOST. Need to be updated
CHOST=${CATALYST_CHOST} emerge -q sys-devel/libtool || exit
+# fixes bug 425530
+emerge -q app-admin/eselect || exit
+
rm -rf /usr/local/portage.bsd-overlay
gsed -i '/PORTDIR_OVERLAY=.*/d' /etc/make.conf
+gsed -i '/PORTDIR_OVERLAY=.*/d' /etc/portage/make.conf
touch /tmp/prepare_done
diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh
index e4a03e5..0050e74 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -55,8 +55,10 @@ prepare(){
tar xzf bsd-overlay.tar.gz
mv gentoo-bsd-* ${WORKDIR}/portage.bsd-overlay
+ # <app-text/build-docbook-catalog-1.19, Bug 412201
+ # =app-arch/libarchive-3.0.3, Bug 421191
echo "emerging catalyst..."
- 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
+ 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.11 =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
@@ -69,7 +71,7 @@ prepare(){
cp -a ${WORKDIR}/portage.bsd-overlay/profiles/releases/freebsd-${TARGETVER} /usr/portage/profiles/releases/
fi
- if [ -n "${MKSRC}" ] ; then
+ if [ "${MKSRC}" != "NONE" ] ; then
if [ "${MKSRC}" = "release" ] ; then
MY_MKSRC=""
else