From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 094361381F3 for ; Thu, 21 Apr 2016 05:39:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69EEEE07C2; Thu, 21 Apr 2016 05:39:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B639E07C2 for ; Thu, 21 Apr 2016 05:39:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3852E340C08 for ; Thu, 21 Apr 2016 05:39:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1700C256 for ; Thu, 21 Apr 2016 05:38:59 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1461217093.bf5670e3d1f8391538c037ae591dfca1a83790dc.vapier@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/create-iso.sh X-VCS-Directories: targets/support/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: bf5670e3d1f8391538c037ae591dfca1a83790dc X-VCS-Branch: master Date: Thu, 21 Apr 2016 05:38:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b0c67569-d33f-43f4-b992-9c70d5a8ee76 X-Archives-Hash: a6d528105cc5dd65d4ce741d0acd3a82 commit: bf5670e3d1f8391538c037ae591dfca1a83790dc Author: Kevin Zhao gmail com> AuthorDate: Thu Apr 21 04:42:46 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Apr 21 05:38:13 2016 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bf5670e3 create-iso: modify the mkisofs parameter of ppc64 little-endian. 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. Signed-off-by: Kevin Zhao gmail.com> CC: Mike Frysinger gentoo.org> CC: Leno Hou gmail.com> 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..f45dd7d 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 -chrp-boot ) 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 [[ ${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}" ;; sparc*) # Old silo (<=1.2.6) requires a specially built mkisofs