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

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

[Alexis Ballier]

commit:     2d9090946d3e81a307e0aaf1a9309da4cab837c3
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  7 12:07:28 2011 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Nov  7 12:07:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=2d909094

add script for extracting 9.0 rc

---
 scripts/extract-9.0.sh |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 44 insertions(+), 0 deletions(-)

diff --git a/scripts/extract-9.0.sh b/scripts/extract-9.0.sh
new file mode 100755
index 0000000..66265b4
--- /dev/null
+++ b/scripts/extract-9.0.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+if [[ $# -lt 1 ]]; then
+	echo "You must specify the version of the packages to build."
+	exit 1
+fi
+
+# These are the base packages recognized by original script:
+# base bin contrib crypto etc games gnu include krb5 lib libexec release
+# rescue sbin secure share sys tools ubin usbin
+# Added cddl and compat.
+
+if [[ -z $2 ]]; then
+	dists="bin cddl contrib crypto gnu include lib libexec sbin share usr.bin usr.sbin sys etc rescue "
+else
+	dists="$2"
+fi
+
+MIRROR=${FTPMIRROR:-ftp.FreeBSD.org}
+echo "Using mirror ${MIRROR}"
+
+P=$1
+MY_P=${P/_rc/-RC}
+MY_P=${MY_P/_beta/-BETA}
+echo "Getting version ${P} [${MY_P}].."
+if [[ ${MY_P} == ${P} ]]; then
+	MY_P="${MY_P}-RELEASE"
+fi
+
+echo "Downloading files..."
+wget -nv -c "ftp://${MIRROR}/pub/FreeBSD/releases/i386/i386/${MY_P}/MANIFEST"
+wget -nv -c "ftp://${MIRROR}/pub/FreeBSD/releases/i386/i386/${MY_P}/src.txz"
+echo "Done downloading files."
+
+echo "Repackaging files..."
+tar xf src.txz
+for i in $dists; do
+	echo "  Repackaging source component: $i"
+        pushd usr/src > /dev/null
+        tar cjf ../../freebsd-${i/usr./u}-$P.tar.bz2 $i
+        popd > /dev/null
+done
+echo "Done repackaging sources."
+exit 0

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

[Yuta SATOH]

commit:     ff57cdc66510010107d7d91e4cdad9480b6f31d0
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Oct 14 06:07:46 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sun Oct 14 06:07:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=ff57cdc6

added migrate_libdir.sh -- Script for users who have been using old profile on amd64-fbsd , bug 436560

---
 scripts/migrate_libdir.sh |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/scripts/migrate_libdir.sh b/scripts/migrate_libdir.sh
new file mode 100755
index 0000000..eded8c1
--- /dev/null
+++ b/scripts/migrate_libdir.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+for d in / /usr /usr/local
+do
+	if [ -L ${d}/lib ] ; then
+		ls -l ${d}/lib | grep lib64 > /dev/null 2>&1
+		if [ $? -eq 0 ] ; then
+			rm ${d}/lib
+			if [ -d ${d}/lib64 ] ; then
+				LD_LIBRARY_PATH="${d}/lib64" mv ${d}/lib64 ${d}/lib
+			else
+				mkdir ${d}/lib
+			fi
+			ln -s lib ${d}/lib64
+			echo "Migrated to ${d}/lib from ${d}/lib64"
+		else
+			echo "Migration fails, lib symlink target is not ${d}/lib64."
+			ls -l ${d}/lib
+		fi
+	fi
+done
+

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

[Yuta SATOH]

commit:     b852f193ec4f86201acd7621a8634d5ead8e1f54
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Wed Oct  9 11:15:22 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Wed Oct  9 11:15:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=b852f193

extract-9.0.sh: added secure to dists and added support for alpha version

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

diff --git a/scripts/extract-9.0.sh b/scripts/extract-9.0.sh
index 66265b4..6dee694 100755
--- a/scripts/extract-9.0.sh
+++ b/scripts/extract-9.0.sh
@@ -11,7 +11,7 @@ fi
 # Added cddl and compat.
 
 if [[ -z $2 ]]; then
-	dists="bin cddl contrib crypto gnu include lib libexec sbin share usr.bin usr.sbin sys etc rescue "
+	dists="bin cddl contrib crypto gnu include lib libexec sbin share usr.bin usr.sbin sys etc rescue secure "
 else
 	dists="$2"
 fi
@@ -22,6 +22,8 @@ echo "Using mirror ${MIRROR}"
 P=$1
 MY_P=${P/_rc/-RC}
 MY_P=${MY_P/_beta/-BETA}
+MY_P=${MY_P/_alpha/-ALPHA}
+
 echo "Getting version ${P} [${MY_P}].."
 if [[ ${MY_P} == ${P} ]]; then
 	MY_P="${MY_P}-RELEASE"

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

[Yuta SATOH]

commit:     ac9f3674b7c7b019c943617e1a21283cbd262c2e
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Oct 26 12:01:40 2014 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sun Oct 26 12:01:40 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=ac9f3674

scripts/extract-9.0.sh: s/ftp:/http:/g

---
 scripts/extract-9.0.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/extract-9.0.sh b/scripts/extract-9.0.sh
index 14426cc..38d4b38 100755
--- a/scripts/extract-9.0.sh
+++ b/scripts/extract-9.0.sh
@@ -31,8 +31,8 @@ if [[ ${MY_P} == ${P} ]]; then
 fi
 
 echo "Downloading files..."
-wget -nv -c "ftp://${MIRROR}/pub/FreeBSD/releases/i386/i386/${MY_P}/MANIFEST"
-wget -nv -c "ftp://${MIRROR}/pub/FreeBSD/releases/i386/i386/${MY_P}/src.txz"
+wget -nv -c "http://${MIRROR}/pub/FreeBSD/releases/i386/i386/${MY_P}/MANIFEST"
+wget -nv -c "http://${MIRROR}/pub/FreeBSD/releases/i386/i386/${MY_P}/src.txz"
 echo "Done downloading files."
 
 # Create tar.xz 10.0 or later version. In the case of 9.x, create tar.bz2.

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

[Yuta SATOH]

commit:     e88134b0d8b010d1d268c477a4bc504fb785eefb
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Jul 11 11:17:17 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sat Jul 11 11:17:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=e88134b0

added sample script to automatic update.

 scripts/automatic_updater.sh | 136 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
new file mode 100644
index 0000000..0fd381b
--- /dev/null
+++ b/scripts/automatic_updater.sh
@@ -0,0 +1,136 @@
+#/bin/bash
+set -eu
+
+if [[ $# -ne 2 ]] ; then
+	echo "need 2 argument"
+	echo "arg 1: TARGETVER"
+	echo "arg 2: TARGETMODE, Please set kernel, freebsd_userland, world."
+	exit 1
+else
+	TARGETVER=$1
+	TARGETMODE=$2
+fi
+
+set_profile(){
+	emerge --info | head -n 1 | grep clang && :
+	if [[ $? -eq 0 ]] ; then
+		eselect profile set $(eselect profile list | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
+	else
+		eselect profile set $(eselect profile list | grep -v clang | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
+	fi
+}
+
+move_makeconf(){
+	[[ ! -e /etc/portage ]] && mkdir -p /etc/portage
+	if [[ -e /etc/make.conf ]] && [[ ! -e /etc/portage/make.conf ]] ; then
+		mv /etc/make.conf /etc/portage/make.conf
+	fi
+	gsed -i '/LDFLAGS=/d' /etc/portage/make.conf
+}
+
+update_portage(){
+	emerge -p --nodeps dev-lang/python-exec && :
+	if [[ $? -eq 0 ]] ; then
+		emerge --nodeps dev-lang/python-exec
+	fi
+	if [[ ! -e /usr/lib/python-exec ]] ; then
+		cd /tmp
+		wget http://dev.gentoo.org/~dolsen/releases/portage/portage-2.2.20.tar.bz2
+		tar xjf portage-2.2.20.tar.bz2
+		PYTHON_TARGETS="python2_7" portage-2.2.20/bin/emerge --nodeps dev-lang/python-exec
+		PYTHON_TARGETS="python2_7" portage-2.2.20/bin/emerge --nodeps sys-apps/portage
+		emerge -u sys-apps/portage --exclude sys-freebsd/*
+	else
+		emerge -u sys-apps/portage --exclude sys-freebsd/*
+	fi
+}
+
+update_minimal(){
+	emerge sys-freebsd/freebsd-mk-defs
+	emerge -u sys-apps/findutils --exclude sys-freebsd/*
+	emerge sys-devel/libtool --exclude sys-freebsd/*
+	emerge -u sys-devel/flex sys-devel/patch sys-devel/m4 net-libs/libpcap sys-devel/gettext app-arch/libarchive sys-libs/zlib dev-util/dialog --exclude sys-freebsd/*
+	emerge sys-devel/libtool --exclude sys-freebsd/*
+	if [[ -e /usr/lib/libc++.so ]] ; then
+		emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/*
+	fi
+}
+
+update_gcc(){
+	if [[ $(uname -p) == "amd64" ]] ; then
+		gsed -i "s:CHOST=.*:CHOST=\"x86_64-gentoo-freebsd${TARGETVER}\":g" /etc/portage/make.conf
+	else
+		gsed -i "s:CHOST=.*:CHOST=\"i686-gentoo-freebsd${TARGETVER}\":g" /etc/portage/make.conf
+	fi
+	emerge -u sys-devel/binutils --exclude sys-freebsd/*
+	emerge -u sys-devel/gcc-config --exclude sys-freebsd/*
+	emerge -u sys-devel/gcc --exclude sys-freebsd/*
+#	gcc-config $(gcc-config -l | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
+	emerge -C \<$(emerge -pq --nodeps sys-devel/gcc --exclude sys-freebsd/* | grep ebuild | awk '{print $4}') && :
+	env-update
+	source /etc/profile
+	emerge sys-devel/libtool --exclude sys-freebsd/*
+}
+
+update_kernel(){
+	emerge -C freebsd-sources sys-freebsd/virtio-kmod sys-fs/fuse4bsd && :
+	emerge --nodeps freebsd-sources
+	echo "Don't have a problem? Now we restart. "
+	echo "shutdown -r now"
+}
+
+update_freebsd_userland(){
+	if [[ $(uname -p) == "amd64" ]] && [[ ! -e /libexec/ld-elf32.so.1 ]] ; then
+		[[ ! -e /etc/portage/profile ]] && mkdir -p /etc/portage/profile
+		echo "sys-freebsd/freebsd-libexec abi_x86_32" >> /etc/portage/profile/package.use.mask
+	fi
+
+	emerge -C dev-libs/libelf dev-libs/libexecinfo dev-libs/libiconv sys-process/fuser-bsd && :
+	emerge --nodeps sys-freebsd/freebsd-libexec
+	USE=build emerge --nodeps sys-freebsd/freebsd-lib
+	USE=build emerge --nodeps sys-freebsd/freebsd-share
+	[[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-freebsd\/freebsd-libexec abi_x86_32/d' /etc/portage/profile/package.use.mask
+
+	emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin
+	emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin
+}
+
+post_freebsd_userland(){
+	emerge sys-devel/libtool app-admin/eselect
+	emerge sys-apps/portage
+}
+
+emerge_world(){
+	emerge sys-devel/libtool
+	emerge -e @world --exclude sys-apps/portage
+	emerge sys-apps/portage
+}
+
+cleanup(){
+	emerge sys-devel/libtool app-admin/eselect
+	emerge @preserved-rebuild
+}
+
+case "$TARGETMODE" in
+	"kernel" )
+		set_profile
+		move_makeconf
+		update_portage
+		update_minimal
+		update_gcc
+		update_kernel
+	;;
+	"freebsd_userland" )
+		update_freebsd_userland
+		post_freebsd_userland
+	;;
+	"world" )
+		emerge_world
+		cleanup
+	;;
+	* )
+		echo "Please set kernel, freebsd_userland, world."
+		exit 1
+	;;
+esac
+

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

[Yuta SATOH]

commit:     2f12a22761fa221e2380be13916b5b23939367b8
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Jul 12 00:09:43 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Jul 12 00:09:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=2f12a227

automatic_updater.sh : added kernelonly.

 scripts/automatic_updater.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index 0fd381b..c84a60e 100644
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -120,6 +120,7 @@ case "$TARGETMODE" in
 		update_gcc
 		update_kernel
 	;;
+	"kernelonly" ) update_kernel ;;
 	"freebsd_userland" )
 		update_freebsd_userland
 		post_freebsd_userland

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

[Yuta SATOH]

commit:     3db30f5ccdd6872765caea3870042a4f81ee41aa
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Jul 12 04:23:49 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Jul 12 04:23:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=3db30f5c

automatic_updater.sh: Updates run required before emerge -e @world.

 scripts/automatic_updater.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index c84a60e..9585af5 100644
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -102,6 +102,8 @@ post_freebsd_userland(){
 
 emerge_world(){
 	emerge sys-devel/libtool
+	emerge -u dev-libs/libxml2
+	emerge -u dev-libs/libxslt app-arch/libarchive dev-libs/glib
 	emerge -e @world --exclude sys-apps/portage
 	emerge sys-apps/portage
 }

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

[Yuta SATOH]

commit:     c9569c32c6d042965fa18ac92eb2e03825136941
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Jul 12 07:35:03 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Jul 12 07:35:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=c9569c32

automatic_updater.sh: binutils rebuild with lastest gcc.

 scripts/automatic_updater.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index 9585af5..d6bcf60 100644
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -70,6 +70,7 @@ update_gcc(){
 	env-update
 	source /etc/profile
 	emerge sys-devel/libtool --exclude sys-freebsd/*
+	emerge sys-devel/binutils --exclude sys-freebsd/*
 }
 
 update_kernel(){

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

[Yuta SATOH]

commit:     15ec8adb0366f4200bdbe2281e159601d53a9a13
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Jul 12 10:52:08 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Jul 12 10:52:08 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=15ec8adb

automatic_updater.sh: added perl-cleaner --all

 scripts/automatic_updater.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index d6bcf60..de9ca0e 100644
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -102,6 +102,8 @@ post_freebsd_userland(){
 }
 
 emerge_world(){
+	emerge -u dev-lang/perl
+	perl-cleaner --all
 	emerge sys-devel/libtool
 	emerge -u dev-libs/libxml2
 	emerge -u dev-libs/libxslt app-arch/libarchive dev-libs/glib

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

[Yuta SATOH]

commit:     f61fe5bb3edcfd2855127dbed5a2b12bedd66f1b
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Jul 12 12:09:01 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Jul 12 12:09:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=f61fe5bb

automatic_updater.sh: added -D option

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

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index de9ca0e..31c5528 100644
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -102,7 +102,7 @@ post_freebsd_userland(){
 }
 
 emerge_world(){
-	emerge -u dev-lang/perl
+	emerge -uD dev-lang/perl
 	perl-cleaner --all
 	emerge sys-devel/libtool
 	emerge -u dev-libs/libxml2

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

[Yuta SATOH]

commit:     6787623dbab83d53099569bdd0152e5ebf29755e
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Jul 12 14:08:47 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Jul 12 14:08:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=6787623d

automatic_updater.sh: remove all perl.

 scripts/automatic_updater.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index 31c5528..ff13ceb 100644
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -102,8 +102,9 @@ post_freebsd_userland(){
 }
 
 emerge_world(){
-	emerge -uD dev-lang/perl
-	perl-cleaner --all
+	emerge -C dev-lang/perl
+	emerge -C perl-core/* virtual/perl*
+	emerge dev-lang/perl
 	emerge sys-devel/libtool
 	emerge -u dev-libs/libxml2
 	emerge -u dev-libs/libxslt app-arch/libarchive dev-libs/glib

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

[Yuta SATOH]

commit:     765e6fa1f5ff636f78423f8968c7637ce8c5f7a5
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Jul 12 15:58:22 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Jul 12 15:58:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=765e6fa1

automatic_updater.sh: added _

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

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index c9766ab..358c168 100644
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -136,7 +136,7 @@ case "$TARGETMODE" in
 		post_freebsd_userland
 	;;
 	"world" )
-		[[ ${REMOVEPERL} -ne 0 ]] && removeperl
+		[[ ${REMOVEPERL} -ne 0 ]] && remove_perl
 		emerge_world
 		cleanup
 	;;

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

[Yuta SATOH]

commit:     e0c4ab39a29316aa8503673f8db4bb0a9b15dbd9
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Mon Jul 13 12:36:53 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Mon Jul 13 12:36:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=e0c4ab39

automatic_updater.sh: fixed perl issue, amd64/clang profile support.

 scripts/automatic_updater.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index 358c168..608b013 100644
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -40,7 +40,6 @@ update_portage(){
 		tar xjf portage-2.2.20.tar.bz2
 		PYTHON_TARGETS="python2_7" portage-2.2.20/bin/emerge --nodeps dev-lang/python-exec
 		PYTHON_TARGETS="python2_7" portage-2.2.20/bin/emerge --nodeps sys-apps/portage
-		emerge -u sys-apps/portage --exclude sys-freebsd/*
 	else
 		emerge -u sys-apps/portage --exclude sys-freebsd/*
 	fi
@@ -53,7 +52,14 @@ update_minimal(){
 	emerge -u sys-devel/flex sys-devel/patch sys-devel/m4 net-libs/libpcap sys-devel/gettext app-arch/libarchive sys-libs/zlib dev-util/dialog --exclude sys-freebsd/*
 	emerge sys-devel/libtool --exclude sys-freebsd/*
 	if [[ -e /usr/lib/libc++.so ]] ; then
-		emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/*
+		if [[ $(uname -p) == "amd64" ]] && [[ ! -e /usr/lib32/librt.so ]] ; then
+			[[ ! -e /etc/portage/profile ]] && mkdir -p /etc/portage/profile
+			echo "sys-libs/libcxx abi_x86_32" >> /etc/portage/profile/package.use.mask
+			echo "sys-libs/libcxxrt abi_x86_32" >> /etc/portage/profile/package.use.mask
+			emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/*
+			[[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-libs\/libcxxrt abi_x86_32/d' /etc/portage/profile/package.use.mask
+			[[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-libs\/libcxxrt abi_x86_32/d' /etc/portage/profile/package.use.mask
+		fi
 	fi
 }
 
@@ -90,6 +96,9 @@ update_freebsd_userland(){
 	emerge -C dev-libs/libelf dev-libs/libexecinfo dev-libs/libiconv sys-process/fuser-bsd && :
 	emerge --nodeps sys-freebsd/freebsd-libexec
 	USE=build emerge --nodeps sys-freebsd/freebsd-lib
+	if [[ -e /usr/lib/libc++.so ]] ; then
+		emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/*
+	fi
 	USE=build emerge --nodeps sys-freebsd/freebsd-share
 	[[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-freebsd\/freebsd-libexec abi_x86_32/d' /etc/portage/profile/package.use.mask
 
@@ -104,12 +113,14 @@ post_freebsd_userland(){
 
 remove_perl(){
 	emerge -C dev-lang/perl
-	emerge -C perl-core/* virtual/perl*
+	emerge -C dev-perl/* perl-core/* virtual/perl*
 	emerge dev-lang/perl
+	emerge dev-perl/Text-Unidecode dev-perl/Unicode-EastAsianWidth dev-perl/XML-Parser dev-perl/libintl-perl
 }
 
 emerge_world(){
 	emerge sys-devel/libtool
+	emerge -C dev-lang/python:3.2 && :
 	emerge -u dev-libs/libxml2
 	emerge -u dev-libs/libxslt app-arch/libarchive dev-libs/glib
 	emerge -e @world --exclude sys-apps/portage

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

[Yuta SATOH]

commit:     9dcce70dac259f3f85b3fe0ac1c7224eb70334db
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Mon Jul 13 12:40:25 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Mon Jul 13 12:40:25 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=9dcce70d

automatic_updater.sh: libcxxrt --> libcxx

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

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index 608b013..c0663b2 100644
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -57,7 +57,7 @@ update_minimal(){
 			echo "sys-libs/libcxx abi_x86_32" >> /etc/portage/profile/package.use.mask
 			echo "sys-libs/libcxxrt abi_x86_32" >> /etc/portage/profile/package.use.mask
 			emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/*
-			[[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-libs\/libcxxrt abi_x86_32/d' /etc/portage/profile/package.use.mask
+			[[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-libs\/libcxx abi_x86_32/d' /etc/portage/profile/package.use.mask
 			[[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-libs\/libcxxrt abi_x86_32/d' /etc/portage/profile/package.use.mask
 		fi
 	fi

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

[Yuta SATOH]

commit:     ac58cf04623d1dd665422cb150207af366c75f52
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Aug 15 00:46:58 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sat Aug 15 00:46:58 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=ac58cf04

automatic_updater.sh: added --nodeps

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

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
old mode 100644
new mode 100755
index c0663b2..258424c
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -46,7 +46,7 @@ update_portage(){
 }
 
 update_minimal(){
-	emerge sys-freebsd/freebsd-mk-defs
+	emerge --nodeps sys-freebsd/freebsd-mk-defs
 	emerge -u sys-apps/findutils --exclude sys-freebsd/*
 	emerge sys-devel/libtool --exclude sys-freebsd/*
 	emerge -u sys-devel/flex sys-devel/patch sys-devel/m4 net-libs/libpcap sys-devel/gettext app-arch/libarchive sys-libs/zlib dev-util/dialog --exclude sys-freebsd/*

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

[Yuta SATOH]

commit:     43bf434fa63c2519ef291163a9ee3144d0fe556d
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Aug 21 12:43:22 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Fri Aug 21 12:43:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=43bf434f

automatic_updater.sh: added MAKEOPTS=-j1 and force set gcc to CC,CXX.

 scripts/automatic_updater.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index 258424c..4d620d6 100755
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -94,8 +94,8 @@ update_freebsd_userland(){
 	fi
 
 	emerge -C dev-libs/libelf dev-libs/libexecinfo dev-libs/libiconv sys-process/fuser-bsd && :
-	emerge --nodeps sys-freebsd/freebsd-libexec
-	USE=build emerge --nodeps sys-freebsd/freebsd-lib
+	CC=gcc CXX=g++ emerge --nodeps sys-freebsd/freebsd-libexec
+	CC=gcc CXX=g++ USE=build MAKEOPTS=-j1 emerge --nodeps sys-freebsd/freebsd-lib
 	if [[ -e /usr/lib/libc++.so ]] ; then
 		emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/*
 	fi

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

[Yuta SATOH]

commit:     88393869d5034e779bc3b9c8ca16d3f232cd42e1
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Aug 22 12:18:42 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sat Aug 22 12:18:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=88393869

automatic_updater.sh: support FreeBSD 10.2 amd64/clang environment.

 scripts/automatic_updater.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index 4d620d6..3749286 100755
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -94,15 +94,15 @@ update_freebsd_userland(){
 	fi
 
 	emerge -C dev-libs/libelf dev-libs/libexecinfo dev-libs/libiconv sys-process/fuser-bsd && :
-	CC=gcc CXX=g++ emerge --nodeps sys-freebsd/freebsd-libexec
-	CC=gcc CXX=g++ USE=build MAKEOPTS=-j1 emerge --nodeps sys-freebsd/freebsd-lib
+	CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" emerge --nodeps sys-freebsd/freebsd-libexec
+	CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" USE=build MAKEOPTS=-j1 emerge --nodeps sys-freebsd/freebsd-lib
+	CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" USE=build emerge --nodeps sys-freebsd/freebsd-share
+	[[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-freebsd\/freebsd-libexec abi_x86_32/d' /etc/portage/profile/package.use.mask
+
+	CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin
 	if [[ -e /usr/lib/libc++.so ]] ; then
 		emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/*
 	fi
-	USE=build emerge --nodeps sys-freebsd/freebsd-share
-	[[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-freebsd\/freebsd-libexec abi_x86_32/d' /etc/portage/profile/package.use.mask
-
-	emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin
 	emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin
 }
 

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

[Yuta SATOH]

commit:     9fe2f7f34c896fad111c7f05ae29d7bd840f7176
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Aug 22 22:57:44 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sat Aug 22 22:57:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=9fe2f7f3

automatic_updater.sh: Set the correct TARGETVER in set_profile.

 scripts/automatic_updater.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index 3749286..0ab1f22 100755
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -15,9 +15,9 @@ fi
 set_profile(){
 	emerge --info | head -n 1 | grep clang && :
 	if [[ $? -eq 0 ]] ; then
-		eselect profile set $(eselect profile list | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
+		eselect profile set $(eselect profile list | grep "${TARGETVER}" | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
 	else
-		eselect profile set $(eselect profile list | grep -v clang | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
+		eselect profile set $(eselect profile list | grep "${TARGETVER}" | grep -v clang | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
 	fi
 }
 

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

[Yuta SATOH]

commit:     2c6a351bbbfcf1dc2fe2ec15fd6585fe5042d926
Author:     Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Fri Aug 12 10:47:08 2016 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Fri Aug 12 10:47:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=2c6a351b

automatic_updater.sh: fix bug 564168.

 scripts/automatic_updater.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index ae15942..3f1b639 100755
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -46,6 +46,11 @@ update_minimal(){
 	emerge --nodeps sys-freebsd/freebsd-mk-defs
 	emerge -u '<sys-apps/findutils-4.6' --exclude sys-freebsd/*
 	emerge sys-devel/libtool --exclude sys-freebsd/*
+
+	# https://bugs.gentoo.org/564168
+	USE="-*" emerge --nodeps sys-devel/gettext --exclude sys-freebsd/*
+	emerge sys-devel/gettext --exclude sys-freebsd/*
+
 	emerge -u sys-devel/flex sys-devel/patch sys-devel/m4 net-libs/libpcap sys-devel/gettext app-arch/libarchive sys-libs/zlib dev-util/dialog --exclude sys-freebsd/*
 	emerge sys-devel/libtool --exclude sys-freebsd/*
 	if [[ -e /usr/lib/libc++.so ]] ; then

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

[Yuta SATOH]

commit:     b477cae6a1f05eb0f562c8f9294ec3db4c3d1be2
Author:     Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Thu Dec  7 13:14:27 2017 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Thu Dec  7 13:14:27 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=b477cae6

automatic_updater.sh: updated. It targets 11.1.

 scripts/automatic_updater.sh | 165 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 122 insertions(+), 43 deletions(-)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index 3f1b639..2afa6f6 100755
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -1,9 +1,13 @@
 #/bin/bash
 set -eu
 REMOVEPERL=${REMOVEPERL:-0}
+PORTDIR="/usr/portage"
+DISTDIR="${PORTDIR}/distfiles"
+PORTAGE_TMPDIR="/var/tmp"
 
 if [[ $# -ne 2 ]] ; then
-	echo "need 2 argument"
+	echo "Two arguments are required."
+	echo ""
 	echo "arg 1: TARGETVER"
 	echo "arg 2: TARGETMODE, Please set kernel, freebsd_userland, world."
 	exit 1
@@ -13,9 +17,12 @@ else
 fi
 
 set_profile(){
-	emerge --info | head -n 1 | grep clang && :
+	echo "Setting the ${TARGETVER} profile..."
+
+	emerge --info | head -n 1 | grep clang &>/dev/null && :
 	if [[ $? -eq 0 ]] ; then
 		eselect profile set $(eselect profile list | grep "${TARGETVER}" | grep clang | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
+		export CXX="clang++ -stdlib=libc++"
 	else
 		eselect profile set $(eselect profile list | grep "${TARGETVER}" | grep -v clang | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
 	fi
@@ -24,25 +31,56 @@ set_profile(){
 move_makeconf(){
 	[[ ! -e /etc/portage ]] && mkdir -p /etc/portage
 	if [[ -e /etc/make.conf ]] && [[ ! -e /etc/portage/make.conf ]] ; then
-		mv /etc/make.conf /etc/portage/make.conf
+		echo "Moving the /etc/make.conf to /etc/portage..."
+		mv /etc/make.conf /etc/portage
 	fi
 	gsed -i '/LDFLAGS=/d' /etc/portage/make.conf
+	if [[ -e /etc/make.profile ]] && [[ ! -e /etc/portage/make.profile ]] ; then
+		echo "Creating the make.profile..."
+		ln -s ../..${PORTDIR}profiles/$(eselect profile list | grep '*' | awk '{print $2}') /etc/portage/make.profile
+	fi
 }
 
 update_portage(){
-	local dl_portage_ver="2.2.20.1"
+	local dl_portage_ver="2.3.8"
+
+	echo "Updating the sys-apps/portage with a manual method..."
+
 	cd /tmp
-	wget http://dev.gentoo.org/~dolsen/releases/portage/portage-${dl_portage_ver}.tar.bz2
-	tar xjf portage-${dl_portage_ver}.tar.bz2
-	PYTHON_TARGETS="python2_7" "portage-${dl_portage_ver}"/bin/emerge --nodeps dev-lang/python-exec
+	if [[ -e "${DISTDIR}"/portage-${dl_portage_ver}.tar.bz2 ]] ; then
+		cp -a "${DISTDIR}/portage-${dl_portage_ver}.tar.bz2" .
+	else
+		wget -q "http://dev.gentoo.org/~dolsen/releases/portage/portage-${dl_portage_ver}.tar.bz2"
+	fi
+
+	tar xjf "portage-${dl_portage_ver}.tar.bz2"
+
+	cd "/tmp/portage-${dl_portage_ver}"
+	PYTHON_TARGETS="python2_7" bin/emerge --nodeps dev-lang/python-exec
 	eselect python set 1
-	"portage-${dl_portage_ver}"/bin/emerge sys-apps/portage --exclude sys-freebsd/*
-	emerge dev-lang/python-exec --exclude sys-freebsd/*
-	emerge app-admin/eselect --exclude sys-freebsd/*
+	PYTHON_TARGETS="python2_7" bin/emerge --nodeps sys-apps/portage --exclude sys-freebsd/*
+
 	eselect python set 1
 }
 
+update_bmake(){
+	echo "Updating the bmake..."
+
+	[[ -e /usr/local/bin/make ]] && exit 1
+
+	cd "${PORTDIR}/sys-freebsd/freebsd-ubin" && ebuild $(ls -1 freebsd-ubin-${TARGETVER}*.ebuild | tail -n 1) prepare
+	cd "${PORTAGE_TMPDIR}"/portage/sys-freebsd/freebsd-ubin-${TARGETVER}*/work/usr.bin/bmake
+	make
+	cp -a make /usr/local/bin/
+	cd "${PORTDIR}/sys-freebsd/freebsd-ubin" && ebuild $(ls -1 freebsd-ubin-${TARGETVER}*.ebuild | tail -n 1) clean
+}
+
 update_minimal(){
+	echo "Updating the minimal packages to upgrade the Gentoo/FreeBSD..."
+
+	emerge -u sys-devel/gcc-config --exclude sys-freebsd/*
+	update_bmake
+
 	emerge --nodeps sys-freebsd/freebsd-mk-defs
 	emerge -u '<sys-apps/findutils-4.6' --exclude sys-freebsd/*
 	emerge sys-devel/libtool --exclude sys-freebsd/*
@@ -51,14 +89,18 @@ update_minimal(){
 	USE="-*" emerge --nodeps sys-devel/gettext --exclude sys-freebsd/*
 	emerge sys-devel/gettext --exclude sys-freebsd/*
 
-	emerge -u sys-devel/flex sys-devel/patch sys-devel/m4 net-libs/libpcap sys-devel/gettext app-arch/libarchive sys-libs/zlib dev-util/dialog --exclude sys-freebsd/*
+	USE="-acl" emerge -u app-arch/libarchive --exclude sys-freebsd/*
+	emerge -u sys-devel/flex sys-devel/patch sys-devel/m4 net-libs/libpcap sys-devel/gettext sys-libs/zlib dev-util/dialog --exclude sys-freebsd/*
 	emerge sys-devel/libtool --exclude sys-freebsd/*
+
 	if [[ -e /usr/lib/libc++.so ]] ; then
-		if [[ $(uname -p) == "amd64" ]] && [[ ! -e /usr/lib32/librt.so ]] ; then
+		if [[ $(uname -p) == amd64 ]] && [[ ! -e /usr/lib32/librt.so ]] ; then
 			[[ ! -e /etc/portage/profile ]] && mkdir -p /etc/portage/profile
 			echo "sys-libs/libcxx abi_x86_32" >> /etc/portage/profile/package.use.mask
 			echo "sys-libs/libcxxrt abi_x86_32" >> /etc/portage/profile/package.use.mask
-			emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/*
+			USE="internal-glib" emerge -u dev-util/pkgconfig --exclude sys-freebsd/*
+			USE="-nls" emerge -u cmake --exclude sys-freebsd/*
+			emerge --nodeps '<sys-libs/libcxx-3.9' '<sys-libs/libcxxrt-3.9' --exclude sys-freebsd/*
 			[[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-libs\/libcxx abi_x86_32/d' /etc/portage/profile/package.use.mask
 			[[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-libs\/libcxxrt abi_x86_32/d' /etc/portage/profile/package.use.mask
 		fi
@@ -66,80 +108,117 @@ update_minimal(){
 }
 
 update_toolchain(){
-	if [[ $(uname -p) == "amd64" ]] ; then
+	echo "Updating the toolchains..."
+
+	if [[ $(uname -p) == amd64 ]] ; then
 		gsed -i "s:CHOST=.*:CHOST=\"x86_64-gentoo-freebsd${TARGETVER}\":g" /etc/portage/make.conf
 	else
 		gsed -i "s:CHOST=.*:CHOST=\"i686-gentoo-freebsd${TARGETVER}\":g" /etc/portage/make.conf
 	fi
-	emerge -u sys-devel/binutils --exclude sys-freebsd/*
+
+	# https://bugs.gentoo.org/629128
+	[[ ! -e /etc/portage/package.unmask ]] && mkdir -p /etc/portage/package.unmask
+	echo "sys-devel/binutils" > /etc/portage/package.unmask/binutils-oldversion
+	emerge -u '<sys-devel/binutils-2.28' --exclude sys-freebsd/*
 	emerge -u sys-devel/gcc-config --exclude sys-freebsd/*
-	emerge -u '<sys-devel/gcc-5.0' --exclude sys-freebsd/*
+	emerge -u '<sys-devel/gcc-5.0' --exclude sys-freebsd/* --exclude sys-devel/binutils
 	gcc-config $(gcc-config -l | grep "${TARGETVER}" | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
-#	emerge -C \<$(emerge -pq --nodeps sys-devel/gcc --exclude sys-freebsd/* | grep ebuild | awk '{print $4}') && :
 	env-update
 	source /etc/profile
 	emerge sys-devel/libtool --exclude sys-freebsd/*
-	emerge sys-devel/binutils --exclude sys-freebsd/*
-	if type -P clang > /dev/null ; then
-		emerge -u '<sys-devel/clang-3.7' --exclude sys-freebsd/*
-	fi
 }
 
 update_kernel(){
+	echo "Updating the kernel..."
+
 	emerge -C freebsd-sources sys-freebsd/virtio-kmod sys-fs/fuse4bsd && :
-	emerge --nodeps freebsd-sources
+	emerge freebsd-sources
+}
+
+fix_dependence_issue(){
+	echo "" > /var/db/pkg/sys-freebsd/freebsd-lib-*/RDEPEND
+	rm /var/db/pkg/sys-freebsd/freebsd-lib-*/*.ebuild
+	echo "" > /var/db/pkg/dev-libs/glib-*/RDEPEND
+	echo "" > /var/db/pkg/dev-libs/glib-*/DEPEND
+	rm /var/db/pkg/dev-libs/glib-*/*.ebuild
+	rm /var/db/pkg/sys-freebsd/freebsd-libexec-*/*.ebuild
 }
 
 update_freebsd_userland(){
-	if [[ $(uname -p) == "amd64" ]] && [[ ! -e /libexec/ld-elf32.so.1 ]] ; then
-		[[ ! -e /etc/portage/profile ]] && mkdir -p /etc/portage/profile
-		echo "sys-freebsd/freebsd-libexec abi_x86_32" >> /etc/portage/profile/package.use.mask
-	fi
+	echo "Updating the FreeBSD userland..."
 
-	emerge -C dev-libs/libelf dev-libs/libexecinfo dev-libs/libiconv sys-process/fuser-bsd && :
-	CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" emerge --nodeps sys-freebsd/freebsd-libexec
-	CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" USE=build MAKEOPTS=-j1 emerge --nodeps sys-freebsd/freebsd-lib
-	CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" USE=build emerge --nodeps sys-freebsd/freebsd-share
-	[[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-freebsd\/freebsd-libexec abi_x86_32/d' /etc/portage/profile/package.use.mask
+	# Fixing the dependence issue:
+	ls -1 /var/db/pkg/sys-freebsd/freebsd-lib-9.* &>/dev/null && :
+	[[ $? -eq 0 ]] && fix_dependence_issue
 
-	CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" emerge freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin
-	if [[ -e /usr/lib/libc++.so ]] ; then
-		emerge sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/*
-		emerge -u sys-devel/llvm sys-devel/clang
+	[[ -e /usr/share/misc/windrv_stub.c ]] && rm -rf /usr/share/misc/windrv_stub.c
+
+	CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" USE=build emerge -u freebsd-bin freebsd-lib freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-sources freebsd-ubin freebsd-usbin
+	emerge freebsd-share
+
+	if type -P clang &> /dev/null ; then
+		emerge dev-util/re2c
+		emerge --nodeps '<sys-libs/libcxxrt-3.9' --exclude sys-freebsd/*
+		emerge --nodeps '<sys-libs/libcxx-3.9' --exclude sys-freebsd/*
+		CMAKE_MAKEFILE_GENERATOR=emake CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" emerge -u '<sys-devel/llvm-4.0' '<sys-devel/clang-4.0' --exclude sys-freebsd/*
+		CMAKE_MAKEFILE_GENERATOR=emake emerge sys-devel/llvm sys-devel/clang sys-libs/libcxxrt sys-libs/libcxx --exclude sys-freebsd/*
 	fi
-	emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin
+
+	emerge freebsd-bin freebsd-lib freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-sources freebsd-ubin freebsd-usbin
+
+	[[ -e /usr/local/bin/make ]] && rm /usr/local/bin/make
+	env-update
+	source /etc/profile
 }
 
 post_freebsd_userland(){
+	echo "Updating the minimal tools..."
+
 	emerge sys-devel/libtool app-admin/eselect
 	emerge sys-apps/portage
 }
 
 remove_perl(){
+	echo "Removing and re-installing the dev-lang/perl..."
+
 	emerge -C dev-lang/perl
 	emerge -C dev-perl/* perl-core/* virtual/perl*
 	emerge dev-lang/perl
-	emerge dev-perl/Text-Unidecode dev-perl/Unicode-EastAsianWidth dev-perl/XML-Parser dev-perl/libintl-perl
+	emerge dev-perl/Text-Unidecode dev-perl/Unicode-EastAsianWidth dev-perl/XML-Parser
+
+	rm -rf "${PORTAGE_TMPDIR}"/portage/dev-perl/libintl-perl*
+	cd "${PORTDIR}/dev-perl/libintl-perl" && ebuild $(ls -1 libintl-perl-*.ebuild | tail -n 1) clean prepare
+	gsed -i 's:-liconv::g' "${PORTAGE_TMPDIR}"/portage/dev-perl/libintl-perl-*/work/libintl-perl-*/gettext_xs/Makefile.PL
+	ebuild $(ls -1 libintl-perl-*.ebuild | tail -n 1) merge clean
 }
 
 emerge_world(){
+	echo "Updating all packages... It takes a lot of time."
+
 	emerge sys-devel/libtool
-	emerge -C dev-lang/python:3.2 && :
+	emerge -C dev-lang/python:3.3 && :
+	gsed -i '/python3.3/d' /etc/python-exec/python-exec.conf
+	USE="internal-glib" emerge -u dev-util/pkgconfig
 	emerge dev-libs/libxml2
 	emerge dev-libs/libxslt app-arch/libarchive dev-libs/glib
 	emerge -u sys-devel/gcc
 	emerge -C \<$(emerge -pq --nodeps sys-devel/gcc --exclude sys-freebsd/* | grep ebuild | awk '{print $4}') && :
 	gcc-config $(gcc-config -l | grep "${TARGETVER}" | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
 	source /etc/profile
-	emerge -e @world
+	emerge -e @world --exclude dev-perl/libintl-perl
+	emerge -C dev-lang/python:3.2 && :
+	emerge -C '<sys-devel/binutils-2.28.1' && :
+	emerge @preserved-rebuild
+	emerge dev-perl/libintl-perl
+	emerge sys-apps/portage
 }
 
 cleanup(){
 	emerge sys-devel/libtool app-admin/eselect
-	emerge @preserved-rebuild
+	echo "done!"
 }
 
-case "$TARGETMODE" in
+case "${TARGETMODE}" in
 	"kernel" )
 		set_profile
 		move_makeconf
@@ -159,8 +238,8 @@ case "$TARGETMODE" in
 		cleanup
 	;;
 	* )
-		echo "Please set kernel, freebsd_userland, world."
+		echo "Please set the argument:"
+		echo "kernel, freebsd_userland, world."
 		exit 1
 	;;
 esac
-

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

[Yuta SATOH]

commit:     3762c6fa6c5c4214698512376fc10e0581956c6e
Author:     Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Tue Jan  2 13:39:07 2018 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Tue Jan  2 13:39:07 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=3762c6fa

automatic_updater.sh: add the missing code to upgrade correctly.

 scripts/automatic_updater.sh | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index 2afa6f6..58e8ced 100755
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -42,7 +42,7 @@ move_makeconf(){
 }
 
 update_portage(){
-	local dl_portage_ver="2.3.8"
+	local dl_portage_ver="2.3.6"
 
 	echo "Updating the sys-apps/portage with a manual method..."
 
@@ -63,8 +63,8 @@ update_portage(){
 	eselect python set 1
 }
 
-update_bmake(){
-	echo "Updating the bmake..."
+update_bmake_command(){
+	echo "Updating bmake..."
 
 	[[ -e /usr/local/bin/make ]] && exit 1
 
@@ -73,15 +73,32 @@ update_bmake(){
 	make
 	cp -a make /usr/local/bin/
 	cd "${PORTDIR}/sys-freebsd/freebsd-ubin" && ebuild $(ls -1 freebsd-ubin-${TARGETVER}*.ebuild | tail -n 1) clean
+
+	env-update
+	source /etc/profile
+}
+
+update_config_command(){
+	echo "Updating config..."
+
+	[[ -e /usr/local/sbin/config ]] && exit 1
+
+	cd "${PORTDIR}/sys-freebsd/freebsd-usbin" && ebuild $(ls -1 freebsd-usbin-${TARGETVER}*.ebuild | tail -n 1) prepare
+	cd "${PORTAGE_TMPDIR}"/portage/sys-freebsd/freebsd-usbin-${TARGETVER}*/work/usr.sbin/config
+	/usr/local/bin/make -m /usr/share/mk/system
+	cp -a config /usr/local/sbin/
+	cd "${PORTDIR}/sys-freebsd/freebsd-usbin" && ebuild $(ls -1 freebsd-usbin-${TARGETVER}*.ebuild | tail -n 1) clean
 }
 
 update_minimal(){
 	echo "Updating the minimal packages to upgrade the Gentoo/FreeBSD..."
 
 	emerge -u sys-devel/gcc-config --exclude sys-freebsd/*
-	update_bmake
+	update_bmake_command
 
 	emerge --nodeps sys-freebsd/freebsd-mk-defs
+	update_config_command
+
 	emerge -u '<sys-apps/findutils-4.6' --exclude sys-freebsd/*
 	emerge sys-devel/libtool --exclude sys-freebsd/*
 
@@ -118,7 +135,8 @@ update_toolchain(){
 
 	# https://bugs.gentoo.org/629128
 	[[ ! -e /etc/portage/package.unmask ]] && mkdir -p /etc/portage/package.unmask
-	echo "sys-devel/binutils" > /etc/portage/package.unmask/binutils-oldversion
+	echo "sys-devel/binutils" > /etc/portage/package.unmask/toolchain-oldversion
+	echo "sys-devel/gcc" >> /etc/portage/package.unmask/toolchain-oldversion
 	emerge -u '<sys-devel/binutils-2.28' --exclude sys-freebsd/*
 	emerge -u sys-devel/gcc-config --exclude sys-freebsd/*
 	emerge -u '<sys-devel/gcc-5.0' --exclude sys-freebsd/* --exclude sys-devel/binutils
@@ -167,6 +185,7 @@ update_freebsd_userland(){
 	emerge freebsd-bin freebsd-lib freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-sources freebsd-ubin freebsd-usbin
 
 	[[ -e /usr/local/bin/make ]] && rm /usr/local/bin/make
+	[[ -e /usr/local/sbin/config ]] && rm /usr/local/sbin/config
 	env-update
 	source /etc/profile
 }
@@ -205,7 +224,11 @@ emerge_world(){
 	emerge -C \<$(emerge -pq --nodeps sys-devel/gcc --exclude sys-freebsd/* | grep ebuild | awk '{print $4}') && :
 	gcc-config $(gcc-config -l | grep "${TARGETVER}" | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
 	source /etc/profile
-	emerge -e @world --exclude dev-perl/libintl-perl
+	if [[ ${REMOVEPERL} -ne 0 ]] ; then
+		emerge -e @world --exclude dev-perl/libintl-perl
+	else
+		emerge -e @world
+	fi
 	emerge -C dev-lang/python:3.2 && :
 	emerge -C '<sys-devel/binutils-2.28.1' && :
 	emerge @preserved-rebuild
@@ -215,6 +238,7 @@ emerge_world(){
 
 cleanup(){
 	emerge sys-devel/libtool app-admin/eselect
+	[[ -e /etc/portage/package.unmask/toolchain-oldversion ]] && rm /etc/portage/package.unmask/toolchain-oldversion
 	echo "done!"
 }
 

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

[Yuta SATOH]

commit:     16d90e98675553918427b67b098c40fc03de0e01
Author:     Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Wed Jan  3 11:18:28 2018 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Wed Jan  3 11:18:28 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=16d90e98

automatic_updater.sh: change to be upgraded on x86-fbsd.

 scripts/automatic_updater.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index 58e8ced..6dcd73a 100755
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -136,10 +136,10 @@ update_toolchain(){
 	# https://bugs.gentoo.org/629128
 	[[ ! -e /etc/portage/package.unmask ]] && mkdir -p /etc/portage/package.unmask
 	echo "sys-devel/binutils" > /etc/portage/package.unmask/toolchain-oldversion
-	echo "sys-devel/gcc" >> /etc/portage/package.unmask/toolchain-oldversion
+	echo "<sys-devel/gcc-7.0" >> /etc/portage/package.unmask/toolchain-oldversion
 	emerge -u '<sys-devel/binutils-2.28' --exclude sys-freebsd/*
 	emerge -u sys-devel/gcc-config --exclude sys-freebsd/*
-	emerge -u '<sys-devel/gcc-5.0' --exclude sys-freebsd/* --exclude sys-devel/binutils
+	emerge '<sys-devel/gcc-5.0' --exclude sys-freebsd/* --exclude sys-devel/binutils
 	gcc-config $(gcc-config -l | grep "${TARGETVER}" | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
 	env-update
 	source /etc/profile