add hvc support for ppc64 partitioned systems

4 files changed, 69 insertions, 26 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index d6cc7cf0e67f..d4654454b736 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.224 2005/03/30 05:45:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.225 2005/03/31 15:58:08 tgall Exp $
 
 # See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
 
+  31 Mar 2005; Tom Gall <tgall@gentoo.org> +rc-scripts-1.4.16-livecd-hvc.patch
+  add support for hvc (ppc64 console on partitioned systems)
+
 *baselayout-1.11.10-r5 (30 Mar 2005)
 
   30 Mar 2005; Mike Frysinger <vapier@gentoo.org>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 0bee733b8e0d..40f33f10d751 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,34 +1,35 @@
-MD5 abfa65b2e4fed94bd71e99f4a4c92872 ChangeLog 51349
-MD5 cd54e73f5f3f6c9995d8f5b1d4bb155c baselayout-1.11.10-r5.ebuild 17318
+MD5 413d50a04f3e439c1f6aae2944227191 ChangeLog 51489
+MD5 a80a01d141a81638665e02c46f8011ad baselayout-1.11.10-r3.ebuild 17251
 MD5 7d1f13b6d52150660ef848a5ed09d833 baselayout-1.11.10-r4.ebuild 17251
-MD5 a564d6194f6a91d76d572a0f934c4faa baselayout-1.9.4-r7.ebuild 18143
-MD5 7875c929dd71e995da27936c6d859717 baselayout-1.9.4-r6.ebuild 16862
-MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
+MD5 cd54e73f5f3f6c9995d8f5b1d4bb155c baselayout-1.11.10-r5.ebuild 17318
 MD5 30d111c4ff4ffa5712a71ab4ac7e2c02 baselayout-1.11.9-r1.ebuild 17015
-MD5 a80a01d141a81638665e02c46f8011ad baselayout-1.11.10-r3.ebuild 17251
 MD5 b8f5620b4495be623769d3590924c5f2 baselayout-1.12.0_alpha1-r4.ebuild 17579
-MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
-MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r5 70
+MD5 df2288a33323d1a10dc826921f2c6a88 baselayout-1.9.4-r6.ebuild 16917
+MD5 a564d6194f6a91d76d572a0f934c4faa baselayout-1.9.4-r7.ebuild 18143
+MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
 MD5 f090a91fc6fc5edab853103722150b72 files/baselayout-1.11.10-bashrc.patch 628
-MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r4 70
-MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
-MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
-MD5 50816019be7cc03120fa58d075eb07f7 files/sysvinit-2.84-selinux1.patch 3612
-MD5 d293f00448f562c6d5b4f8bbf77a9fd1 files/baselayout-1.12.0_alpha1-fixup-depends_awk.patch 2387
-MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
-MD5 cf31ab3d72f425282dadec7ffa2b10aa files/rc-scripts-1.4.16-livecd.patch 2447
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
-MD5 126200ae85bdf0ef43de75411f71aaa8 files/rc-scripts-1.6.9-domainname.patch 380
-MD5 844ae054e507637ee440011d729858c8 files/digest-baselayout-1.11.9-r1 69
-MD5 6ec416bfd1097d350c09e78949a736b8 files/rc-scripts-1.6.9-ifconfig.patch 266
-MD5 08ade596f939beaf9f7b3657c5811593 files/rc-scripts-1.6.9-checkfs-lvm.patch 579
+MD5 333c983dc00cb352f4725cacc0378fea files/baselayout-1.11.10-bridge.patch 3547
 MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925
 MD5 a08355653536117877945359de784f6b files/baselayout-1.11.10-iwconfig.patch 724
-MD5 4222104e326e50e3c570c82a31070138 files/baselayout-1.12.0_alpha1-export-myservice-for-critical.patch 528
-MD5 2fdc18068389dc7268dddad2bae82dfe files/baselayout-1.12.0_alpha1-modules-return-clobber.patch 550
-MD5 333c983dc00cb352f4725cacc0378fea files/baselayout-1.11.10-bridge.patch 3547
 MD5 b0b2829c9b59059ebca066bcde6410b0 files/baselayout-1.12.0_alpha1-bridge.patch 3500
