update catalyst-2.0.15-fbsd-extra.patch and stages_builder.sh

3 files changed, 82 insertions, 129 deletions

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 042c7a2..522dc45 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,9 @@
 AUX catalyst-2.0.12.1-fbsd.patch 9713 SHA256 c66f856b7f3b0b9988984cf7eac1ab332d6103ac4bbcc855dbfdb0f4de8e6692 SHA512 335b29e7bda61c1875a66694031924a3f04851b056651b6ee8f3572209bf216d5f63520513223ca996f3b9404eeefacf7cfe40d0feddbebd5c3782bf8db36d4d WHIRLPOOL b63adab3d5ead0950a06d9a6490cfbef9d07ca420e45eaee99b9bef87f3b96d93cdaada2212faa368c1473360f917db094f8319f34bdbc1dd673390fb55cc9bf
 AUX catalyst-2.0.14-fbsd.patch 10559 SHA256 c4f53aa4a29eceb01a19b76b08b898efab1244b045b7657430c81ac796ebd8f3 SHA512 344193243bea083c8af3c641f69b70362635af7eaec9887cb0a5aa92957f951b53bbc8ea68f62e66395a2efa63b3b69bb2da7aeac489f88df70abf117a6108b7 WHIRLPOOL 3c54e14b0a05e272403ff738c2a5ba25eaa5c034148f35317809c5ccb758f245490ccead2d6554b36ef3f4e6a592faa2988974f901f01096eefe1466de058272
+AUX catalyst-2.0.15-fbsd-extra.patch 3631 SHA256 9ff22dbe1e9a2289dd800fae9d61df391ba8b099f51988d6eb6946aeac3b4f7c SHA512 81757926891d27b3e78fa92ac1c26fa7b69dca488e4e7504ee83458a41cce72df93fb3a9443a27408c1388e4a40d03f03f0bb49291b0d70986b229ee21b7b534 WHIRLPOOL d97927a3eb264ed2c44758ad82092cbaa0126d71aff66dcabaf7594019ad9b4f33b813701b59e5a58142b96def2eab152562639f849750268279958b9491d56a
 DIST catalyst-2.0.12.2.tar.bz2 907893 SHA256 411d531b6de8c8c1bc9fa9502af3a4882e94e9db8b911bb48e4a0fcfc1efe7e8 SHA512 12349f6249363a94a72a71d05b2fe6ee13593b5ea67e1cb9a054c5ece896ff68f89d1af6341b98238ba6a6510e2737f81dcc2606649c10681235315663ab04ae WHIRLPOOL 1769a78f615c8e0eec2167dd9d6ab873e24801ecb5e4634037898933c6f5a1dbb189d967a628be6f8811f6769eadc91c5003ddbb6bd58eb05efbbd5110f740c7
 DIST catalyst-2.0.15.tar.bz2 873335 SHA256 80fc39e6f6b7c32fb84f51333d8bf62a56a1ee068eb83cf2b03cb21c1f163e51 SHA512 9e61ba61eaa806424041f7edd1680b55dfd69bdea5b292aff305b4b3ef03349d82a47d8ab876baf7bf888e03810d79c6a00d74dc748082a1ed180ec1ed7043bd WHIRLPOOL 03c0f1137f59c57d106df4210104000c498a4c7ff2ae5bcc6e6c7a23d3d0c4c35ed125c036a0468859706da82af799641c1abe1b18c716c230c6ab657b4b765c
