Fixing HFS bless on PPC64. This is catalyst 2.0_rc26.

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

diff --git a/ChangeLog b/ChangeLog
index 91e648b87c0e03d330c3fd1f703de1a617ae78a1..101d9bd039c682cc1dc4a10a78d4c577194d7d80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.537 2006/01/27 22:49:10 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.538 2006/01/27 22:57:16 wolf31o2 Exp $
+
+  27 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/create-iso.sh:
+  Fixing HFS bless on PPC64.  This is catalyst 2.0_rc26.
 
   27 Jan 2006; Eric Edgar <rocket@gentoo.org>
   +livecd/cdtar/yaboot-1.3.11-ppc-cdtar.tar.bz2,

diff --git a/catalyst b/catalyst
index c74985e72113169917110b6032fb31470efd29ba..abce9ef2c71bc45c3ea425633be5469d2b98962d 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.133 2006/01/26 23:39:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.134 2006/01/27 22:57: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_rc25"
+__version__="2.0_rc26"
 
 conf_values={}
 

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index e7b0faeacc062428cc8be0589b1be4ee790541e6..ace8c1986df7be04bbd0027afab9d603860f2bb6 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.25 2006/01/27 22:49:10 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.26 2006/01/27 22:57:16 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
@@ -234,27 +234,27 @@ case ${clst_mainarch} in
                        zisofs)
                                echo "Running mkisofs to create iso image...."
                                echo "mkisofs -J -r -U -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 -U -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"
                        ;;
                        *)
                                echo "Running mkisofs to create iso image...."
                                echo "mkisofs -J -r -U -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}"
                                mkisofs -J -r -U -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"
                        ;;
                esac