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 8EA83138350 for ; Wed, 8 Apr 2020 03:28:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD30EE097C; Wed, 8 Apr 2020 03:28:15 +0000 (UTC) Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) (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 B6C70E097C for ; Wed, 8 Apr 2020 03:28:15 +0000 (UTC) Received: by mail-pj1-f65.google.com with SMTP id b7so480485pju.0 for ; Tue, 07 Apr 2020 20:28:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qHBUO6Z/F85Gnm+mCrpt+81ho2D3xHO7YqmJ1LiEImU=; b=HZ4gMz8v6S0lchIuMd94PDqgPa9XNggxscJNyZa9rpdItTM9/+b0Xb/j8OGWsoh0hI M9fhpLdgA3XI7FE5yJ30uaewQrwLIxmB5vLX3Sh8X7idgr2tFOeHcUQVXQuQtpgvd/YF io0ujCqFFSjdqTyckpZHyZ15QaS5qMJxI5PHNk2EKjrzKtWOOqAfAwndDOtenayqZ0d2 d8bobJl0DaG4i2dUPA53rAXzKjP7SEG/QE+Dy44ytiCZL0p1/MN5YR79XRA0mhy3Q8a2 ih4Ju2s1r2rSqIa3FH2izypPqbMJALXDyXCEHovXSfKqcJXSkGTk/AhXsjq/oP4b5lUo 8juw== X-Gm-Message-State: AGi0PuYoNfE3AtiTii2RIHpWmGu75P/d8XLIrdGJW+RQBtfwVv5FxWDp +6WAKxlqPsybssO7fPGDE49d+yZI X-Google-Smtp-Source: APiQypLM4gz5alOLyRxaiPTFgEbmtlXkLvyWRxUPGMEwFEajcchUUpWbR8GJ4UN+KJCU+KQLeTWkog== X-Received: by 2002:a17:90a:22ab:: with SMTP id s40mr2804059pjc.24.1586316494266; Tue, 07 Apr 2020 20:28:14 -0700 (PDT) Received: from localhost ([134.134.137.79]) by smtp.gmail.com with ESMTPSA id b11sm1332059pgj.92.2020.04.07.20.28.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 20:28:13 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 2/5] targets: Simplify isoroot_checksum() Date: Tue, 7 Apr 2020 20:27:50 -0700 Message-Id: <20200408032753.105267-2-mattst88@gentoo.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200408032753.105267-1-mattst88@gentoo.org> References: <20200408032753.105267-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: f19e3e61-687b-4aca-893e-24853c80c01b X-Archives-Hash: 8355373b4805e52d6a577aec259090e8 Signed-off-by: Matt Turner --- 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() { -- 2.24.1