+DIST catalyst-2.0.17.tar.bz2 861341 SHA256 5f4142598d921e5174ff06f9571856760a324e79db5f3b63caf0d1a16adc813c SHA512 9d7b9ad383dcc5d4ba058596c0b607eb9601b28025d9300f63e68d78cbd5bca8fa3f3e03a81dc6b233021e773ba4301df0bf5cec51ca4368eb3577a68d33a92c WHIRLPOOL e97fc120141cc4f9f5c297652d8b43313780f615429c0eb3d9b85cba40aeca01dcbc6efb0f8d388cc5e7debabb2563cfc9b5a5aa00e3d00d306aed0f799fc642
 EBUILD catalyst-2.0.12.2.ebuild 3660 SHA256 4b0714dbb8eb96a9588f6b95e5e9021ddb62144c1a2e47f717111d70a84593a2 SHA512 f5ca61ec95864928d27e93ac72c2b441fdc04d30a27ebb3cedff6ec327147cee51a213b06d5f8e82bfda50ebc9e2eff51d77f43d3b699018459a4094b691ff4f WHIRLPOOL 1a558bd6eba2f278e4f6fcc4c846d884cf3fe79961204e6cf04bdb41889c96dd5f0af447eb14a6e8d17eac0622d8874cc6be20ff97e59d9632114495c77c2019
 EBUILD catalyst-2.0.15.ebuild 3166 SHA256 90063f74c89fa79969cfc35c695cadd20aadce8c922dd9d9444d8243b08f974e SHA512 1e0a83a4c65679c0f2c11b3ccbb96695a7f551f97c875bb0d81453db1f6803873a1ef8838eee884a9b34bb69dd97bbdb80344deac103301882d9e95dd61e8b55 WHIRLPOOL 6239a89daa41d5bc983cf020eb2fd6486c3e990ebc5cccd27260ce54ade5fb9a1e20c256d8a6861c728fa9286f54d0f6b7fa7e63949222147f178bcbd2e0a3b7
+EBUILD catalyst-2.0.17.ebuild 3162 SHA256 1f9aacf9e56f5184fa791583ea7c9d332b7ab4a1504bde50ae77f7f879a17a2c SHA512 31ab393441dd34eeb030703e75c91c4b01ecb32354728e0bedff40ec1c2a6f70ba4868eeeb1e63ff4f68c500d62abea0d2e2d17743b89c37c000d6cb18b8aa7c WHIRLPOOL b424423dfaaf07b8df3317e93d0b93eac341d0b82fe201f9ed71ef8c7dda365434a5796cf9abbe5a2c9ef21c45702649220524675e8113e6ef76d7e05000bd62
diff --git a/dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch b/dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch
index 7027359..596ce5f 100644
--- a/dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch
+++ b/dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch
@@ -1,10 +1,21 @@
-diff --git a/catalyst-2.0.15/targets/stage1/stage1-chroot.sh b/catalyst-2.0.15/targets/stage1/stage1-chroot.sh
-old mode 100644
-new mode 100755
-index ed83f38..7903fac
---- a/catalyst-2.0.15/targets/stage1/stage1-chroot.sh
-+++ b/catalyst-2.0.15/targets/stage1/stage1-chroot.sh
-@@ -27,11 +27,28 @@ clst_root_path=/ setup_pkgmgr
+diff --git a/catalyst-2.0.17/targets/stage1/stage1-chroot.sh b/catalyst-2.0.17/targets/stage1/stage1-chroot.sh
+old mode 100755
+new mode 100644
+index ed83f38..0819b2e
+--- a/catalyst-2.0.17/targets/stage1/stage1-chroot.sh
++++ b/catalyst-2.0.17/targets/stage1/stage1-chroot.sh
+@@ -21,17 +21,42 @@ then
+ fi
+ 
+ ## Setup seed pkgmgr to ensure latest
++
++if [[ ! -e /usr/lib/python-exec ]]; then
++	emerge -p --nodeps dev-lang/python-exec
++	[[ $? -eq 0 ]] && clst_root_path=/ run_merge "--buildpkg=n --newuse --nodeps dev-lang/python-exec"
++fi
+ clst_root_path=/ setup_pkgmgr
+ 
+ # Update stage3
  if [ -n "${clst_update_seed}" ]; then
  	if [ "${clst_update_seed}" == "yes" ]; then
  		echo "Updating seed stage..."
