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

2017-12-10 Thread Yuta SATOH 
commit: ee565f34c2963f007b451592c719d05507af74b4
Author: Yuta SATOH  gmail  com>
AuthorDate: Sun Dec 10 12:14:03 2017 +
Commit: Yuta SATOH  gentoo  gr  jp>
CommitDate: Sun Dec 10 12:14:03 2017 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=ee565f34

add how to use mkstages scripts.

 .../mkstages/doc/how_to_use_create_forcestage3.txt | 66 ++
 scripts/mkstages/doc/how_to_use_stages_builder.txt | 51 +
 2 files changed, 117 insertions(+)

diff --git a/scripts/mkstages/doc/how_to_use_create_forcestage3.txt 
b/scripts/mkstages/doc/how_to_use_create_forcestage3.txt
new file mode 100644
index 000..6d1e90a
--- /dev/null
+++ b/scripts/mkstages/doc/how_to_use_create_forcestage3.txt
@@ -0,0 +1,66 @@
+How to use create_forcestage3.sh
+
+This script will create a source file for dev-utils/catalyst.
+If you want to create new stages, this script will help you.
+
+Usage:
+Please don't forget to create a log file! It's very useful.
+
+amd64-fbsd)
+SET_MAKEOPTS=3 \
+TARGETVER=11.1 \
+TARGETARCH=amd64 \
+OLDSTAGE3="http://distfiles.gentoo.org/experimental/bsd/freebsd/stages/amd64-fbsd-9.1/stage3-amd64-freebsd-9.1.tar.bz2;
 \
+bash /tmp/create_forcestage3.sh 2>&1 | tee ~/create_source_amd64_11.1.log
+
+amd64-fbsd/clang)
+SET_MAKEOPTS=3 \
+TARGETVER=11.1 \
+TARGETARCH=amd64 \
+OLDSTAGE3="http://distfiles.gentoo.org/experimental/bsd/freebsd/stages/amd64-fbsd-9.1/clang/stage3-amd64-clangfbsd-9.1.tar.bz2;
 \
+CLANG=1 \
+bash /tmp/create_forcestage3.sh 2>&1 | tee ~/create_source_amd64_clang_11.1.log
+
+x86-fbsd)
+SET_MAKEOPTS=3 \
+TARGETVER=11.1 \
+TARGETARCH=x86 \
+OLDSTAGE3="http://dev.gentoo.org/~aballier/fbsd9.0/x86/stage3-i686-freebsd-9.0.tar.bz2;
 \
+bash /tmp/create_forcestage3.sh 2>&1 | tee ~/create_source_x86_11.1.log
+
+
+Require environment variables:
+You need to set some environment variables:
+
+TARGETVER
+Set the target version. e.g.) 11.1
+
+TARGETARCH
+Set the target architecture. You can set amd64 or x86.
+
+OLDSTAGE3
+Set the old version of stage3 file. You can set local file name or URL.
+
+Tested stages list:
+amd64-fbsd)
+http://distfiles.gentoo.org/experimental/bsd/freebsd/stages/amd64-fbsd-9.1/stage3-amd64-freebsd-9.1.tar.bz2
+amd64-fbsd/clang)
+http://distfiles.gentoo.org/experimental/bsd/freebsd/stages/amd64-fbsd-9.1/clang/stage3-amd64-clangfbsd-9.1.tar.bz2
+x86-fbsd) This URL is 404...
+http://dev.gentoo.org/~aballier/fbsd9.0/x86/stage3-i686-freebsd-9.0.tar.bz2
+
+
+Optional environment variables:
+Also, you can set some additional environment variables:
+
+SET_MAKEOPTS
+If you set 1 or more, your input number will be set.
+
+CLANG
+If you want to create clang stages, please set 1.
+
+PORTDIR
+If you aren't using /usr/portage, please set it.
+
+TMPFS
+If you set 1, the tmpfs will be used for /var/tmp/portage.

diff --git a/scripts/mkstages/doc/how_to_use_stages_builder.txt 
b/scripts/mkstages/doc/how_to_use_stages_builder.txt
new file mode 100644
index 000..2836b13
--- /dev/null
+++ b/scripts/mkstages/doc/how_to_use_stages_builder.txt
@@ -0,0 +1,51 @@
+How to use stages_builder.sh
+
+This script will create stage files with dev-utils/catalyst.
+If you want to create new stages, this script will help you.
+
+Usage:
+Please don't forget to create a log file! It's very useful.
+
+amd64-fbsd)
+WORKDATE=20171201 \
+TARGETVER=11.1 \
+SOURCE_STAGE=stage3-amd64-fbsd-11.1-forcestage3 \
+bash /tmp/stages_builder.sh 2>&1 | tee ~/create_stages_amd64_11.1.log
+
+amd64-fbsd/clang)
+WORKDATE=20171201 \
+TARGETVER=11.1 \
+SOURCE_STAGE=stage3-amd64-fbsd-11.1-forcestage3-cl \
+CLANG=1 \
+bash /tmp/stages_builder.sh 2>&1 | tee ~/create_stages_amd64_clang_11.1.log
+
+x86-fbsd)
+TARGETARCH=x86 \
+WORKDATE=20171201 \
+TARGETVER=11.1 \
+SOURCE_STAGE=stage3-x86-fbsd-11.1-forcestage3 \
+bash /tmp/stages_builder.sh 2>&1 | tee ~/create_stages_x86_11.1.log
+
+
+Require environment variables:
+You need to set some environment variables:
+
+WORKDATE
+Set the date of the portage snapshot.
+If it doesn't exist, it will be created using your /usr/portage.
+
+TARGETVER
+Set the target version. e.g.) 11.1
+
+SOURCE_STAGE
+Set a source file.
+
+
+Optional environment variables:
+Also, you can set some additional environment variables:
+
+CLANG
+If you want to create clang stages, please set 1.
+
+TARGETARCH
+If you want to create x86 stages on amd64-fbsd, please set x86.

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

2017-12-09 Thread Yuta SATOH 
commit: 08210ba682ff8d7344958fd9f2cfb2059d01297a
Author: Yuta SATOH  gmail  com>
AuthorDate: Sat Dec  9 21:43:02 2017 +
Commit: Yuta SATOH  gentoo  gr  jp>
CommitDate: Sat Dec  9 21:43:02 2017 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=08210ba6

create_forcestage3.sh: remove unnecessary code.

 scripts/mkstages/create_forcestage3.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/mkstages/create_forcestage3.sh 
