From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1E6E0138350 for ; Fri, 10 Apr 2020 02:11:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 550BDE08A4; Fri, 10 Apr 2020 02:11:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3AFC1E08A4 for ; Fri, 10 Apr 2020 02:11:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B5DA34EFF9 for ; Fri, 10 Apr 2020 02:11:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8405A1D2 for ; Fri, 10 Apr 2020 02:11:28 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1586460223.87f08d2cd8c8eb91f6458e36fcb52fce30492256.mattst88@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: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 87f08d2cd8c8eb91f6458e36fcb52fce30492256 X-VCS-Branch: master Date: Fri, 10 Apr 2020 02:11:28 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f17a9792-13d4-4d99-a799-9317623169c2 X-Archives-Hash: 8fca82159a39386425f49b6966f25161 commit: 87f08d2cd8c8eb91f6458e36fcb52fce30492256 Author: Matt Turner gentoo org> AuthorDate: Wed Apr 8 01:33:33 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Apr 9 19:23:43 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=87f08d2c targets: Simplify isoroot_checksum() Signed-off-by: Matt Turner gentoo.org> targets/support/create-iso.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index b0e4d15e..8c0da181 100755 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -98,8 +98,12 @@ fi # the ISO isoroot_checksum() { echo ">> Creating checksums for all files included in the ISO" - find "${clst_target_path}" -type f ! -name 'isoroot_b2sums' -exec b2sum {} + > "${clst_target_path}"/isoroot_b2sums - ${clst_sed} -i "s#${clst_target_path}/\?##" "${clst_target_path}"/isoroot_b2sums + + pushd "${clst_target_path}" + find -type f -exec b2sum {} + > /tmp/isoroot_b2sums + popd + + mv /tmp/isoroot_b2sums "${clst_target_path}"/ } run_mkisofs() {