[gentoo-commits] proj/catalyst:catalyst_2 commit in: targets/support/

[gentoo-commits] proj/catalyst:catalyst_2 commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     554ff9ce43b9cb5945680eb3dff193468b1c8cb7
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 18:15:35 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 21:44:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=554ff9ce

boot from local hd if no response to boot menu

x-gentoo-bug: 141199
x-gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=141199
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

---
 targets/support/bootloader-setup.sh |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 239de81..59f1abe 100644
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -257,6 +257,7 @@ case ${clst_hostarch} in
 			kmsg=$1/isolinux/kernels.msg
 			echo "default ${first}" > ${icfg}
 			echo "timeout 150" >> ${icfg}
+			echo "ontimeout localhost" >> ${icfg}
 			echo "prompt 1" >> ${icfg}
 			echo "display boot.msg" >> ${icfg}
 			echo "F1 kernels.msg" >> ${icfg}
@@ -319,6 +320,10 @@ case ${clst_hostarch} in
 				echo "label memtest86" >> $icfg
 				echo "  kernel memtest86" >> $icfg
 			fi
+			echo >> $icfg
+			echo "label localhost" >> $icfg
+			echo "  localboot -1" >> $icfg
+			echo "  MENU HIDE" >> $icfg
 		fi
 
 		if [ -e $1/boot/efi/elilo.efi ]

[gentoo-commits] proj/catalyst:catalyst_2 commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     e8eb27365d65c78ca6765122c4c741dfc51208b2
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 00:45:48 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 00:45:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=e8eb2736

Add /etc/init.d/fixinittab to the default runlevel - fix autologin on the installcd.

---
 targets/support/rc-update.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
index 6220595..50c1da2 100644
--- a/targets/support/rc-update.sh
+++ b/targets/support/rc-update.sh
@@ -24,6 +24,7 @@ then
 	[[ -e /etc/init.d/sysklogd ]] && rc-update add sysklogd default
 	[[ -e /etc/init.d/metalog ]] && rc-update add metalog default
 	[[ -e /etc/init.d/syslog-ng ]] && rc-update add syslog-ng default
+	[[ -e /etc/init.d/fixinittab ]] && rc-update add fixinittab default
 
 	# Do some livecd_type specific rc-update changes
 	case ${clst_livecd_type} in

[gentoo-commits] proj/catalyst:catalyst_2 commit in: targets/support/

[Matt Turner]

commit:     0957a625761ec0585f13294e47295f98d57e1b49
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Sep  1 23:08:04 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu Sep  1 23:08:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0957a625

Set FEATURES=-news before emerging ccache/distcc/icecream

---
 targets/support/chroot-functions.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index e739f0a..1a44c92 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -61,6 +61,7 @@ get_libdir() {
 
 setup_myfeatures(){
 	setup_myemergeopts
+	export FEATURES="-news"
 	if [ -n "${clst_CCACHE}" ]
 	then
 		export clst_myfeatures="${clst_myfeatures} ccache"

[gentoo-commits] proj/catalyst:catalyst_2 commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     900554b0b067e76d3806e520357d91adbfa4fa0c
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 07:14:05 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 07:14:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=900554b0

Make sure portage updates itself at the start of stage1 - thanks to Zac for noticing the issue.

---
 targets/support/chroot-functions.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 277fdc2..74a7565 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -165,8 +165,9 @@ setup_pkgmgr(){
 	# We need to merge our package manager with USE="build" set in case it is
 	# portage to avoid frying our /etc/make.conf file.  Otherwise, we could
 	# just let emerge system could merge it.
+	# Use --update or portage won't reinstall the same version.
 	[ -e /etc/make.conf ] && echo 'USE="${USE} build"' >> /etc/make.conf
-	run_merge --oneshot --nodeps sys-apps/portage
+	run_merge --oneshot --nodeps --update sys-apps/portage
 	sed -i '/USE="${USE} build"/d' /etc/make.conf
 }
 

[gentoo-commits] proj/catalyst:catalyst_2 commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     0e6163a79688ed1a572473f00c9f9a7dae7f80fc
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 02:34:56 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 02:43:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0e6163a7

Replace --with-bdeps=n with --with-bdeps=y for depclean.

---
 targets/support/chroot-functions.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 74a7565..7e82e32 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -202,7 +202,7 @@ cleanup_stages() {
 	fi
 	case ${clst_target} in
 		stage3|system)
-			run_merge --depclean --with-bdeps=n
+			run_merge --depclean --with-bdeps=y
 			;;
 		*)
 			echo "Skipping depclean operation for ${clst_target}"