b/scripts/mkstages/create_forcestage3.sh
index c34631e..26210d9 100755
--- a/scripts/mkstages/create_forcestage3.sh
+++ b/scripts/mkstages/create_forcestage3.sh
@@ -88,8 +88,6 @@ chroot_update(){
echo 'USE="${USE} -fortran -build-kernel"' >> "${makeconf}"
 
export EMERGE_DEFAULT_OPTS="-q"
-   mkdir -p "${WORKDIR}"/etc/portage/patches/sys-apps
-   cp -a /etc/portage/patches/sys-apps/portage 
"${WORKDIR}"/etc/portage/patches/sys-apps
chroot "${WORKDIR}" bash /automatic_updater.sh ${TARGETVER} kernel
chroot "${WORKDIR}" bash /automatic_updater.sh ${TARGETVER} 
freebsd_userland
if [[ -e "${WORKDIR}"/usr/bin/git ]]; then

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

2017-12-09 Thread Yuta SATOH 
commit: 05c5df43befd234a462824bc4bd604c687ca4878
Author: Yuta SATOH  gmail  com>
AuthorDate: Sat Dec  9 21:44:56 2017 +
Commit: Yuta SATOH  gentoo  gr  jp>
CommitDate: Sat Dec  9 21:44:56 2017 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=05c5df43

create_forcestage3.sh: use wget to get the old stage3.

 scripts/mkstages/create_forcestage3.sh | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/mkstages/create_forcestage3.sh 
b/scripts/mkstages/create_forcestage3.sh
index 26210d9..a70a174 100755
--- a/scripts/mkstages/create_forcestage3.sh
+++ b/scripts/mkstages/create_forcestage3.sh
@@ -40,7 +40,11 @@ prepare(){
if [[ "${OLDSTAGE3}" =~ ^http ]]; then
if [[ ! -e /tmp/$(basename ${OLDSTAGE3}) ]]; then
cd /tmp
-   fetch "${OLDSTAGE3}"
+   if type -P wget &> /dev/null ; then
+   wget -q "${OLDSTAGE3}"
+   else
+   fetch "${OLDSTAGE3}"
+   fi
fi
else
cp -a "${OLDSTAGE3}" /tmp

[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/specs/x86-fbsd/, scripts/mkstages/specs/amd64-fbsd/, ...

2017-12-09 Thread Yuta SATOH 
commit: 6aff4270e5ca402ec66a3010ea16dd95c389a938
Author: Yuta SATOH  gmail  com>
AuthorDate: Sat Dec  9 22:05:29 2017 +
Commit: Yuta SATOH  gentoo  gr  jp>
CommitDate: Sat Dec  9 22:05:29 2017 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=6aff4270

updated sample specs for the catalyst.

 scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec | 11 +--
 scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec | 11 +--
 scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec | 11 +--
 scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec | 11 +--
 scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec |  9 -
 scripts/mkstages/specs/amd64-fbsd-clang/stage3_tmp.spec |  9 -
 scripts/mkstages/specs/amd64-fbsd/stage1.spec   | 10 +-
 scripts/mkstages/specs/amd64-fbsd/stage1_tmp.spec   | 10 +-
 scripts/mkstages/specs/amd64-fbsd/stage2.spec   | 10 +-
 scripts/mkstages/specs/amd64-fbsd/stage2_tmp.spec   | 10 +-
 scripts/mkstages/specs/amd64-fbsd/stage3.spec   |  8 
 scripts/mkstages/specs/amd64-fbsd/stage3_tmp.spec   |  8 
 scripts/mkstages/specs/x86-fbsd/stage1.spec | 10 +-
 scripts/mkstages/specs/x86-fbsd/stage1_tmp.spec | 10 +-
 scripts/mkstages/specs/x86-fbsd/stage2.spec | 10 +-
 scripts/mkstages/specs/x86-fbsd/stage2_tmp.spec | 10 +-
 scripts/mkstages/specs/x86-fbsd/stage3.spec |  8 
 scripts/mkstages/specs/x86-fbsd/stage3_tmp.spec |  8 
 18 files changed, 84 insertions(+), 90 deletions(-)

diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec 
b/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec
index 2adc441..dc88e33 100644
--- a/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec
+++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec
@@ -1,9 +1,8 @@
-chost: x86_64-gentoo-freebsd10.1
-cxxflags: -stdlib=libc++ ${CFLAGS}
+chost: x86_64-gentoo-freebsd11.1
 target: stage1
-version_stamp: fbsd-10.1-20150712-cl
-profile: default/bsd/fbsd/amd64/10.1/clang
-snapshot: 20150712
-source_subpath: default/stage3-amd64-fbsd-10.1-20150712-clt
+version_stamp: fbsd-11.1-20171201-cl
+profile: default/bsd/fbsd/amd64/11.1/clang
+snapshot: 20171201
+source_subpath: default/stage3-amd64-fbsd-11.1-20171201-clt
 subarch: amd64
 rel_type: default

diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec 
b/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec
index c780435..8ef481a 100644
--- a/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec
+++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec
@@ -1,9 +1,8 @@
-chost: x86_64-gentoo-freebsd10.1
-cxxflags: -stdlib=libc++ ${CFLAGS}
+chost: x86_64-gentoo-freebsd11.1
 target: stage1
-version_stamp: fbsd-10.1-20150712-clt
-profile: default/bsd/fbsd/amd64/10.1/clang
-snapshot: 20150712
-source_subpath: default/stage3-amd64-fbsd-10.1-forcestage3-cl
+version_stamp: fbsd-11.1-20171201-clt
+profile: default/bsd/fbsd/amd64/11.1/clang
+snapshot: 20171201
+source_subpath: default/stage3-amd64-fbsd-11.1-forcestage3-cl
 subarch: amd64
 rel_type: default

diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec 
b/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec
index 1de9e13..34f140e 100644
--- a/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec
+++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec
@@ -1,9 +1,8 @@
-chost: x86_64-gentoo-freebsd10.1
-cxxflags: -stdlib=libc++ ${CFLAGS}
+chost: x86_64-gentoo-freebsd11.1
 target: stage2
-version_stamp: fbsd-10.1-20150712-cl
-profile: default/bsd/fbsd/amd64/10.1/clang
-snapshot: 20150712
-source_subpath: default/stage1-amd64-fbsd-10.1-20150712-cl
+version_stamp: fbsd-11.1-20171201-cl
+profile: default/bsd/fbsd/amd64/11.1/clang
+snapshot: 20171201
+source_subpath: default/stage1-amd64-fbsd-11.1-20171201-cl
 subarch: amd64
 rel_type: default

diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec 
b/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec
index 73ff50f..950f9b6 100644
--- a/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec
+++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec
@@ -1,9 +1,8 @@
-chost: x86_64-gentoo-freebsd10.1
-cxxflags: -stdlib=libc++ ${CFLAGS}
+chost: x86_64-gentoo-freebsd11.1
 target: stage2
-version_stamp: fbsd-10.1-20150712-clt
-profile: default/bsd/fbsd/amd64/10.1/clang
-snapshot: 20150712
-source_subpath: default/stage1-amd64-fbsd-10.1-20150712-clt
+version_stamp: fbsd-11.1-20171201-clt
+profile: default/bsd/fbsd/amd64/11.1/clang
+snapshot: 20171201
+source_subpath: default/stage1-amd64-fbsd-11.1-20171201-clt
 subarch: amd64
 rel_type: default

diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec 
b/scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec
index d5e1fd8..7c2121b 100644
--- a/scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec

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

2017-12-07 Thread Yuta SATOH 
commit: b85ab4b4483a6ac0f55fcccb7f3c3c2cdef29242
Author: Yuta SATOH  gmail  com>
AuthorDate: Thu Dec  7 13:24:28 2017 +
Commit: Yuta SATOH  gentoo  gr  jp>
CommitDate: Thu Dec  7 13:24:28 2017 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=b85ab4b4

create_forcestage3.sh: updated. It targets 11.1.

 scripts/mkstages/create_forcestage3.sh | 56 ++
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/scripts/mkstages/create_forcestage3.sh 
b/scripts/mkstages/create_forcestage3.sh
old mode 100644
new mode 100755
index 516f95b..c34631e
--- a/scripts/mkstages/create_forcestage3.sh
+++ b/scripts/mkstages/create_forcestage3.sh
@@ -1,22 +1,34 @@
 #!/bin/bash
 set -eu
 
-TARGETVER="${TARGETVER:-10.1}"
+TARGETVER="${TARGETVER:-11.1}"
 TARGETARCH="${TARGETARCH:-amd64}"
 
OLDSTAGE3="${OLDSTAGE3:-http://distfiles.gentoo.org/experimental/bsd/freebsd/stages/amd64-fbsd-9.1/stage3-amd64-freebsd-9.1.tar.bz2};
 WORKDIR="/${TARGETVER}-forcestage3/${TARGETARCH}"
 PORTDIR="${PORTDIR:-/usr/portage}"
 TMPFS=${TMPFS:-0}
 CLANG=${CLANG:-0}
+SET_MAKEOPTS=${SET_MAKEOPTS:-1}
+# DISTDIR will be set automatically if your environment have the emerge 
command.
+# This setting exists for vanilla FreeBSD.
+DISTDIR="${DISTDIR:-/usr/portage/distfiles}"
+
 [[ ${CLANG} -ne 0 ]] && WORKDIR="${WORKDIR}_clang"
 
 prepare(){
-   local distdir="$(emerge --info | grep DISTDIR | sed s:DISTDIR=::g | sed 
's:"::g')"
+   local distdir
+
+   if type -P emerge &> /dev/null ; then
+   distdir="$(emerge --info | grep DISTDIR | sed s:DISTDIR=::g | 
sed 's:"::g')"
+   else
+   distdir="${DISTDIR}"
+   fi
+
if [[ ! -d "${WORKDIR}" ]]; then
mkdir -p "${WORKDIR}"
else
-   echo "${WORKDIR} exists."
-   echo "Please remove the following steps."
+   echo "Error: ${WORKDIR} exists."
+   echo "Please remove the following steps:"
echo ""
echo "kill -9 $(ps auxw | grep ebuild-helpers/ecompressdir | 
grep -v grep | awk '{ print $2 }' | xargs)"
echo "umount $(mount | grep ${WORKDIR} | awk '{print $3}' | 
xargs)"
@@ -27,10 +39,11 @@ prepare(){
 
if [[ "${OLDSTAGE3}" =~ ^http ]]; then
if [[ ! -e /tmp/$(basename ${OLDSTAGE3}) ]]; then
-   wget -P /tmp "${OLDSTAGE3}"
+   cd /tmp
+   fetch "${OLDSTAGE3}"
fi
else
-   cp "${OLDSTAGE3}" /tmp
+   cp -a "${OLDSTAGE3}" /tmp
fi
 
tar xjpf /tmp/$(basename ${OLDSTAGE3}) -C "${WORKDIR}"
@@ -40,6 +53,7 @@ prepare(){
 
mount -t devfs devfs "${WORKDIR}"/dev
mount -t nullfs "${PORTDIR}" "${WORKDIR}"/usr/portage
+
if [[ ! "${distdir}" =~ ${PORTDIR}.* ]]; then
echo "mount DISTDIR"
if [[ ! -e "${WORKDIR}"/usr/portage/distfiles ]]; then
@@ -51,8 +65,10 @@ prepare(){
echo "mount TMPFS"
mount -t tmpfs tmpfs "${WORKDIR}"/var/tmp/portage
fi
-   wget -P "${WORKDIR}" 
https://gitweb.gentoo.org/proj/gentoo-bsd.git/plain/scripts/automatic_updater.sh
-   cp /etc/resolv.conf "${WORKDIR}"/etc
+
+   cd "${WORKDIR}"
+   fetch 
https://gitweb.gentoo.org/proj/gentoo-bsd.git/plain/scripts/automatic_updater.sh
+   cp -a /etc/resolv.conf "${WORKDIR}"/etc
 }
 
 chroot_update(){
@@ -62,15 +78,24 @@ chroot_update(){
local makeconf="${WORKDIR}"/etc/portage/make.conf
fi
 
-   echo "MAKEOPTS=\"-j$(sysctl hw.ncpu | awk '{ print $2 + 1 }')"\" >> 
"${makeconf}"
+   case ${SET_MAKEOPTS} in
+   [1-9]|[1-9][0-9])
+   echo "MAKEOPTS=\"-j${SET_MAKEOPTS}\"" >> "${makeconf}"
+   ;;
+   *) exit 1 ;;
+   esac
+
echo 'USE="${USE} -fortran -build-kernel"' >> "${makeconf}"
 
export EMERGE_DEFAULT_OPTS="-q"
+   mkdir -p "${WORKDIR}"/etc/portage/patches/sys-apps
+   cp -a /etc/portage/patches/sys-apps/portage 
"${WORKDIR}"/etc/portage/patches/sys-apps
chroot "${WORKDIR}" bash /automatic_updater.sh ${TARGETVER} kernel
chroot "${WORKDIR}" bash /automatic_updater.sh ${TARGETVER} 
freebsd_userland
if [[ -e "${WORKDIR}"/usr/bin/git ]]; then
chroot "${WORKDIR}" emerge -C dev-vcs/git
fi
+
REMOVEPERL=1 chroot "${WORKDIR}" bash /automatic_updater.sh 
${TARGETVER} world
unset EMERGE_DEFAULT_OPTS
 }
@@ -89,7 +114,13 @@ check_ecompressdir() {
 }
 
 cleanup(){
-   local distdir="$(emerge --info | grep DISTDIR | sed s:DISTDIR=::g | sed 
's:"::g')"
+   local distdir
+
+   if type -P emerge &> /dev/null ; then
+   distdir="$(emerge --info | grep DISTDIR | sed s:DISTDIR=::g | 
sed 's:"::g')"
+   else
+   distdir="${DISTDIR}"
+   fi
 
