Added patch from bug #120475 that resolves HFS blessing on PPC*. This is 2.0_rc24.

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

diff --git a/ChangeLog b/ChangeLog
index 4c5721ff63f90728a4a05224b30d1b5a4391804b..5efb0cd0f1dfd9fe6aa754a3db0acb0333090fe7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.532 2006/01/26 21:53:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.533 2006/01/26 23:17:16 wolf31o2 Exp $
+
+  26 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/create-iso.sh:
+  Added patch from bug #120475 that resolves HFS blessing on PPC*. This is
+  2.0_rc24.
 
   26 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   +livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2,

diff --git a/catalyst b/catalyst
index 096652af0bff1f017733a901490040f620e2c134..1ed35c0641e0b21700e927feeeb2d19007c591d7 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python -OO
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.131 2006/01/26 21:53:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.132 2006/01/26 23:17:16 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -11,7 +11,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc23"
+__version__="2.0_rc24"
 
 conf_values={}
 

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index aff75f684aadd8749642a4b83962fd8837e1492f..b06243b84c5918f45e38c6717bae461271195044 100755 (executable)
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.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/create-iso.sh,v 1.22 2006/01/26 21:53:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.23 2006/01/26 23:17:17 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
@@ -197,14 +197,14 @@ case ${clst_mainarch} in
                        zisofs)
                                echo "Running mkisofs to create iso image...."
                                echo "mkisofs -J -r -l -z -chrp-boot -netatalk -hfs -probe \
-                                       -map ${clst_target_path}/boot/map.hfs -part -no-desktop \
+                                       -map ${clst_target_path}boot/map.hfs -part -no-desktop \
                                        -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless \
-                                       ${clst_target_path}/boot -V \"${clst_iso_volume_id}\" -o \
+                                       ${clst_target_path}boot -V \"${clst_iso_volume_id}\" -o \
                                        ${1} ${clst_target_path}"
                                mkisofs -J -r -l -z -chrp-boot -netatalk -hfs -probe -map \
-                                       ${clst_target_path}/boot/map.hfs -part -no-desktop \
+                                       ${clst_target_path}boot/map.hfs -part -no-desktop \
                                        -hfs-volid "${clst_iso_volume_id}" -hfs-bless \
-                                       ${clst_target_path}/boot -V "${clst_iso_volume_id}" -o \
+                                       ${clst_target_path}boot -V "${clst_iso_volume_id}" -o \
                                        ${1} ${clst_target_path} || die "Cannot make ISO image"
                        ;;
                        *)