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 41DB81382C5 for ; Mon, 5 Mar 2018 20:37:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85CE5E085B; Mon, 5 Mar 2018 20:37:29 +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 609CBE085B for ; Mon, 5 Mar 2018 20:37:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 236D6335C06 for ; Mon, 5 Mar 2018 20:37:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 063631ED for ; Mon, 5 Mar 2018 20:37:24 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1520282203.3a1a48c7d9d5bbaad0466be572661fc08458edb0.zerochaos@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: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 3a1a48c7d9d5bbaad0466be572661fc08458edb0 X-VCS-Branch: master Date: Mon, 5 Mar 2018 20:37:24 +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: 674ce228-b0ba-4198-8731-b4de1dcba994 X-Archives-Hash: 56d44892cfba2df64cc43eb49d25ecc6 commit: 3a1a48c7d9d5bbaad0466be572661fc08458edb0 Author: Ben Kohler gmail com> AuthorDate: Mon Mar 5 20:36:43 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Mon Mar 5 20:36:43 2018 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3a1a48c7 create-iso.sh: don't add kernel to efi boot image With GRUB2 bootloader, the kernel can be read from the ISO filesystem, so having a copy of kernel+initramfs in the EFI boot image is redundant. targets/support/create-iso.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index 5e760e14..2c40f713 100755 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -269,8 +269,8 @@ case ${clst_hostarch} in mkdir -p "${clst_target_path}"/boot else echo "Preparing EFI boot image" - # prepare gentoo.efimg from cdtar's /boot dir - iaSizeTemp=$(du -sk "${clst_target_path}/boot" 2>/dev/null) + # prepare gentoo.efimg from cdtar's /boot/EFI dir + iaSizeTemp=$(du -sk "${clst_target_path}/boot/EFI" 2>/dev/null) iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1) iaSize=$((${iaSizeB}+32)) # Add slack echo "Creating loopback file of size ${iaSize}kB" @@ -284,8 +284,8 @@ case ${clst_hostarch} in mount -t vfat -o loop "${clst_target_path}/gentoo.efimg" \ "${clst_target_path}/gentoo.efimg.mountPoint" - echo "Populating EFI image file from ${clst_target_path}/boot" - cp -rv "${clst_target_path}"/boot/* \ + echo "Populating EFI image file from ${clst_target_path}/boot/EFI" + cp -rv "${clst_target_path}"/boot/EFI/ \ "${clst_target_path}/gentoo.efimg.mountPoint" umount "${clst_target_path}/gentoo.efimg.mountPoint"