+MD5 4222104e326e50e3c570c82a31070138 files/baselayout-1.12.0_alpha1-export-myservice-for-critical.patch 528
+MD5 d293f00448f562c6d5b4f8bbf77a9fd1 files/baselayout-1.12.0_alpha1-fixup-depends_awk.patch 2387
 MD5 13bb54c92fad3670b7036218b609b7f3 files/baselayout-1.12.0_alpha1-iwconfig.patch 864
+MD5 2fdc18068389dc7268dddad2bae82dfe files/baselayout-1.12.0_alpha1-modules-return-clobber.patch 550
+MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
+MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r3 70
+MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r4 70
+MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r5 70
+MD5 844ae054e507637ee440011d729858c8 files/digest-baselayout-1.11.9-r1 69
 MD5 8973ba1466f017b32112df32c15ee8a7 files/digest-baselayout-1.12.0_alpha1-r4 69
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
+MD5 cf31ab3d72f425282dadec7ffa2b10aa files/rc-scripts-1.4.16-livecd.patch 2447
+MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
+MD5 08ade596f939beaf9f7b3657c5811593 files/rc-scripts-1.6.9-checkfs-lvm.patch 579
+MD5 126200ae85bdf0ef43de75411f71aaa8 files/rc-scripts-1.6.9-domainname.patch 380
+MD5 6ec416bfd1097d350c09e78949a736b8 files/rc-scripts-1.6.9-ifconfig.patch 266
+MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
+MD5 50816019be7cc03120fa58d075eb07f7 files/sysvinit-2.84-selinux1.patch 3612
+MD5 6455db3ebe74072b4dd15a3ffb3eb6dd files/rc-scripts-1.4.16-livecd-hvc.patch 1479
diff --git a/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild b/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild
index c6e1fc0acd03..fd74c487a96c 100644
--- a/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild
+++ b/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild,v 1.5 2005/03/01 22:01:23 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild,v 1.6 2005/03/31 15:58:08 tgall Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -46,6 +46,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/rc-scripts-1.4.16-splash.patch
 	epatch ${FILESDIR}/rc-scripts-1.4.16-livecd.patch
+	epatch ${FILESDIR}/rc-scripts-1.4.16-livecd-hvc.patch
 
 	#
 	# Baselayout setup
diff --git a/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd-hvc.patch b/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd-hvc.patch
new file mode 100644
index 000000000000..781a0acf30e2
--- /dev/null
+++ b/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd-hvc.patch
@@ -0,0 +1,38 @@
+--- rc-scripts-1.4.16/sbin/livecd-functions.sh.orig	2005-03-22 20:40:25.912265336 -0600
++++ rc-scripts-1.4.16/sbin/livecd-functions.sh	2005-03-22 20:43:08.497311240 -0600
+@@ -150,7 +150,7 @@
+ 	sed -i -e '/^c[0-9]/ s/^/#/' /etc/inittab
+ 
+ 	# SPARC & HPPA console magic
+-	if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" ]
++	if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" -o "${HOSTTYPE}" = "ppc64" ]
+ 	then
+ 		# Mount openprom tree for user debugging purposes
+ 		if [ "${HOSTTYPE}" = "sparc" ]
+@@ -179,6 +179,11 @@
+ 				echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
+ 			done
+ 		fi
++		if [ -c "/dev/hvc/0" ]
++		then
++			ln -s /dev/hvc/0 /dev/hvc0
++			echo "c0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
++		fi
+ 	# The rest...
+ 	else
+ 		if [ "${LIVECD_CONSOLE}" = "tty0" -o "${LIVECD_CONSOLE}" = "" ]
+@@ -188,7 +193,13 @@
+ 				echo "c${x}:12345:respawn:/sbin/agetty -nl /bin/bashlogin 38400 tty${x} linux" >> /etc/inittab
+ 			done	
+ 		else
+-			echo "c1:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
++			if [ -c "/dev/hvc/0" ]
++			then
++				ln -s /dev/hvc/0 /dev/hvc0
++				echo "c1:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
++			else
++				echo "c1:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
++			fi
+ 		fi
+ 	fi
+ 	return 0