check_ecompressdir

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

2017-12-07 Thread Yuta SATOH 
commit: a55cb5b680153dd98c0118b5e28a13dc81b7bbb9
Author: Yuta SATOH  gmail  com>
AuthorDate: Thu Dec  7 13:33:34 2017 +
Commit: Yuta SATOH  gentoo  gr  jp>
CommitDate: Thu Dec  7 13:33:34 2017 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=a55cb5b6

stages_builder.sh: updated. It targets 11.1.

 scripts/mkstages/stages_builder.sh | 238 +
 1 file changed, 84 insertions(+), 154 deletions(-)

diff --git a/scripts/mkstages/stages_builder.sh 
b/scripts/mkstages/stages_builder.sh
index 964e41e..4254c25 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -1,155 +1,95 @@
 #!/bin/bash
-export TARGETVER="${TARGETVER:-9.1}"
-export MKSRC="${MKSRC:-NONE}"
+set -eu
+
+PORTDIR="${PORTDIR:-/usr/portage}"
+export TARGETVER="${TARGETVER:-11.1}"
 export WORKDATE="${WORKDATE:-local}"
 export WORKARCH="${WORKARCH:-$(uname -m)}"
-export FORCESTAGE3="${FORCESTAGE3:-}"
+export SOURCE_STAGE="${SOURCE_STAGE}"
+export TARGETARCH="${TARGETARCH:-}"
 export EXTRAOVERLAY="${EXTRAOVERLAY:-}"
