Added sed to PPC/PPC64 to change boot.msg to match the hardware for which the CD...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1100 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index b27902dda61d997fd457215e8f90951319432854..803fc27fdbdf505279011a41204b0ab036c255f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.585 2006/03/13 17:07:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.586 2006/03/16 19:33:26 wolf31o2 Exp $
+
+  16 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -livecd/cdtar/yaboot-1.3.11-cdtar.tar.bz2,
+  -livecd/cdtar/yaboot-1.3.11-ppc64-cdtar-r1.tar.bz2,
+  +livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2,
+  -livecd/cdtar/ppc-yaboot-cdtar.tar.bz2,
+  targets/support/bootloader-setup.sh:
+  Added sed to PPC/PPC64 to change boot.msg to match the hardware for which
+  the CD was built, merged the PPC and PPC64 cdtar files into a single cdtar,
+  and removed all older cdtar files for PPC*.
 
   13 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   livecd/files/livecd.motd.txt:

diff --git a/livecd/cdtar/ppc-yaboot-cdtar.tar.bz2 b/livecd/cdtar/ppc-yaboot-cdtar.tar.bz2
deleted file mode 100644 (file)
index e51b8f9..0000000
Binary files a/livecd/cdtar/ppc-yaboot-cdtar.tar.bz2 and /dev/null differ

diff --git a/livecd/cdtar/yaboot-1.3.11-cdtar.tar.bz2 b/livecd/cdtar/yaboot-1.3.11-cdtar.tar.bz2
deleted file mode 100644 (file)
index 897c171..0000000
Binary files a/livecd/cdtar/yaboot-1.3.11-cdtar.tar.bz2 and /dev/null differ

diff --git a/livecd/cdtar/yaboot-1.3.11-ppc64-cdtar-r1.tar.bz2 b/livecd/cdtar/yaboot-1.3.11-ppc64-cdtar-r1.tar.bz2
deleted file mode 100644 (file)
index e2c162c..0000000
Binary files a/livecd/cdtar/yaboot-1.3.11-ppc64-cdtar-r1.tar.bz2 and /dev/null differ

diff --git a/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 b/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2
new file mode 100644 (file)
index 0000000..04339c8
Binary files /dev/null and b/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 differ

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 1e87b26be84dd82391ac82d41025b259aa9dbbb0..4cc9c1b5a98d577751a88ae6e75af8a0e9643970 100755 (executable)
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.32 2006/02/14 00:04:14 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.33 2006/03/16 19:33:26 wolf31o2 Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -71,7 +71,15 @@ case ${clst_mainarch} in
                echo "fgcolor=white" >> ${icfg}
                echo "bgcolor=black" >> ${icfg}
                echo "message=/boot/boot.msg" >> ${icfg}
-               
+
+               # Here is where I fix up the boot.msg file.
+               sed -e 's/ARCH/PPC/' \
+                       -e 's/HARDWARE/32-bit Apple and Pegasos hardware/' \
+                       -i $kmsg
+
+               # Here we wipe out the /ppc directory, if it exists.
+               rm -rf $1/ppc
+
                for x in ${clst_boot_kernel}
                do      
                        eval custom_kopts=\$${x}_kernelopts
@@ -89,7 +97,7 @@ case ${clst_mainarch} in
                        then
                                echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme}\"" >> ${icfg}
                        else
-                               echo "append=\"${default_append_line} splash=silent\"" >> ${icfg}
+                               echo "append=\"${default_append_line}\"" >> ${icfg}
                        fi
                done
        ;;
@@ -124,6 +132,11 @@ case ${clst_mainarch} in
                echo "bgcolor=black" >> ${icfg}
                echo "message=/boot/boot.msg" >> ${icfg}
                
+               # Here is where I fix up the boot.msg file.
+               sed -e 's/ARCH/PPC/' \
+                       -e 's/HARDWARE/64-bit Apple and IBM hardware/' \
+                       -i $kmsg
+
                # Setup the IBM yaboot.conf     
                etc_icfg=$1/etc/yaboot.conf
                mkdir -p $1/etc