[PATCH 2/3] Modify the parameter of ppc64 little-endian, because the ppc64 little-endian has different archtecture and new boot parameters.Don't need the hfs and mapping files as it in Big-endian.Also tweak the code of Big-endian.

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/3] Modify the parameter of ppc64 little-endian, because the ppc64 little-endian has different archtecture and new boot parameters.Don't need the hfs and mapping files as it in Big-endian.Also tweak the code of Big-endian.

Kevin Zhao
Signed-off-by: Kevin Zhao <[hidden email]>
---
 targets/support/create-iso.sh | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index b4077c3..2e604db 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -211,8 +211,22 @@ case ${clst_hostarch} in
  "${clst_target_path}/ppc/bootinfo.txt"
  fi
 
+ flags=( -r -U )
  echo ">> Running mkisofs to create iso image...."
- run_mkisofs -r -U -chrp-boot -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} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"/
+ if echo ${clst_subarch} | grep -qE ".+le$"
+ then
+ flags+=(
+ -v -T -l -cache-inodes -chrp-boot
+ )
+ else
+ flags+=(
+ -chrp-boot -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}"
  ;;
  sparc*)
  # Old silo (<=1.2.6) requires a specially built mkisofs
--
2.1.0


Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 2/3] Modify the parameter of ppc64 little-endian, because the ppc64 little-endian has different archtecture and new boot parameters.Don't need the hfs and mapping files as it in Big-endian.Also tweak the code of Big-endian.

Mike Frysinger
On 08 Jan 2016 05:04, Kevin Zhao wrote:
> + if echo ${clst_subarch} | grep -qE ".+le$"

just use a pattern match:
        if [[ ${clst_subarch} == *le ]]

> + then
> + flags+=(
> + -v -T -l -cache-inodes -chrp-boot
> + )

-chrp-boot shows up in both, so factor that out into the common setting ?

> + flags+=(
> + -chrp-boot -netatalk -hfs -probe -map "${clst_target_path}"/boot/map.hfs \

you don't need to use \ with arrays
-mike

signature.asc (836 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 2/3] Modify the parameter of ppc64 little-endian, because the ppc64 little-endian has different archtecture and new boot parameters.Don't need the hfs and mapping files as it in Big-endian.Also tweak the code of Big-endian.

Kevin Zhao
Hi Mike,
    Thanks for your comment.I have send a new patch cover this :-)

2016-01-09 3:50 GMT+08:00 Mike Frysinger <[hidden email]>:

> On 08 Jan 2016 05:04, Kevin Zhao wrote:
>> +             if echo ${clst_subarch} | grep -qE ".+le$"
>
> just use a pattern match:
>         if [[ ${clst_subarch} == *le ]]
>
>> +             then
>> +                     flags+=(
>> +                             -v -T -l -cache-inodes -chrp-boot
>> +                     )
>
> -chrp-boot shows up in both, so factor that out into the common setting ?
>
>> +                     flags+=(
>> +                             -chrp-boot -netatalk -hfs -probe -map "${clst_target_path}"/boot/map.hfs \
>
> you don't need to use \ with arrays
> -mike

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 2/3] Modify the parameter of ppc64 little-endian, because the ppc64 little-endian has different archtecture and new boot parameters.Don't need the hfs and mapping files as it in Big-endian.Also tweak the code of Big-endian.

Leno Hou
Hi Mike,

    I've tesed Kevin Zhao's patches Could you help me to review v3 patches and merge to upstream ?
    These patches will be sent in mail list later.... Thanks

Leno Hou

On Tue, Jan 12, 2016 at 10:31 PM, Kevin Zhao <[hidden email]> wrote:
Hi Mike,
    Thanks for your comment.I have send a new patch cover this :-)

2016-01-09 3:50 GMT+08:00 Mike Frysinger <[hidden email]>:
> On 08 Jan 2016 05:04, Kevin Zhao wrote:
>> +             if echo ${clst_subarch} | grep -qE ".+le$"
>
> just use a pattern match:
>         if [[ ${clst_subarch} == *le ]]
>
>> +             then
>> +                     flags+=(
>> +                             -v -T -l -cache-inodes -chrp-boot
>> +                     )
>
> -chrp-boot shows up in both, so factor that out into the common setting ?
>
>> +                     flags+=(
>> +                             -chrp-boot -netatalk -hfs -probe -map "${clst_target_path}"/boot/map.hfs \
>
> you don't need to use \ with arrays
> -mike