-OLDVER="${OLDVER:-9.0}"
-OVERLAY_SNAPSHOT="https://gitweb.gentoo.org/proj/gentoo-bsd.git/snapshot/gentoo-bsd-master.tar.gz;
+export CLANG="${CLANG:-0}"
 
 prepare(){
-   local MAJORVER=`echo ${TARGETVER} | awk -F \. '{ print $1 }'`
-   if [ -n "${STABLE}" ] ; then
-   export CHOSTVER="${MAJORVER}.0"
-   else
-   export CHOSTVER="${TARGETVER}"
-   fi
-
-   if [ "$1" = "x86" ] || [ "${WORKARCH}" = "i386" ] ; then
-   export CATALYST_CHOST="i686-gentoo-freebsd${CHOSTVER}"
+   if [[ ${TARGETARCH} == x86 ]] || [[ ${WORKARCH} == i386 ]] ; then
+   export CATALYST_CHOST="i686-gentoo-freebsd${TARGETVER}"
export TARGETARCH="x86"
export TARGETSUBARCH="i686"
else
-   export CATALYST_CHOST="x86_64-gentoo-freebsd${CHOSTVER}"
+   export CATALYST_CHOST="x86_64-gentoo-freebsd${TARGETVER}"
export TARGETARCH="amd64"
export TARGETSUBARCH="amd64"
fi
 
export WORKDIR="/tmp/mk_stages_${TARGETARCH}_${TARGETVER}"
-   [[ -n ${CLANG} ]] && WORKDIR="${WORKDIR}_clang"
+   [[ ${CLANG} -ne 0 ]] && WORKDIR="${WORKDIR}_clang"
 
-   if [ -e ${WORKDIR} ] ; then
-   echo "WORKDIR ${WORKDIR} is already exists."
-   echo "Please remove manually it."
+   if [[ -e "${WORKDIR}" ]] ; then
+   echo "WORKDIR ${WORKDIR} already exists."
+   echo "Please remove it:"
echo ""
echo "chflags -R noschg ${WORKDIR} && rm -rf ${WORKDIR}"
exit 1
else
-   mkdir -p ${WORKDIR}
+   mkdir -p "${WORKDIR}"
fi
 
-   if [ ! -e "/var/tmp/catalyst/builds/default" ] ; then
-   mkdir -p /var/tmp/catalyst/builds/default
+   if [[ ! -e "/var/tmp/catalyst/builds/default" ]] ; then
+   mkdir -p "/var/tmp/catalyst/builds/default"
fi
 
-   if [ -z "${FORCESTAGE3}" ] ; then
-   if [ -z "${CLANG}" ] ; then
-   local 
oldstage3fn="stage3-${TARGETSUBARCH}-freebsd-${OLDVER}"
-   local 
oldstage3url="http://dev.gentoo.org/~aballier/fbsd${OLDVER}/${TARGETARCH}/${oldstage3fn}.tar.bz2;
-   else
-   local 
oldstage3fn="stage3-${TARGETSUBARCH}-clangfbsd-${OLDVER}"
-   local 
oldstage3url="http://dev.gentoo.org/~aballier/fbsd${OLDVER}/${TARGETARCH}/clang/${oldstage3fn}.tar.bz2;
-   fi
-
-   if [ ! -e 
"/var/tmp/catalyst/builds/default/${oldstage3fn}.tar.bz2" ] ; then
-   echo "Downloading aballier's ${TARGETSUBARCH} stage3 
file..."
-   wget -q -P /var/tmp/catalyst/builds/default 
"${oldstage3url}"
-   [[ $? -ne 0 ]] && exit 1
-   fi
-   export FORCESTAGE3="${oldstage3fn}"
-   fi
+   cd "${WORKDIR}"
 
-   cd ${WORKDIR}
-   if [ -d "${HOME}/gentoo-bsd" ] ; then
-   echo "Copy from ${HOME}/gentoo-bsd to ${WORKDIR}/"
-   cp -a "${HOME}/gentoo-bsd" ${WORKDIR}/
-   else
-   echo "Clone gentoo-bsd overlay snapshot..."
-   wget -q -O "${WORKDIR}"/gentoo-bsd.tar.gz "${OVERLAY_SNAPSHOT}"
-   [[ $? -ne 0 ]] && exit 1
-   mkdir -p ${WORKDIR}/gentoo-bsd
-   tar xzf "${WORKDIR}"/gentoo-bsd.tar.gz --strip-components=1 -C 
"${WORKDIR}/gentoo-bsd"
-   fi
-   if [ -n "${EXTRAOVERLAY}" ] ; then
+   if [[ -n "${EXTRAOVERLAY}" ]] ; then
+   mkdir -p "${WORKDIR}"/gentoo-bsd
if [[ "${EXTRAOVERLAY}" =~ ^http ]]; then
-   echo "Downloading extra overlay."
+   echo "Downloading extra overlay..."
wget -q -O ${WORKDIR}/extraoverlay.tar.bz2

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

2017-12-07 Thread Yuta SATOH 
commit: 53789eceebb7150f68090669635b9eedb7eeea60
Author: Yuta SATOH  gmail  com>
AuthorDate: Thu Dec  7 13:35:06 2017 +
Commit: Yuta SATOH  gentoo  gr  jp>
CommitDate: Thu Dec  7 13:35:06 2017 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=53789ece

remove old script.

 scripts/mkstages/chroot_prepare_upgrade.sh | 74 --
 1 file changed, 74 deletions(-)

diff --git a/scripts/mkstages/chroot_prepare_upgrade.sh 
b/scripts/mkstages/chroot_prepare_upgrade.sh
deleted file mode 100755
index 298c7fb..000
--- a/scripts/mkstages/chroot_prepare_upgrade.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-if [ -e /etc/make.conf ] ; then
-   echo "MAKEOPTS=\"-j`sysctl hw.ncpu | awk '{ print $2 + 1 }'`"\" >> 
/etc/make.conf
-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 #447810
-MAKEOPTS=-j1 emerge -q app-shells/bash || exit
-
-# fixes bug #412319
-emerge -q sys-devel/gcc-config || exit
-gcc-config 1
-
-# fixes bug #413865
-emerge -q app-arch/libarchive || exit
-
-# upgrade sys-freebsd packages
-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
-USE=symlink emerge -1q freebsd-bin freebsd-cddl freebsd-contrib freebsd-lib 
freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share 
freebsd-ubin freebsd-usbin || exit
-
-# sys-libs/zlib will request ${CHOST}-gcc.
-# different ${CHOST}-gcc fails to install
-CHOST=${CATALYST_CHOST} emerge -q sys-devel/gcc || exit
-
-# fixes bug 436560
-fixes436560(){
-   local rootdir=$1
-
-   if [ -d "${rootdir}lib64" ] && [ -L "${rootdir}lib" ] ; then
-   rm "${rootdir}lib"
-   LD_LIBRARY_PATH="${rootdir}lib64" mv "${rootdir}lib64" 
"${rootdir}lib"
-   ln -s lib ${rootdir}lib64
-   fi
-}
-
-fixes436560 /
-fixes436560 /usr/
-fixes436560 /usr/local/
-
-emerge -q sys-apps/baselayout
-emerge -q sys-apps/portage || 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
-
-if [ -e /etc/portage/profile ] ; then
-   rm -rf /etc/portage/profile
-   rm /etc/portage/package.keywords
-   rm /etc/portage/package.use
-   rm -rf /etc/portage/patches
-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
-touch /tmp/prepare_done

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

2015-07-13 Thread Yuta SATOH 
commit: 3e4b2faf25edc29cd6194fbb202b5e1271d9e856
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Mon Jul 13 12:38:31 2015 +
Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
CommitDate: Mon Jul 13 12:38:31 2015 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=3e4b2faf

create_forcestage3.sh: fixed some issues. tested amd64/10.1, amd64/10.1/clang, 
x86/10.1.

 scripts/mkstages/create_forcestage3.sh | 26 ++
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/scripts/mkstages/create_forcestage3.sh 
b/scripts/mkstages/create_forcestage3.sh
index 515aae2..e0aff8c 100644
--- a/scripts/mkstages/create_forcestage3.sh
+++ b/scripts/mkstages/create_forcestage3.sh
@@ -14,6 +14,15 @@ prepare(){
local distdir=$(emerge --info | grep DISTDIR | sed s:DISTDIR=::g | sed 
's:::g')
if [[ ! -d ${WORKDIR} ]]; then
mkdir -p ${WORKDIR}
+   else
+   echo ${WORKDIR} exists.
+   echo Please remove the following steps.
+   echo 
+   echo kill -9 $(ps auxw | grep ebuild-helpers/ecompressdir | 
grep -v grep | awk '{ print $2 }' | xargs)
+   echo umount $(mount | grep ${WORKDIR} | awk '{print $3}' | 
xargs)
+   echo umount $(mount | grep ${WORKDIR} | awk '{print $3}' | 
xargs)
+   echo chflags -R noschg \${WORKDIR}\  rm -rf \${WORKDIR}\
+   exit 1
fi
 
if [[ ${OLDSTAGE3} =~ ^http ]]; then
@@ -56,6 +65,9 @@ chroot_update(){
export EMERGE_DEFAULT_OPTS=-q
chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} kernel
chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} 
freebsd_userland
+   if [[ -e ${WORKDIR}/usr/bin/git ]]; then
+   chroot ${WORKDIR} emerge -C dev-vcs/git
+   fi
REMOVEPERL=1 chroot ${WORKDIR} bash /automatic_updater.sh 
${TARGETVER} world
unset EMERGE_DEFAULT_OPTS
 }
