diff options
Diffstat (limited to 'scripts/mkstages/chroot_prepare_upgrade.sh')
| -rwxr-xr-x | scripts/mkstages/chroot_prepare_upgrade.sh | 18 |
1 files changed, 14 insertions, 4 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 |