@@ -23,31 +34,33 @@ index ed83f38..7903fac
 +			[[ -e /etc/portage/profile/package.use.mask ]] && sed -i '/sys-freebsd/freebsd-libexec abi_x86_32/d' /etc/portage/profile/package.use.mask
 +			clst_root_path=/ USE="-build-kernel" run_merge "--buildpkg=n --update --newuse freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin"
 +			clst_root_path=/ USE="internal-glib" run_merge "--buildpkg=n --update --newuse dev-util/pkgconfig"
++			clst_root_path=/ run_merge "--buildpkg=n dev-libs/libxml2 dev-libs/libxslt dev-libs/glib app-arch/libarchive sys-libs/zlib"
++			unset CHOST
++			clst_root_path=/ run_merge "--buildpkg=n sys-devel/libtool"
 +		fi
  		if [ -n "${clst_update_seed_command}" ]; then
 -			clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}"
-+			clst_root_path=/ USE="-build-kernel" run_merge "--buildpkg=n ${clst_update_seed_command}"
++			clst_root_path=/ USE="-build-kernel -fortran" run_merge "--buildpkg=n ${clst_update_seed_command}"
  		else
 -			clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc"
-+			clst_root_path=/ USE="-build-kernel" run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc"
++			clst_root_path=/ USE="-build-kernel -fortran" run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc"
  		fi
-+		[[ $(uname) == "FreeBSD" ]] && unset CHOST
++		[[ $(uname) == "FreeBSD" ]] && clst_root_path=/ run_merge "--buildpkg=n sys-devel/libtool"
  	elif [ "${clst_update_seed}" != "no" ]; then
  		echo "Invalid setting for update_seed: ${clst_update_seed}"
  		exit 1
-diff --git a/catalyst-2.0.15/targets/support/chroot-functions.sh b/catalyst-2.0.15/targets/support/chroot-functions.sh
-index 848be40..804bf61 100644
---- a/catalyst-2.0.15/targets/support/chroot-functions.sh
-+++ b/catalyst-2.0.15/targets/support/chroot-functions.sh
-@@ -2,7 +2,10 @@
+diff --git a/catalyst-2.0.17/targets/support/chroot-functions.sh b/catalyst-2.0.17/targets/support/chroot-functions.sh
+index 5c30537..ab96a1f 100755
+--- a/catalyst-2.0.17/targets/support/chroot-functions.sh
++++ b/catalyst-2.0.17/targets/support/chroot-functions.sh
+@@ -2,6 +2,10 @@
  
  # Set the profile
  eselect profile set ${clst_target_profile}
--
 +if [ $? -ne 0 ] ; then
 +	rm -rf /etc/make.profile /etc/portage/make.profile
 +	ln -s ../usr/portage/profiles/${clst_target_profile} /etc/make.profile
 +fi
+ 
  # Trap these signals and kill ourselves if recieved
  # Force ourselves to die if any of these signals are recieved
- # most likely our controlling terminal is gone
diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh
index 82c7d32..f3021ca 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -2,16 +2,15 @@
 export TARGETVER="${TARGETVER:-9.1}"
 export MKSRC="${MKSRC:-NONE}"
 export WORKDATE="${WORKDATE:-local}"
-export WORKARCH="`uname -m`"
+export WORKARCH="${WORKARCH:-$(uname -m)}"
 export FORCESTAGE3="${FORCESTAGE3:-}"
