[gentoo-catalyst] [PATCH v2] modify alpha to use genisoimage

[gentoo-catalyst] [PATCH v2] modify alpha to use genisoimage

[Raúl Porcel]

alpha needs to use app-cdr/cdrkit's genisoimage with an alpha-specific
option which mkisofs from app-cdr/cdrtools doesn't have
---
 targets/support/create-iso.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index bf81cba..7454adb 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -7,6 +7,9 @@ source ${clst_sharedir}/targets/support/filesystem-functions.sh
 
 # Check for our CD ISO creation tools
 case ${clst_hostarch} in
+	alpha)
+		cdmaker="genisoimage"
+		cdmakerpkg="app-cdr/cdrkit"
 	mips)
    		cdmaker="sgibootcd"
 		cdmakerpkg="sys-boot/sgibootcd"
@@ -82,9 +85,8 @@ fi
 case ${clst_hostarch} in
 	alpha)
 		echo ">> Running mkisofs to create iso image...."
-		echo ">> mkisofs -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
-		mkisofs -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image"
-		isomarkboot ${1} /boot/bootlx
+		echo ">> genisoimage --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
+		genisoimage --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image"
 	;;
 	arm)
 	;;
-- 
2.0.4

Previous patch had a mistake

Re: [gentoo-catalyst] [PATCH v2] modify alpha to use genisoimage

[Brian Dolbec]

On Wed,  3 Dec 2014 11:03:34 +0000
Raúl Porcel <armin76@gentoo.org> wrote:

> alpha needs to use app-cdr/cdrkit's genisoimage with an alpha-specific
> option which mkisofs from app-cdr/cdrtools doesn't have
> ---
>  targets/support/create-iso.sh | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/targets/support/create-iso.sh
> b/targets/support/create-iso.sh index bf81cba..7454adb 100755
> --- a/targets/support/create-iso.sh
> +++ b/targets/support/create-iso.sh
> @@ -7,6 +7,9 @@ source
> ${clst_sharedir}/targets/support/filesystem-functions.sh 
>  # Check for our CD ISO creation tools
>  case ${clst_hostarch} in
> +	alpha)
> +		cdmaker="genisoimage"
> +		cdmakerpkg="app-cdr/cdrkit"
>  	mips)
>     		cdmaker="sgibootcd"
>  		cdmakerpkg="sys-boot/sgibootcd"
> @@ -82,9 +85,8 @@ fi
>  case ${clst_hostarch} in
>  	alpha)
>  		echo ">> Running mkisofs to create iso image...."
> -		echo ">> mkisofs -R -l -J ${mkisofs_zisofs_opts} -V
> \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
> -		mkisofs -R -l -J ${mkisofs_zisofs_opts} -V
> "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot
> make ISO image"
> -		isomarkboot ${1} /boot/bootlx
> +		echo ">> genisoimage --alpha-boot=boot/bootlx -R -l
> -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1}
> ${clst_target_path}"
> +		genisoimage --alpha-boot=boot/bootlx -R -l -J
> ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1}
> ${clst_target_path} || die "Cannot make ISO image" ;; arm)
>  	;;

merged into 2.X branch and pending branch, pending will be merged into
master soon.

-- 
Brian Dolbec <dolsen>