[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/

[Yuta SATOH]

commit:     dd35f15f0ea80cc07f839b8b5a9a2f29731d4c50
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Nov 22 11:45:08 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Nov 22 11:45:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=dd35f15f

gfbsd stages builder, added the function that create stable + minimal unstable stages that I normally use.

---
 scripts/mkstages/chroot_prepare_upgrade.sh |    9 ++++++++-
 scripts/mkstages/minimal-fbsd-list         |   24 ++++++++++++++++++++++++
 scripts/mkstages/stages_builder.sh         |   27 ++++++++++++++++++++++-----
 3 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/scripts/mkstages/chroot_prepare_upgrade.sh b/scripts/mkstages/chroot_prepare_upgrade.sh
index 8224f05..dee7991 100755
--- a/scripts/mkstages/chroot_prepare_upgrade.sh
+++ b/scripts/mkstages/chroot_prepare_upgrade.sh
@@ -6,7 +6,9 @@ fi
 if [ -e /etc/portage/make.conf ] ; then
 	echo "MAKEOPTS=\"-j`sysctl hw.ncpu | awk '{ print $2 + 1 }'`"\" >> /etc/portage/make.conf
 fi
-
+if [ -e /tmp/catalystrc ] ; then
+	source /tmp/catalystrc
+fi
 # fixes bug #412319
 emerge -q sys-devel/gcc-config || exit
 gcc-config 1
@@ -56,6 +58,11 @@ CHOST=${CATALYST_CHOST} emerge -q sys-devel/libtool || exit
 # fixes bug 425530
 emerge -q app-admin/eselect || exit
 
+if [ -e /etc/portage/profile ] ; then
+	rm -rf /etc/portage/profile
+	rm /etc/portage/package.keywords
+fi
+
 rm -rf /usr/local/portage.bsd-overlay
 gsed -i '/PORTDIR_OVERLAY=.*/d' /etc/make.conf
 gsed -i '/PORTDIR_OVERLAY=.*/d' /etc/portage/make.conf

diff --git a/scripts/mkstages/minimal-fbsd-list b/scripts/mkstages/minimal-fbsd-list
new file mode 100644
index 0000000..7ca109f
--- /dev/null
+++ b/scripts/mkstages/minimal-fbsd-list
@@ -0,0 +1,24 @@
+app-admin/eselect			~x86-fbsd
+app-arch/libarchive			~x86-fbsd
+dev-libs/libedit			~x86-fbsd
+dev-libs/libelf				~x86-fbsd
+dev-libs/libiconv			~x86-fbsd
+sys-apps/baselayout			~x86-fbsd
+sys-apps/more				~x86-fbsd
+sys-auth/openpam			~x86-fbsd
+sys-freebsd/boot0			~x86-fbsd
+sys-freebsd/freebsd-bin			~x86-fbsd
+sys-freebsd/freebsd-cddl		~x86-fbsd
+sys-freebsd/freebsd-contrib		~x86-fbsd
+sys-freebsd/freebsd-lib			~x86-fbsd
+sys-freebsd/freebsd-libexec		~x86-fbsd
+sys-freebsd/freebsd-mk-defs		~x86-fbsd
+sys-freebsd/freebsd-pam-modules		~x86-fbsd
+sys-freebsd/freebsd-sbin		~x86-fbsd
+sys-freebsd/freebsd-shar		~x86-fbsd
+sys-freebsd/freebsd-share		~x86-fbsd
+sys-freebsd/freebsd-sources		~x86-fbsd
+sys-freebsd/freebsd-ubin		~x86-fbsd
+sys-freebsd/freebsd-usbin		~x86-fbsd
+sys-process/fuser-bsd			~x86-fbsd
+sys-process/pidof-bsd			~x86-fbsd

diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh
index 08a1f0f..6a8a86f 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 export TARGETVER="${TARGETVER:-9.1}"
-export MKSRC="${MKSRC:-rc2}"
+export MKSRC="${MKSRC:-rc3}"
 export WORKDATE="`date +%Y%m%d`"
 export WORKARCH="`uname -m`"
 OLDVER="${OLDVER:-9.0}"
@@ -63,7 +63,7 @@ prepare(){
 	# <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.11 =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::gentoo-bsd =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
@@ -96,6 +96,13 @@ prepare(){
 		fi
 		create_manifest ${WORKDIR}/portage.bsd-overlay/sys-freebsd
 	fi
+
+	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
+		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
+	fi
 }
 
 create_manifest(){
@@ -145,6 +152,12 @@ upgrade_src_stage3(){
 
 	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
@@ -184,17 +197,21 @@ run_catalyst() {
 	local C_TARGET="$1"
 	local C_SOURCE="$2"
 	local C_APPEND_VERSION="$3"
+	local C_APPEND_OPT=""
 
 	if [ "${C_TARGET}" != "stage3" ] ; then
-		local C_APPEND_CHOST="chost=${CATALYST_CHOST}"
+		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"
 	fi
 
-	catalyst -C target=${C_TARGET} version_stamp=fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION} profile=default/bsd/fbsd/${TARGETARCH}/${TARGETVER} snapshot=${WORKDATE} source_subpath=default/${C_SOURCE} subarch=${TARGETSUBARCH} rel_type=default portage_overlay=${WORKDIR}/portage.bsd-overlay ${C_APPEND_CHOST}
+	catalyst -C target=${C_TARGET} version_stamp=fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION} profile=default/bsd/fbsd/${TARGETARCH}/${TARGETVER} snapshot=${WORKDATE} source_subpath=default/${C_SOURCE} subarch=${TARGETSUBARCH} rel_type=default portage_overlay=${WORKDIR}/portage.bsd-overlay ${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} snapshot=${WORKDATE} source_subpath=default/${C_SOURCE} subarch=${TARGETSUBARCH} rel_type=default portage_overlay=${WORKDIR}/portage.bsd-overlay ${C_APPEND_CHOST} || exit 1
+			catalyst -C target=${C_TARGET} version_stamp=fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION} profile=default/bsd/fbsd/${TARGETARCH}/${TARGETVER} snapshot=${WORKDATE} source_subpath=default/${C_SOURCE} subarch=${TARGETSUBARCH} rel_type=default portage_overlay=${WORKDIR}/portage.bsd-overlay ${C_APPEND_OPT} || exit 1
 		fi
 	fi