+export EXTRAOVERLAY="${EXTRAOVERLAY:-}"
 OLDVER="${OLDVER:-9.0}"
 OVERLAY_SNAPSHOT="http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=snapshot;h=HEAD;sf=tgz"
 
 prepare(){
+	local MAJORVER=`echo ${TARGETVER} | awk -F \. '{ print $1 }'`
 	if [ -n "${STABLE}" ] ; then
-		local MAJORVER=`echo ${TARGETVER} | awk -F \. '{ print $1 }'`
-	fi
-	if [ -n "${MAJORVER}" ] ; then
 		export CHOSTVER="${MAJORVER}.0"
 	else
 		export CHOSTVER="${TARGETVER}"
@@ -51,24 +50,23 @@ prepare(){
 	fi
 
 	cd ${WORKDIR}
-	if [ -d "${HOME}/portage.bsd-overlay" ] ; then
-		echo "Copy from ${HOME}/portage.bsd-overlay to ${WORKDIR}/"
-		cp -a "${HOME}/portage.bsd-overlay" ${WORKDIR}/
+	if [ -d "${HOME}/gentoo-bsd" ] ; then
+		echo "Copy from ${HOME}/gentoo-bsd to ${WORKDIR}/"
+		cp -a "${HOME}/gentoo-bsd" ${WORKDIR}/
 	else
-		echo "Downloading gentoo-bsd overlay snapshot..."
-		wget -q -O bsd-overlay.tar.gz "${OVERLAY_SNAPSHOT}"
+		echo "Clone gentoo-bsd overlay snapshot..."
+		type -P git
+		[[ $? -ne 0 ]] && emerge git
+		git clone git://git.overlays.gentoo.org/proj/gentoo-bsd.git
 		[[ $? -ne 0 ]] && exit 1
-
-		if [ -e "${WORKDIR}/portage.bsd-overlay" ] ; then
-			rm -rf ${WORKDIR}/portage.bsd-overlay
-		fi
-
-		tar xzf bsd-overlay.tar.gz
-		mv gentoo-bsd-* ${WORKDIR}/portage.bsd-overlay
+	fi
+	if [ -n "${EXTRAOVERLAY}" ] ; then
+		echo "Copy from ${EXTRAOVERLAY} to ${WORKDIR}/gentoo-bsd"
+		cp -a ${EXTRAOVERLAY}/* ${WORKDIR}/gentoo-bsd/
 	fi
 
 	echo "emerging catalyst..."
-	PORTDIR_OVERLAY=${WORKDIR}/portage.bsd-overlay ACCEPT_KEYWORDS=~x86-fbsd emerge -uq app-cdr/cdrtools app-text/build-docbook-catalog dev-util/catalyst::gentoo-bsd || exit 1
+	PORTDIR_OVERLAY=${WORKDIR}/gentoo-bsd ACCEPT_KEYWORDS=~x86-fbsd emerge -uq app-cdr/cdrtools app-text/build-docbook-catalog dev-util/catalyst::gentoo-bsd || 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
@@ -76,10 +74,10 @@ prepare(){
 
 	if [ ! -e /usr/portage/profiles/releases/freebsd-${TARGETVER} ] ; then
 		echo "prepare new ${TARGETVER} profiles"
-		cp -a ${WORKDIR}/portage.bsd-overlay/profiles/arch/amd64-fbsd/clang /usr/portage/profiles/arch/amd64-fbsd/
-		cp -a ${WORKDIR}/portage.bsd-overlay/profiles/default/bsd/fbsd/amd64/${TARGETVER} /usr/portage/profiles/default/bsd/fbsd/amd64/
-		cp -a ${WORKDIR}/portage.bsd-overlay/profiles/default/bsd/fbsd/x86/${TARGETVER} /usr/portage/profiles/default/bsd/fbsd/x86/
-		cp -a ${WORKDIR}/portage.bsd-overlay/profiles/releases/freebsd-${TARGETVER} /usr/portage/profiles/releases/
+		cp -a ${WORKDIR}/gentoo-bsd/profiles/arch/amd64-fbsd/clang /usr/portage/profiles/arch/amd64-fbsd/
+		cp -a ${WORKDIR}/gentoo-bsd/profiles/default/bsd/fbsd/amd64/${TARGETVER} /usr/portage/profiles/default/bsd/fbsd/amd64/
+		cp -a ${WORKDIR}/gentoo-bsd/profiles/default/bsd/fbsd/x86/${TARGETVER} /usr/portage/profiles/default/bsd/fbsd/x86/
+		cp -a ${WORKDIR}/gentoo-bsd/profiles/releases/freebsd-${TARGETVER} /usr/portage/profiles/releases/
 		echo "amd64-fbsd default/bsd/fbsd/amd64/${TARGETVER} dev" >> /usr/portage/profiles/profiles.desc
 		echo "x86-fbsd default/bsd/fbsd/x86/${TARGETVER} dev" >> /usr/portage/profiles/profiles.desc
 	fi
@@ -90,13 +88,19 @@ prepare(){
 		else
 			MY_MKSRC="_${MKSRC}"
 		fi
-		if [ ! -e /usr/portage/distfiles/freebsd-lib-${TARGETVER}${MY_MKSRC}.tar.bz2 ] ; then
+		local DISTDIR="`emerge --info | grep DISTDIR | awk -F= '{print $2}' | sed 's:\"::g'`"
+		if [[ ${MAJORVER} -ge 10 ]]; then
+			local TAREXT=xz
+		else
+			local TAREXT=bz2
+		fi
+		if [ ! -e "${DISTDIR}/freebsd-lib-${TARGETVER}${MY_MKSRC}.tar.${TAREXT}" ] ; then
 			echo "create src tarball"
 			mkdir ${WORKDIR}/${TARGETVER}${MY_MKSRC}_src
 			cd ${WORKDIR}/${TARGETVER}${MY_MKSRC}_src
-			${WORKDIR}/portage.bsd-overlay/scripts/extract-9.0.sh ${TARGETVER}${MY_MKSRC}
-			mkdir -p /usr/portage/distfiles
-			mv *${TARGETVER}${MY_MKSRC}*bz2 /usr/portage/distfiles/
+			${WORKDIR}/gentoo-bsd/scripts/extract-9.0.sh ${TARGETVER}${MY_MKSRC}
+			mkdir -p "${DISTDIR}"
+			mv *${TARGETVER}${MY_MKSRC}*${TAREXT} "${DISTDIR}/"
 		fi
 
 		ls -1 /usr/portage/sys-freebsd/freebsd-lib/freebsd-lib-${TARGETVER}*.ebuild > /dev/null 2>&1
@@ -104,7 +108,7 @@ prepare(){
 			create_manifest /usr/portage/sys-freebsd
 			export WORKDATE="local"
 		fi
-		create_manifest ${WORKDIR}/portage.bsd-overlay/sys-freebsd
+		create_manifest ${WORKDIR}/gentoo-bsd/sys-freebsd
 	fi
 
 	if [ "${WORKDATE}" = "remote" ] ; then
@@ -130,18 +134,14 @@ prepare(){
 
 	if [ -n "${STABLE}" ] ; then
 		echo "create stages, mixed stable ${TARGETARCH} and minimal ${TARGETARCH}-fbsd flag on"
-		mkdir -p ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/profile
-		mkdir -p ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/package.keywords
-		cp -a ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/minimal-fbsd-list ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/package.keywords/
-		echo "ACCEPT_KEYWORDS=\"-${TARGETARCH}-fbsd -~${TARGETARCH}-fbsd ${TARGETARCH}\"" >> ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/profile/make.defaults
-		echo "CHOST=\"${CATALYST_CHOST}\"" >> ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/profile/make.defaults
-		echo 'CHOST_amd64_fbsd="${CHOST}"' >> ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/profile/make.defaults
-		echo "CHOST_x86_fbsd=\"i686-gentoo-freebsd${CHOSTVER}\"" >> ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/profile/make.defaults
-		echo "FEATURES=\"preserve-libs\"" >> ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/profile/make.defaults
-
-		#fixes bug 447810
-		mkdir -p ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/patches/app-shells/bash
-		wget -q -O ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/patches/app-shells/bash/bash-4.2-fbsd-EINTR.patch "http://git.savannah.gnu.org/cgit/bash.git/patch/redir.c?id=208fdb509e072977ae7a621e916dfcd32c76047d"
+		mkdir -p ${WORKDIR}/gentoo-bsd/scripts/mkstages/etc/portage/profile
+		mkdir -p ${WORKDIR}/gentoo-bsd/scripts/mkstages/etc/portage/package.keywords
+		cp -a ${WORKDIR}/gentoo-bsd/scripts/mkstages/minimal-fbsd-list ${WORKDIR}/gentoo-bsd/scripts/mkstages/etc/portage/package.keywords/
+		echo "ACCEPT_KEYWORDS=\"-${TARGETARCH}-fbsd -~${TARGETARCH}-fbsd ${TARGETARCH}\"" >> ${WORKDIR}/gentoo-bsd/scripts/mkstages/etc/portage/profile/make.defaults
+		echo "CHOST=\"${CATALYST_CHOST}\"" >> ${WORKDIR}/gentoo-bsd/scripts/mkstages/etc/portage/profile/make.defaults
+		echo 'CHOST_amd64_fbsd="${CHOST}"' >> ${WORKDIR}/gentoo-bsd/scripts/mkstages/etc/portage/profile/make.defaults
+		echo "CHOST_x86_fbsd=\"i686-gentoo-freebsd${CHOSTVER}\"" >> ${WORKDIR}/gentoo-bsd/scripts/mkstages/etc/portage/profile/make.defaults
+		echo "FEATURES=\"preserve-libs\"" >> ${WORKDIR}/gentoo-bsd/scripts/mkstages/etc/portage/profile/make.defaults
 	fi
 }
 
@@ -156,14 +156,9 @@ create_manifest(){
 			cd ${dir}
 			ls -1 *${TARGETVER}*.ebuild > /dev/null 2>&1
 			if [ $? -eq 0 ] ; then
-				gsed -i "/${TARGETVER}/d" Manifest
-				ls -1 *${TARGETVER}${MY_MKSRC}*.ebuild > /dev/null 2>&1
-				if [[ "${MKSRC}" = "release" || $? -ne 0 ]] ; then
-					EBUILDFILE=`ls -1 *${TARGETVER}*.ebuild | tail -n 1`
-					echo "copy ${EBUILDFILE} to ${TARGETVER}${MY_MKSRC}.ebuild"
-					gsed -i '/cve-2012-4576.patch/d' ${EBUILDFILE}
-					cp ${EBUILDFILE} ${dir}-${TARGETVER}${MY_MKSRC}.ebuild
-				fi
+				EBUILDFILE=`ls -1 *${TARGETVER}*.ebuild | tail -n 1`
+				echo "copy ${EBUILDFILE} to ${TARGETVER}${MY_MKSRC}.ebuild"
+				cp ${EBUILDFILE} ${dir}-${TARGETVER}${MY_MKSRC}.ebuild
 
 				ls -1 *.ebuild > /dev/null 2>&1
 
@@ -178,48 +173,6 @@ create_manifest(){
 	fi
 }
 
-upgrade_src_stage3(){
-	if [ -e ${WORKDIR}/stage3tmp ] ; then
-		chflags -R noschg ${WORKDIR}/stage3tmp
-		rm -rf ${WORKDIR}/stage3tmp
-	fi
-	mkdir ${WORKDIR}/stage3tmp
-	tar xjpf /var/tmp/catalyst/builds/default/stage3-${TARGETSUBARCH}-freebsd-${OLDVER}.tar.bz2 -C ${WORKDIR}/stage3tmp
-	mount -t devfs devfs ${WORKDIR}/stage3tmp/dev
-	mkdir ${WORKDIR}/stage3tmp/usr/portage
-	kldload nullfs
-	mount -t nullfs /usr/portage ${WORKDIR}/stage3tmp/usr/portage
-	mount -t nullfs /usr/portage/distfiles ${WORKDIR}/stage3tmp/usr/portage/distfiles
-
-	cp -a ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/chroot_prepare_upgrade.sh ${WORKDIR}/stage3tmp/tmp
-	cp -a ${WORKDIR}/portage.bsd-overlay ${WORKDIR}/stage3tmp/usr/local/
-	if [ -e ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage ] ; then
-		cp -a ${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage/* ${WORKDIR}/stage3tmp/etc/portage/
-	fi
-	if [ -e /etc/catalyst/catalystrc ] ; then
-		cp -a /etc/catalyst/catalystrc ${WORKDIR}/stage3tmp/tmp
-	fi
-	echo 'PORTDIR_OVERLAY="/usr/local/portage.bsd-overlay"' >> ${WORKDIR}/stage3tmp/etc/make.conf
-
-	if [ -e /etc/resolv.conf ]; then
-		cp /etc/resolv.conf ${WORKDIR}/stage3tmp/etc/
-	else
-		echo "nameserver 8.8.8.8" > ${WORKDIR}/stage3tmp/etc/resolv.conf
-	fi
-	chroot ${WORKDIR}/stage3tmp /tmp/chroot_prepare_upgrade.sh
-	umount ${WORKDIR}/stage3tmp/usr/portage/distfiles
-	umount ${WORKDIR}/stage3tmp/usr/portage || exit 1
-	umount ${WORKDIR}/stage3tmp/dev || exit 1
-	if [ ! -e ${WORKDIR}/stage3tmp/tmp/prepare_done ] ; then
-		exit 1
-	fi
-	cd ${WORKDIR}/stage3tmp
-	tar cjpf /var/tmp/catalyst/builds/default/stage3tmp-${TARGETSUBARCH}-freebsd-${TARGETVER}.tar.bz2 .
-	cd ${WORKDIR}
-	chflags -R noschg ${WORKDIR}/stage3tmp
-	rm -rf ${WORKDIR}/stage3tmp
-}
-
 check_ecompressdir() {
 	# dirty solution
 	# /dev is still mounted; performing auto-bind-umount... 
@@ -241,28 +194,28 @@ run_catalyst() {
 	local C_APPEND_OPT=""
 
 	if [ ! -e /var/tmp/catalyst/builds/default/${C_TARGET}-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION}.tar.bz2 ] ; then
-		if [ "${C_TARGET}" = "stage1" ] ; 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=yes"
 		fi
 		if [ "${C_TARGET}" != "stage3" ] ; then
 			C_APPEND_OPT="${C_APPEND_OPT} chost=${CATALYST_CHOST}"
 		fi
 		if [ -n "${STABLE}" ] ; then
-			C_APPEND_OPT="${C_APPEND_OPT} portage_confdir=${WORKDIR}/portage.bsd-overlay/scripts/mkstages/etc/portage"
+			C_APPEND_OPT="${C_APPEND_OPT} portage_confdir=${WORKDIR}/gentoo-bsd/scripts/mkstages/etc/portage"
 		else
-			if [ -e ${WORKDIR}/portage.bsd-overlay/etc/portage ] ; then
-				C_APPEND_OPT="${C_APPEND_OPT} portage_confdir=${WORKDIR}/portage.bsd-overlay/etc/portage"
+			if [ -e ${WORKDIR}/gentoo-bsd/etc/portage ] ; then
+				C_APPEND_OPT="${C_APPEND_OPT} portage_confdir=${WORKDIR}/gentoo-bsd/etc/portage"
 			fi
 		fi
 		if [ -n "${CLANG}" ] ; then
 			C_APPEND_PROFILE="/clang"
 		fi
-		catalyst -C target=${C_TARGET} version_stamp=fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION} profile=default/bsd/fbsd/${TARGETARCH}/${TARGETVER}${C_APPEND_PROFILE} snapshot=${WORKDATE} source_subpath=default/${C_SOURCE} subarch=${TARGETSUBARCH} rel_type=default portage_overlay=${WORKDIR}/portage.bsd-overlay ${C_APPEND_OPT}
+		catalyst -C target=${C_TARGET} version_stamp=fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION} profile=default/bsd/fbsd/${TARGETARCH}/${TARGETVER}${C_APPEND_PROFILE} snapshot=${WORKDATE} source_subpath=default/${C_SOURCE} subarch=${TARGETSUBARCH} rel_type=default portage_overlay=${WORKDIR}/gentoo-bsd ${C_APPEND_OPT}
 
 		if [ $? -ne 0 ] ; then
 			check_ecompressdir "${C_TARGET}-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION}/usr/local/portage"
 			if [ $? -ne 0 ] ; then
-				catalyst -C target=${C_TARGET} version_stamp=fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION} profile=default/bsd/fbsd/${TARGETARCH}/${TARGETVER}${C_APPEND_PROFILE} snapshot=${WORKDATE} source_subpath=default/${C_SOURCE} subarch=${TARGETSUBARCH} rel_type=default portage_overlay=${WORKDIR}/portage.bsd-overlay ${C_APPEND_OPT} || exit 1
+				catalyst -C target=${C_TARGET} version_stamp=fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION} profile=default/bsd/fbsd/${TARGETARCH}/${TARGETVER}${C_APPEND_PROFILE} snapshot=${WORKDATE} source_subpath=default/${C_SOURCE} subarch=${TARGETSUBARCH} rel_type=default portage_overlay=${WORKDIR}/gentoo-bsd ${C_APPEND_OPT} || exit 1
 			fi
 		fi
 
@@ -278,28 +231,16 @@ run_catalyst() {
 mk_stages() {
 	[[ -n "${CLANG}" ]] && local C_CLANG_APPEND_VERSION="-cl"
 	local C_TMP_APPEND_VERSION="${C_CLANG_APPEND_VERSION}t"
-	if [ "${OLDVER}" != "${TARGETVER}" ] ; then
-		local SOURCE_STAGE3="stage3tmp-${TARGETSUBARCH}-freebsd-${TARGETVER}"
-	else
-		local SOURCE_STAGE3="stage3-${TARGETSUBARCH}-freebsd-${OLDVER}"
-	fi
+	local SOURCE_STAGE3="stage3-${TARGETSUBARCH}-freebsd-${OLDVER}"
 	[[ -n ${FORCESTAGE3} ]] && SOURCE_STAGE3="${FORCESTAGE3}"
 
 	run_catalyst stage1 ${SOURCE_STAGE3} ${C_TMP_APPEND_VERSION}
-
-	### Added when the library was upgraded
-	ln -s libmpfr.so.5 /var/tmp/catalyst/tmp/default/stage1-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION}/tmp/stage1root/usr/lib/libmpfr.so.4
-	ln -s libmpc.so /var/tmp/catalyst/tmp/default/stage1-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION}/tmp/stage1root/usr/lib/libmpc.so.2
-	ln -s libmpc.so /var/tmp/catalyst/tmp/default/stage1-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION}/tmp/stage1root/usr/lib/libmpc.so.2.0.0
-
 	run_catalyst stage2 stage1-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION} ${C_TMP_APPEND_VERSION}
 	run_catalyst stage3 stage2-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION} ${C_TMP_APPEND_VERSION}
 
-
 	run_catalyst stage1 stage3-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION} ${C_CLANG_APPEND_VERSION}
 	run_catalyst stage2 stage1-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_CLANG_APPEND_VERSION} ${C_CLANG_APPEND_VERSION}
 	run_catalyst stage3 stage2-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_CLANG_APPEND_VERSION} ${C_CLANG_APPEND_VERSION}
-
 }
 
 if [ -e /etc/catalyst/catalystrc ] ; then
@@ -312,10 +253,6 @@ 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}" ] && [ -z "${FORCESTAGE3}" ]; then
-	upgrade_src_stage3
-	echo "upgrade done"
-fi
-
 mk_stages
 
+