@@ -74,8 +86,13 @@ check_ecompressdir() {
 }
 
 cleanup(){
+   local distdir=$(emerge --info | grep DISTDIR | sed s:DISTDIR=::g | sed 
's:::g')
+
check_ecompressdir
-   umount ${WORKDIR}/usr/portage/distfiles
+   if [[ ! ${distdir} =~ ${PORTDIR}.* ]]; then
+   echo unmount DISTDIR
+   umount ${WORKDIR}/usr/portage/distfiles
+   fi
umount ${WORKDIR}/usr/portage
if [[ ${TMPFS} -ne 0 ]] ; then
umount ${WORKDIR}/var/tmp/portage
@@ -91,12 +108,13 @@ create_stage3(){
mkdir -p /var/tmp/catalyst/builds/default
fi
if [[ ${CLANG} -ne 0 ]]; then
-   tarfile=stage3-${TARGETARCH}-fbsd-${TAGETVER}-forcestage3-cl
+   tarfile=stage3-${TARGETARCH}-fbsd-${TARGETVER}-forcestage3-cl
else
-   tarfile=stage3-${TARGETARCH}-fbsd-${TAGETVER}-forcestage3
+   tarfile=stage3-${TARGETARCH}-fbsd-${TARGETVER}-forcestage3
fi
 
-   tar cjpf /var/tmp/catalyst/builds/default/${tarfile}.tar.bz2 .
+   echo Compress with tar.
+   LANG=en_US.UTF-8 tar cjpf 
/var/tmp/catalyst/builds/default/${tarfile}.tar.bz2 .
 
echo Complete !
echo Set FORCESTAGE3=${tarfile}

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

2015-07-12 Thread Yuta SATOH 
commit: 3d0f050caab91226fe78eff4665c0b7c627e8dab
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Sun Jul 12 07:55:50 2015 +
Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
CommitDate: Sun Jul 12 07:55:50 2015 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=3d0f050c

create_forcestage3.sh: added /tmp.

 scripts/mkstages/create_forcestage3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mkstages/create_forcestage3.sh 
b/scripts/mkstages/create_forcestage3.sh
index e30be09..4edead8 100644
--- a/scripts/mkstages/create_forcestage3.sh
+++ b/scripts/mkstages/create_forcestage3.sh
@@ -17,7 +17,7 @@ prepare(){
fi
 
if [[ ${OLDSTAGE3} =~ ^http ]]; then
-   if [[ ! -e $(basename ${OLDSTAGE3}) ]]; then
+   if [[ ! -e /tmp/$(basename ${OLDSTAGE3}) ]]; then
wget -P /tmp ${OLDSTAGE3}
fi
else

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

2015-07-12 Thread Yuta SATOH 
commit: 02f6bb63dd00fdd5181b885746f8bbf9e2abc7b5
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Sun Jul 12 07:49:47 2015 +
Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
CommitDate: Sun Jul 12 07:49:47 2015 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=02f6bb63

create_forcestage3.sh: added check OLDSTAGE3 file exists.

 scripts/mkstages/create_forcestage3.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/mkstages/create_forcestage3.sh 
b/scripts/mkstages/create_forcestage3.sh
index 0d8954e..e30be09 100644
--- a/scripts/mkstages/create_forcestage3.sh
+++ b/scripts/mkstages/create_forcestage3.sh
@@ -17,7 +17,9 @@ prepare(){
fi
 
if [[ ${OLDSTAGE3} =~ ^http ]]; then
-   wget -P /tmp ${OLDSTAGE3}
+   if [[ ! -e $(basename ${OLDSTAGE3}) ]]; then
+   wget -P /tmp ${OLDSTAGE3}
+   fi
else
cp ${OLDSTAGE3} /tmp
fi

[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/specs/x86-fbsd/, scripts/mkstages/specs/amd64-fbsd/, ...

2015-07-12 Thread Yuta SATOH 
commit: 9aa54a1de7d1aa0b1d16e92087d574204de77996
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Sun Jul 12 09:03:59 2015 +
Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
CommitDate: Sun Jul 12 09:03:59 2015 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=9aa54a1d

added catalyst sample specs.

 scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec | 9 +
 scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec | 9 +
 scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec | 9 +
 scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec | 9 +
 scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec | 8 
 scripts/mkstages/specs/amd64-fbsd-clang/stage3_tmp.spec | 8 
 scripts/mkstages/specs/amd64-fbsd/stage1.spec   | 8 
 scripts/mkstages/specs/amd64-fbsd/stage1_tmp.spec   | 8 
 scripts/mkstages/specs/amd64-fbsd/stage2.spec   | 8 
 scripts/mkstages/specs/amd64-fbsd/stage2_tmp.spec   | 8 
 scripts/mkstages/specs/amd64-fbsd/stage3.spec   | 7 +++
 scripts/mkstages/specs/amd64-fbsd/stage3_tmp.spec   | 7 +++
 scripts/mkstages/specs/x86-fbsd/stage1.spec | 8 
 scripts/mkstages/specs/x86-fbsd/stage1_tmp.spec | 8 
 scripts/mkstages/specs/x86-fbsd/stage2.spec | 8 
 scripts/mkstages/specs/x86-fbsd/stage2_tmp.spec | 8 
 scripts/mkstages/specs/x86-fbsd/stage3.spec | 7 +++
 scripts/mkstages/specs/x86-fbsd/stage3_tmp.spec | 7 +++
 18 files changed, 144 insertions(+)

diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec 
b/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec
new file mode 100644
index 000..2adc441
--- /dev/null
+++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage1.spec
@@ -0,0 +1,9 @@
+chost: x86_64-gentoo-freebsd10.1
+cxxflags: -stdlib=libc++ ${CFLAGS}
+target: stage1
+version_stamp: fbsd-10.1-20150712-cl
+profile: default/bsd/fbsd/amd64/10.1/clang
+snapshot: 20150712
+source_subpath: default/stage3-amd64-fbsd-10.1-20150712-clt
+subarch: amd64
+rel_type: default

diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec 
b/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec
new file mode 100644
index 000..c780435
--- /dev/null
+++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage1_tmp.spec
@@ -0,0 +1,9 @@
+chost: x86_64-gentoo-freebsd10.1
+cxxflags: -stdlib=libc++ ${CFLAGS}
+target: stage1
+version_stamp: fbsd-10.1-20150712-clt
+profile: default/bsd/fbsd/amd64/10.1/clang
+snapshot: 20150712
+source_subpath: default/stage3-amd64-fbsd-10.1-forcestage3-cl
+subarch: amd64
+rel_type: default

diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec 
b/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec
new file mode 100644
index 000..1de9e13
--- /dev/null
+++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage2.spec
@@ -0,0 +1,9 @@
+chost: x86_64-gentoo-freebsd10.1
+cxxflags: -stdlib=libc++ ${CFLAGS}
+target: stage2
+version_stamp: fbsd-10.1-20150712-cl
+profile: default/bsd/fbsd/amd64/10.1/clang
+snapshot: 20150712
+source_subpath: default/stage1-amd64-fbsd-10.1-20150712-cl
+subarch: amd64
+rel_type: default

diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec 
b/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec
new file mode 100644
index 000..73ff50f
--- /dev/null
+++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage2_tmp.spec
@@ -0,0 +1,9 @@
+chost: x86_64-gentoo-freebsd10.1
+cxxflags: -stdlib=libc++ ${CFLAGS}
+target: stage2
+version_stamp: fbsd-10.1-20150712-clt
+profile: default/bsd/fbsd/amd64/10.1/clang
+snapshot: 20150712
+source_subpath: default/stage1-amd64-fbsd-10.1-20150712-clt
+subarch: amd64
+rel_type: default

diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec 
b/scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec
new file mode 100644
index 000..d5e1fd8
--- /dev/null
+++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage3.spec
@@ -0,0 +1,8 @@
+cxxflags: -stdlib=libc++ ${CFLAGS}
+target: stage3
+version_stamp: fbsd-10.1-20150712-cl
+profile: default/bsd/fbsd/amd64/10.1/clang
+snapshot: 20150712
+source_subpath: default/stage2-amd64-fbsd-10.1-20150712-cl
+subarch: amd64
+rel_type: default

diff --git a/scripts/mkstages/specs/amd64-fbsd-clang/stage3_tmp.spec 
b/scripts/mkstages/specs/amd64-fbsd-clang/stage3_tmp.spec
new file mode 100644
index 000..8550390
--- /dev/null
+++ b/scripts/mkstages/specs/amd64-fbsd-clang/stage3_tmp.spec
@@ -0,0 +1,8 @@
+cxxflags: -stdlib=libc++ ${CFLAGS}
+target: stage3
+version_stamp: fbsd-10.1-20150712-clt
+profile: default/bsd/fbsd/amd64/10.1/clang
+snapshot: 20150712
+source_subpath: default/stage2-amd64-fbsd-10.1-20150712-clt
+subarch: amd64
+rel_type: default

diff --git a/scripts/mkstages/specs/amd64-fbsd/stage1.spec 
b/scripts/mkstages/specs/amd64-fbsd/stage1.spec
new file mode 100644
index 000..dcb7c22

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

2015-07-11 Thread Yuta SATOH 
commit: b54c1fed2e973a321f5292b654e7a1934fee8770
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Sat Jul 11 23:07:55 2015 +
Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
CommitDate: Sat Jul 11 23:07:55 2015 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=b54c1fed

stages_builder.sh: some issue fix.

 scripts/mkstages/stages_builder.sh | 76 ++
 1 file changed, 11 insertions(+), 65 deletions(-)

diff --git a/scripts/mkstages/stages_builder.sh 
b/scripts/mkstages/stages_builder.sh
index 3317cc7..3414edb 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -6,7 +6,7 @@ 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;
+OVERLAY_SNAPSHOT=https://gitweb.gentoo.org/proj/gentoo-bsd.git/snapshot/gentoo-bsd-master.tar.gz;
 
 prepare(){
local MAJORVER=`echo ${TARGETVER} | awk -F \. '{ print $1 }'`
@@ -68,7 +68,7 @@ prepare(){
echo Clone gentoo-bsd overlay snapshot...
type -P git
[[ $? -ne 0 ]]  emerge git
-   git clone git://git.overlays.gentoo.org/proj/gentoo-bsd.git
+   git clone git://anongit.gentoo.org/proj/gentoo-bsd.git
[[ $? -ne 0 ]]  exit 1
fi
if [ -n ${EXTRAOVERLAY} ] ; then
@@ -87,11 +87,8 @@ prepare(){
fi
 
echo emerging catalyst...
-   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 21
-   if [ $? -ne 0 ] ; then
-   echo export MAKEOPTS=\-j`sysctl hw.ncpu | awk '{ print $2 + 1 
}'`\  /etc/catalyst/catalystrc
-   fi
+   PORTDIR_OVERLAY=${WORKDIR}/gentoo-bsd ACCEPT_KEYWORDS=~x86-fbsd emerge 
-uq app-cdr/cdrtools app-text/build-docbook-catalog || exit 1
+   PORTDIR_OVERLAY=${WORKDIR}/gentoo-bsd ACCEPT_KEYWORDS=~x86-fbsd emerge 
-q dev-util/catalyst::gentoo-bsd || exit 1
 
if [ ! -e /usr/portage/profiles/releases/freebsd-${TARGETVER} ] ; then
echo prepare new ${TARGETVER} profiles
@@ -107,35 +104,6 @@ prepare(){
_EOF_
fi
 
-   if [ ${MKSRC} != NONE ] ; then
-   if [ ${MKSRC} = release ] ; then
-   MY_MKSRC=
-   else
-   MY_MKSRC=_${MKSRC}
-   fi
-   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}/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 21
-   if [ $? -eq 0 ] ; then
-   create_manifest /usr/portage/sys-freebsd
-   export WORKDATE=local
-   fi
-   create_manifest ${WORKDIR}/gentoo-bsd/sys-freebsd
-   fi
-
if [ ${WORKDATE} = remote ] ; then
wget -q -O ${WORKDIR}/snapshot_list.html 
http://distfiles.gentoo.org/snapshots/
export WORKDATE=`grep -e 'portage-[0-9]\+.*bz2' 
${WORKDIR}/snapshot_list.html | tail -n 1 | gsed 
's:.*portage-\([0-9]\+\).*:\1:g'`
@@ -153,8 +121,10 @@ prepare(){
else
export WORKDATE=`date +%Y%m%d`
fi
-   else
+   elif [ ${WORKDATE} = local ] ; then
export WORKDATE=`date +%Y%m%d`
+   else
+   export WORKDATE=${WORKDATE}
fi
 
if [ -n ${STABLE} ] ; then
@@ -170,34 +140,6 @@ prepare(){
fi
 }
 
-create_manifest(){
-   local rootdir=$1
-
-   if [ -d ${rootdir} ] ; then
-   cd ${rootdir}
-   echo re-create Manifest
-   for dir in `ls -1 | grep freebsd-` boot0;
-   do
-   cd ${dir}
-   ls -1 *${TARGETVER}*.ebuild  /dev/null 21
-   if [ $? -eq 0 ] ; then
-   EBUILDFILE=`ls -1 *${TARGETVER}*.ebuild | tail 
-n 1`
-   echo copy

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

2015-07-11 Thread Yuta SATOH 
commit: 988ba7cc9b1f74d8657a1248524af4fabeafdc7c
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Sun Jul 12 04:43:16 2015 +
Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
CommitDate: Sun Jul 12 04:43:16 2015 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=988ba7cc

create_forcestage3.sh: added sample script.

 scripts/mkstages/create_forcestage3.sh | 107 +
 1 file changed, 107 insertions(+)

diff --git a/scripts/mkstages/create_forcestage3.sh 
b/scripts/mkstages/create_forcestage3.sh
new file mode 100644
index 000..0d8954e
--- /dev/null
+++ b/scripts/mkstages/create_forcestage3.sh
@@ -0,0 +1,107 @@
+#!/bin/bash
+set -eu
+
+TARGETVER=${TARGETVER:-10.1}
+TARGETARCH=${TARGETARCH:-amd64}
+OLDSTAGE3=${OLDSTAGE3:-http://distfiles.gentoo.org/experimental/bsd/freebsd/stages/amd64-fbsd-9.1/stage3-amd64-freebsd-9.1.tar.bz2};
+WORKDIR=/${TARGETVER}-forcestage3/${TARGETARCH}
+PORTDIR=${PORTDIR:-/usr/portage}
+TMPFS=${TMPFS:-0}
+CLANG=${CLANG:-0}
+[[ ${CLANG} -ne 0 ]]  WORKDIR=${WORKDIR}_clang
+
+prepare(){
+   local distdir=$(emerge --info | grep DISTDIR | sed s:DISTDIR=::g | sed 
's:::g')
+   if [[ ! -d ${WORKDIR} ]]; then
+   mkdir -p ${WORKDIR}
+   fi
+
+   if [[ ${OLDSTAGE3} =~ ^http ]]; then
+   wget -P /tmp ${OLDSTAGE3}
+   else
+   cp ${OLDSTAGE3} /tmp
+   fi
+
+   tar xjpf /tmp/$(basename ${OLDSTAGE3}) -C ${WORKDIR}
+
+   mkdir -p ${WORKDIR}/usr/portage/distfiles
+   mkdir -p ${WORKDIR}/var/tmp/portage
+
+   mount -t devfs devfs ${WORKDIR}/dev
+   mount -t nullfs ${PORTDIR} ${WORKDIR}/usr/portage
+   if [[ ! ${distdir} =~ ${PORTDIR}.* ]]; then
+   echo mount DISTDIR
+   mount -t nullfs ${WORKDIR}/usr/portage/distfiles
+   fi
+   if [[ ${TMPFS} -ne 0 ]] ; then
+   echo mount TMPFS
+   mount -t tmpfs tmpfs ${WORKDIR}/var/tmp/portage
+   fi
+   wget -P ${WORKDIR} 
https://gitweb.gentoo.org/proj/gentoo-bsd.git/plain/scripts/automatic_updater.sh
+   cp /etc/resolv.conf ${WORKDIR}/etc
+}
+
+chroot_update(){
+   if [[ -e ${WORKDIR}/etc/make.conf ]]; then
+   local makeconf=${WORKDIR}/etc/make.conf
+   else
+   local makeconf=${WORKDIR}/etc/portage/make.conf
+   fi
+
+   echo MAKEOPTS=\-j$(sysctl hw.ncpu | awk '{ print $2 + 1 }')\  
${makeconf}
+   echo 'USE=${USE} -fortran -build-kernel'  ${makeconf}
+
+   export EMERGE_DEFAULT_OPTS=-q 
+   chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} kernel
+   chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} 
freebsd_userland
+   chroot ${WORKDIR} bash /automatic_updater.sh ${TARGETVER} world
+   unset EMERGE_DEFAULT_OPTS
+}
+
+check_ecompressdir() {
+   # dirty solution
+   # /dev is still mounted; performing auto-bind-umount... 
+   local PID=$(ps auxw | grep ebuild-helpers/ecompressdir | grep -v grep | 
awk '{ print $2 }' | xargs)
+   if [[ -n ${PID} ]] ; then
+   echo kill ecompressdir
+   kill -9 ${PID}  :
+   return 0
+   else
+   return 0
+   fi
+}
+
+cleanup(){
+   check_ecompressdir
+   umount ${WORKDIR}/usr/portage/distfiles
+   umount ${WORKDIR}/usr/portage
+   if [[ ${TMPFS} -ne 0 ]] ; then
+   umount ${WORKDIR}/var/tmp/portage
+   fi
+   umount ${WORKDIR}/dev
+}
+
+create_stage3(){
+   local tarfile
+
+   cd ${WORKDIR}
+   if [[ ! -e /var/tmp/catalyst/builds/default ]] ; then
+   mkdir -p /var/tmp/catalyst/builds/default
+   fi
+   if [[ ${CLANG} -ne 0 ]]; then
+   tarfile=stage3-${TARGETARCH}-fbsd-${TAGETVER}-forcestage3-cl
+   else
+   tarfile=stage3-${TARGETARCH}-fbsd-${TAGETVER}-forcestage3
+   fi
+
+   tar cjpf /var/tmp/catalyst/builds/default/${tarfile}.tar.bz2 .
+
+   echo Complete !
+   echo Set FORCESTAGE3=${tarfile}
+}
+
+prepare
+chroot_update
+cleanup
+create_stage3
+

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

2015-07-11 Thread Yuta SATOH 
commit: 6bb2b0d6c1f288c71cf95941e06efc4d75031563
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Sun Jul 12 03:56:36 2015 +
Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
CommitDate: Sun Jul 12 03:56:36 2015 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=6bb2b0d6

stages_builder.sh: When it contains forcestage3 in FORCESTAGE3, disables 
update_seed.

 scripts/mkstages/stages_builder.sh | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/mkstages/stages_builder.sh 
b/scripts/mkstages/stages_builder.sh
index 3414edb..f8e4a79 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -66,10 +66,10 @@ prepare(){
cp -a ${HOME}/gentoo-bsd ${WORKDIR}/
else
echo Clone gentoo-bsd overlay snapshot...
-   type -P git
-   [[ $? -ne 0 ]]  emerge git
-   git clone git://anongit.gentoo.org/proj/gentoo-bsd.git
+   wget -q -O ${WORKDIR}/gentoo-bsd.tar.gz ${OVERLAY_SNAPSHOT}
[[ $? -ne 0 ]]  exit 1
+   mkdir -p ${WORKDIR}/gentoo-bsd
+   tar xzf ${WORKDIR}/gentoo-bsd.tar.gz --strip-components=1 -C 
${WORKDIR}/gentoo-bsd
fi
if [ -n ${EXTRAOVERLAY} ] ; then
if [[ ${EXTRAOVERLAY} =~ ^http ]]; then
@@ -142,7 +142,7 @@ prepare(){
 
 check_ecompressdir() {
# dirty solution
-   # /dev is still mounted; performing auto-bind-umount... 
+   # /dev is still mounted; performing auto-bind-umount...
local PID=`ps auxw | grep ebuild-helpers/ecompressdir | grep -v grep | 
awk '{ print $2 }' | xargs`
if [ -n ${PID} ] ; then
echo kill ecompressdir
@@ -164,7 +164,7 @@ run_catalyst() {
local specfile=${WORKDIR}/${C_TARGET}.spec
[[ -e ${specfile} ]]  rm ${specfile}
 
-   if [ ${C_TARGET} = stage1 ]  [ ${C_SOURCE} != 
stage3-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION} 
]; then
+   if [ ${C_TARGET} = stage1 ]  [ ${C_SOURCE} != 
stage3-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION} 
]  [[ ! ${C_SOURCE} =~ .*forcestage3.* ]]; then
echo update_seed: yes  ${specfile}
fi
if [ ${C_TARGET} != stage3 ] ; then
@@ -190,9 +190,12 @@ run_catalyst() {
source_subpath: default/${C_SOURCE}
subarch: ${TARGETSUBARCH}
rel_type: default
-   portage_overlay: ${WORKDIR}/gentoo-bsd
_EOF_
 
+   if [ ! -n ${NOOVERLAY} ] ; then
+   echo portage_overlay: ${WORKDIR}/gentoo-bsd  
${specfile}
+   fi
+
catalyst -f ${specfile}
 
if [ $? -ne 0 ] ; then

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

2015-02-13 Thread Yuta SATOH 
commit: 29986d119cb7fa2a16b06649ac0e1e4e20281b9b
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Fri Feb 13 11:27:44 2015 +
Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
CommitDate: Fri Feb 13 11:27:44 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=29986d11

stages_builder.sh, Change to the method of using catalyst spec, fixed CXXFLAGS 
of CLANG stages

---
 scripts/mkstages/stages_builder.sh | 36 
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/scripts/mkstages/stages_builder.sh 
b/scripts/mkstages/stages_builder.sh
index 58af37e..3317cc7 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -99,8 +99,12 @@ prepare(){
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
+
+   cat - _EOF_  /usr/portage/profiles/profiles.desc
+   amd64-fbsd default/bsd/fbsd/amd64/${TARGETVER} dev
+   amd64-fbsd default/bsd/fbsd/amd64/${TARGETVER}/clang dev
+   x86-fbsd default/bsd/fbsd/x86/${TARGETVER} dev
+   _EOF_
fi
 
if [ ${MKSRC} != NONE ] ; then
@@ -215,23 +219,39 @@ 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
+   local specfile=${WORKDIR}/${C_TARGET}.spec
+   [[ -e ${specfile} ]]  rm ${specfile}
+
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
+   echo update_seed: yes  ${specfile}
fi
if [ ${C_TARGET} != stage3 ] ; then
-   C_APPEND_OPT=${C_APPEND_OPT} chost=${CATALYST_CHOST}
+   echo chost: ${CATALYST_CHOST}  ${specfile}
fi
if [ -n ${STABLE} ] ; then
-   C_APPEND_OPT=${C_APPEND_OPT} 
portage_confdir=${WORKDIR}/gentoo-bsd/scripts/mkstages/etc/portage
+   echo portage_confdir: 
${WORKDIR}/gentoo-bsd/scripts/mkstages/etc/portage  ${specfile}
else
if [ -e ${WORKDIR}/gentoo-bsd/etc/portage ] ; then
-   C_APPEND_OPT=${C_APPEND_OPT} 
portage_confdir=${WORKDIR}/gentoo-bsd/etc/portage
+   echo portage_confdir: 
${WORKDIR}/gentoo-bsd/etc/portage  ${specfile}
fi
fi
if [ -n ${CLANG} ] ; then
C_APPEND_PROFILE=/clang
+   echo 'cxxflags: -stdlib=libc++ ${CFLAGS}'  
${specfile}
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}/gentoo-bsd 
${C_APPEND_OPT}
+
+   cat - _EOF_  ${specfile}
+   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
+   _EOF_
+
+   catalyst -f ${specfile}
 
if [ $? -ne 0 ] ; then
check_ecompressdir 
${C_TARGET}-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION}/usr/local/portage
@@ -239,7 +259,7 @@ run_catalyst() {
if [ ${C_TARGET} = stage1 ]  [ 
${C_SOURCE} != 
stage3-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_TMP_APPEND_VERSION} 
]; then
 C_APPEND_OPT=${C_APPEND_OPT} 
update_seed=no
fi
-   catalyst -C target=${C_TARGET} 
version_stamp=fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION}

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

2014-11-15 Thread Yuta SATOH 
commit: bd1e7006c588ac340805cf09736b33e8a12a7395
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Sat Nov 15 12:07:34 2014 +
Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com
CommitDate: Sat Nov 15 12:07:34 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=bd1e7006

stages_builder.sh: added URL support, EXTRAOVERLAY

---
 scripts/mkstages/stages_builder.sh | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/scripts/mkstages/stages_builder.sh 
b/scripts/mkstages/stages_builder.sh
index 09055d0..a4eeff0 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -61,8 +61,18 @@ prepare(){
[[ $? -ne 0 ]]  exit 1
fi
if [ -n ${EXTRAOVERLAY} ] ; then
-   echo Copy from ${EXTRAOVERLAY} to ${WORKDIR}/gentoo-bsd
-   cp -a ${EXTRAOVERLAY}/* ${WORKDIR}/gentoo-bsd/
+   if [[ ${EXTRAOVERLAY} =~ ^http ]]; then
+   echo Downloading extra overlay.
+   wget -q -O ${WORKDIR}/extraoverlay.tar.bz2 
${EXTRAOVERLAY}
+   [[ $? -ne 0 ]]  exit 1
+   echo Copy from ${WORKDIR}/extraoverlay to 
${WORKDIR}/gentoo-bsd
+   mkdir ${WORKDIR}/extraoverlay
+   tar xjf ${WORKDIR}/extraoverlay.tar.bz2 
--strip-components=1 -C ${WORKDIR}/extraoverlay
+   cp -a ${WORKDIR}/extraoverlay/* ${WORKDIR}/gentoo-bsd/
+   else
+   echo Copy from ${EXTRAOVERLAY} to 
${WORKDIR}/gentoo-bsd
+   cp -a ${EXTRAOVERLAY}/* ${WORKDIR}/gentoo-bsd/
+   fi
fi
 
echo emerging catalyst...

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

2014-11-15 Thread Yuta SATOH 
commit: 093a6ac384d993ca66e78607bfce91923d57395c
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Sat Nov 15 16:24:53 2014 +
Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com
CommitDate: Sat Nov 15 16:24:53 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=093a6ac3

stages_builder.sh: Add the code to download clang stage3.

---
 scripts/mkstages/stages_builder.sh | 19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/scripts/mkstages/stages_builder.sh 
b/scripts/mkstages/stages_builder.sh
index a4eeff0..d95eb85 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -43,10 +43,21 @@ prepare(){
mkdir -p /var/tmp/catalyst/builds/default
fi
 
-   if [ ! -e 
/var/tmp/catalyst/builds/default/stage3-${TARGETSUBARCH}-freebsd-${OLDVER}.tar.bz2
 ]  [ -z ${FORCESTAGE3} ]; then
-   echo Downloading aballier's ${TARGETSUBARCH} stage3 file...
-   wget -q -P /var/tmp/catalyst/builds/default 
http://dev.gentoo.org/~aballier/fbsd${OLDVER}/${TARGETARCH}/stage3-${TARGETSUBARCH}-freebsd-${OLDVER}.tar.bz2
-   [[ $? -ne 0 ]]  exit 1
+   if [ -z ${FORCESTAGE3} ] ; then
+   if [ -z ${CLANG} ] ; then
+   local 
oldstage3fn=stage3-${TARGETSUBARCH}-freebsd-${OLDVER}
+   local 
oldstage3url=http://dev.gentoo.org/~aballier/fbsd${OLDVER}/${TARGETARCH}/${oldstage3fn}.tar.bz2;
+   else
+   local 
oldstage3fn=stage3-${TARGETSUBARCH}-clangfbsd-${OLDVER}
+   local 
oldstage3url=http://dev.gentoo.org/~aballier/fbsd${OLDVER}/${TARGETARCH}/clang/${oldstage3fn}.tar.bz2;
+   fi
+
+   if [ ! -e 
/var/tmp/catalyst/builds/default/${oldstage3fn}.tar.bz2 ] ; then
+   echo Downloading aballier's ${TARGETSUBARCH} stage3 
file...
+   wget -q -P /var/tmp/catalyst/builds/default 
${oldstage3url}
+   [[ $? -ne 0 ]]  exit 1
+   export FORCESTAGE3=${oldstage3fn}
+   fi
fi
 
cd ${WORKDIR}

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

2014-11-15 Thread Yuta SATOH 
commit: 982c5145b50d15e755f9ff09f8f24d1aac59
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Sun Nov 16 07:31:59 2014 +
Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com
CommitDate: Sun Nov 16 07:31:59 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=982c5145

stages_builder.sh: When check_ecompressdir fails, set update_seed=no

---
 scripts/mkstages/stages_builder.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/mkstages/stages_builder.sh 
b/scripts/mkstages/stages_builder.sh
index d95eb85..856742a 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -236,6 +236,9 @@ run_catalyst() {
if [ $? -ne 0 ] ; then
check_ecompressdir 
${C_TARGET}-${TARGETSUBARCH}-fbsd-${TARGETVER}-${WORKDATE}${C_APPEND_VERSION}/usr/local/portage
if [ $? -ne 0 ] ; 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=no
+   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}/gentoo-bsd 
${C_APPEND_OPT} || exit 1
fi
fi

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

2014-10-29 Thread Yuta SATOH 
commit: 86c82e0b35fba3367729496d2b028e43ba26307a
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Wed Oct 29 12:14:47 2014 +
Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com
CommitDate: Wed Oct 29 12:14:47 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=86c82e0b

stages_builder.sh: ebuild-helpers/ecompressdir path update.

---
 scripts/mkstages/stages_builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mkstages/stages_builder.sh 
b/scripts/mkstages/stages_builder.sh
index f3021ca..09055d0 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -176,7 +176,7 @@ create_manifest(){
 check_ecompressdir() {
# dirty solution
# /dev is still mounted; performing auto-bind-umount... 
-   local PID=`ps auxw | grep portage/bin/ebuild-helpers/ecompressdir | 
grep -v grep | awk '{ print $2 }' | xargs`
+   local PID=`ps auxw | grep ebuild-helpers/ecompressdir | grep -v grep | 
awk '{ print $2 }' | xargs`
if [ -n ${PID} ] ; then
echo kill ecompressdir
kill -9 ${PID}

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

2014-10-28 Thread Yuta SATOH 
commit: b497f0699d949af24c21c638b2d30e54380e6db1
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Mon Oct 20 11:24:02 2014 +
Commit: Yuta SATOH nigoro.gentoo AT 0x100 DOT com
CommitDate: Mon Oct 20 11:24:02 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=b497f069

gfbsd stages builder, added update_seed=yes

---
 scripts/mkstages/stages_builder.sh | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/scripts/mkstages/stages_builder.sh 
b/scripts/mkstages/stages_builder.sh
index 27b338d..82c7d32 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -76,9 +76,12 @@ 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/
+   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
 
if [ ${MKSRC} != NONE ] ; then
@@ -238,6 +241,9 @@ 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
+   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