| 1 |
commit: 94ed72e267b4ee21d78a3b8168114f17e08f3299 |
| 2 |
Author: Luca Barbato <lu_zero <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 18 07:52:33 2018 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 14 05:39:07 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=94ed72e2 |
| 7 |
|
| 8 |
ppc: Use grub-mkrescue |
| 9 |
|
| 10 |
Grub2 supports PowerPC platforms which is very welcome news since |
| 11 |
sys-boot/yaboot is on its last leg. |
| 12 |
|
| 13 |
Tested-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
targets/support/create-iso.sh | 33 ++++++--------------------------- |
| 16 |
1 file changed, 6 insertions(+), 27 deletions(-) |
| 17 |
|
| 18 |
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh |
| 19 |
index 3d069ed3..0422ae97 100755 |
| 20 |
--- a/targets/support/create-iso.sh |
| 21 |
+++ b/targets/support/create-iso.sh |
| 22 |
@@ -15,6 +15,10 @@ case ${clst_hostarch} in |
| 23 |
cdmaker="sgibootcd" |
| 24 |
cdmakerpkg="sys-boot/sgibootcd" |
| 25 |
;; |
| 26 |
+ ppc*) |
| 27 |
+ cdmaker="grub-mkrescue" |
| 28 |
+ cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2" |
| 29 |
+ ;; |
| 30 |
*) |
| 31 |
cdmaker="mkisofs" |
| 32 |
cdmakerpkg="app-cdr/cdrkit or app-cdr/cdrtools" |
| 33 |
@@ -208,33 +212,8 @@ case ${clst_hostarch} in |
| 34 |
esac |
| 35 |
;; |
| 36 |
ppc*|powerpc*) |
| 37 |
- if [ -f "${clst_target_path}/ppc/bootinfo.txt" ] |
| 38 |
- then |
| 39 |
- echo "bootinfo.txt found .. updating it" |
| 40 |
- ${clst_sed} -i -e \ |
| 41 |
- 's#^<description>.*</description>$#<description>'"${clst_iso_volume_id}"'</description>#' \ |
| 42 |
- "${clst_target_path}/ppc/bootinfo.txt" |
| 43 |
- ${clst_sed} -i -e \ |
| 44 |
- 's#^<os-name>.*</os-name>$#<os-name>'"${clst_iso_volume_id}"'</os-name>#' \ |
| 45 |
- "${clst_target_path}/ppc/bootinfo.txt" |
| 46 |
- fi |
| 47 |
- |
| 48 |
- flags=( -r -U -chrp-boot ) |
| 49 |
- echo ">> Running mkisofs to create iso image...." |
| 50 |
- if [[ ${clst_subarch} == *le ]] |
| 51 |
- then |
| 52 |
- flags+=( |
| 53 |
- -v -T -l -cache-inodes |
| 54 |
- ) |
| 55 |
- else |
| 56 |
- flags+=( |
| 57 |
- -netatalk -hfs -probe -map "${clst_target_path}"/boot/map.hfs |
| 58 |
- -part -no-desktop -hfs-volid "${clst_iso_volume_id}" -hfs-bless "${clst_target_path}"/boot -hide-hfs |
| 59 |
- "zisofs" -hide-hfs "stages" -hide-hfs "distfiles" -hide-hfs "snapshots" -J ${mkisofs_zisofs_opts} |
| 60 |
- ) |
| 61 |
- fi |
| 62 |
- run_mkisofs "${flags[@]}" \ |
| 63 |
- -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" |
| 64 |
+ echo ">> Running grub-mkrescue to create iso image...." |
| 65 |
+ grub-mkrescue -o "${1}" "${clst_target_path}" |
| 66 |
;; |
| 67 |
sparc*) |
| 68 |
# Old silo (<=1.2.6) requires a specially built mkisofs |
Archives