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

[Matt Turner]

commit:     94ed72e267b4ee21d78a3b8168114f17e08f3299
Author:     Luca Barbato <lu_zero <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 07:52:33 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 05:39:07 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=94ed72e2

ppc: Use grub-mkrescue

Grub2 supports PowerPC platforms which is very welcome news since
sys-boot/yaboot is on its last leg.

Tested-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 3d069ed3..0422ae97 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -15,6 +15,10 @@ case ${clst_hostarch} in
                cdmaker="sgibootcd"
                cdmakerpkg="sys-boot/sgibootcd"
                ;;
+        ppc*)
+                cdmaker="grub-mkrescue"
+                cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
+                ;;
        *)
                cdmaker="mkisofs"
                cdmakerpkg="app-cdr/cdrkit or app-cdr/cdrtools"
@@ -208,33 +212,8 @@ case ${clst_hostarch} in
                esac
        ;;
        ppc*|powerpc*)
-               if [ -f "${clst_target_path}/ppc/bootinfo.txt" ]
-               then
-                       echo "bootinfo.txt found .. updating it"
-                       ${clst_sed} -i -e \
-                       
's#^<description>.*</description>$#<description>'"${clst_iso_volume_id}"'</description>#'
 \
-                       "${clst_target_path}/ppc/bootinfo.txt"
-                       ${clst_sed} -i -e \
-                       
's#^<os-name>.*</os-name>$#<os-name>'"${clst_iso_volume_id}"'</os-name>#' \
-                       "${clst_target_path}/ppc/bootinfo.txt"
-               fi
-
-               flags=( -r -U -chrp-boot )
-               echo ">> Running mkisofs to create iso image...."
-               if [[ ${clst_subarch} == *le ]]
-               then
-                       flags+=(
-                               -v -T -l -cache-inodes
-                       )
-               else
-                       flags+=(
-                               -netatalk -hfs -probe -map 
"${clst_target_path}"/boot/map.hfs
-                               -part -no-desktop -hfs-volid 
"${clst_iso_volume_id}" -hfs-bless "${clst_target_path}"/boot -hide-hfs
-                               "zisofs" -hide-hfs "stages" -hide-hfs 
"distfiles" -hide-hfs "snapshots" -J ${mkisofs_zisofs_opts}
-                       )
-               fi
-               run_mkisofs "${flags[@]}" \
-                       -V "${clst_iso_volume_id}" -o "${1}" 
"${clst_target_path}"
+               echo ">> Running grub-mkrescue to create iso image...."
+               grub-mkrescue -o "${1}" "${clst_target_path}"
        ;;
        sparc*)
                # Old silo (<=1.2.6) requires a specially built mkisofs