From patchwork Fri Apr 17 19:56:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nl6720 via arch-releng X-Patchwork-Id: 1592 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 90DA91840B98C for ; Fri, 17 Apr 2020 19:57:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Fri, 17 Apr 2020 19:57:13 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 3CCAC1B0B93302; Fri, 17 Apr 2020 19:57:12 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id 08E491B0B932FC; Fri, 17 Apr 2020 19:57:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1587153432; bh=Fu9IJr0izZfiroYxxzjrIWSgEVVYAVpwoGQ9uXSN2vY=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=rh7CuTm69sKlXkS3/rBPsozrp+2CW0ScNymVIKvpR6RymoCm+iWzhw/xEU80DQb3J LNjJoaMMO/mareQUcY1Zv4K9Bsb/Vn2lXWyT5TfUYBIw3KIkSNzN5cbMucGb3pBikV MrIeQddELw66QXCemn0s2QEjth8Qj4cKlWDro1yoiawGMNxyNQhvUmmHG9NcIrpgjz ki7l4TQdyalVyji4T+oD5lEeW5OKLw4D7Zs+4ckap8AmzscM+4THgnh7yDkjxUqXJG qEQlZywDZkQQCfAPkMOphon0XLXChFsXGNDg1uZBVkFv40ZbPIQXgx/2uwSn4Gmlyj jmLAYPHnzxzdRK3MInX2gB9egBgbYDNMapRYuyo6URDUk+Miw0OIUX0uLUQSoW2NDS h9dH4tITZppgd+B5jCzKDspgVUgRNhAmtXoXiuDpop+Nu/D09reo8urFnZ2kcOqVsC g+biToQmeL2TRo7S2mPUDl96r4rj7EJBf+VsqG87RdnNGjlUBQ7y/gUNXV9fv+yd0t r7MHmmkM27IAW6zi1UNxgFRs50PZgdltQKF0bJgMchuujnEjjualwYJTbBZBHs11lv NzW5kBVmGmGo2bOUIBi9Qrt7z1W3asv5ZCF9Zjp5CoUc16n5zCRA+HW4C0LG6UxDEx tBiiJok/65RF5d7Rbiue4Ywc= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id E6AA92B29C; Fri, 17 Apr 2020 19:57:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1587153431; bh=Fu9IJr0izZfiroYxxzjrIWSgEVVYAVpwoGQ9uXSN2vY=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=AauGHXBT5qgKRTQBjA7uB/WEm/LStQuo1666fJHPB6qQFnCP3oYMxmnCLwnnR8KGc OFKZcGwJvW9dZm93KRs0Lk+B4o8TLtGTPcpu5EpUqS7PDTv3DywGdCaRqFNad/PI9g DkWZPgG8AWet1B8pAWKN/0uSKZE+CKeHpiK6xofeUuvPa7aBfZ7g9j/ou8SwoQIoAX HjW3a8FmEAnbJkYtKCWcgzdRfW2xchNIx42T+/15+RHvGrIaR/NEQckYdcv21W2TSo KF2n8MC71qRY03T9u1qQEyoS8tG+Bwylvohh1zJc3/bD1jss3/byPvBfig1hAc7XB9 6Nx/nVjkrWStQ1nRe1i39TX2jvrrYqWABQE7SjV2AzRZAS/YYeaLaqjFzdxKjziDaD UWRb/fakaJmiv75CTDuaAhvI9alB3hH2ECOrjHLKpSIECBfcBeeYPf5RMcdmrMkhyU 6YlPWLI93P9WqS8CBirvJ4Y8t7cpGfVYNukvVmFeBDH3Y9+UZloGyG+J1tsEqKJmOv imYH0nkpwJvK2E6298L+zpt5gx6OOwPEgZNDdNznoYBxTb+yaO/WCp66eIeuRmfwR9 u/e5mMcJB9mAZKkiVR66SlBfKVkZSdUTqCJo4gWOy+Dv9OTmWUwsX/5YEo+bQgFgKv PjyuG0e8A8UTqTWSOTiWScJU= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id AB7AD2B293 for ; Fri, 17 Apr 2020 19:57:08 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Fri, 17 Apr 2020 19:57:08 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 8B10F1B0B932F9 for ; Fri, 17 Apr 2020 19:57:07 +0000 (UTC) Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS for ; Fri, 17 Apr 2020 19:57:07 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id z26so3266309ljz.11 for ; Fri, 17 Apr 2020 12:57:07 -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:mime-version :content-transfer-encoding; bh=+lyLSzG7GScaZy6wjAjXvTEdhuYxkLudcQyqE3oEKLQ=; b=SmqWt+uI0NuHvDAbPWGbMNim7UI5gNmVvQ1KU+DT5TeDnyc8PZGS5JRIA7iR590SQD p0RBf7ZG1hwfJ7Lk3O+5aWan+V7Wxy8lmf2eyE6TQU+m5Jlr5gw/6ZvBN9BtdXnQvaIX YjdNlc6CxlqlK+Kvj5QAEllMobtesyv0AQA1FaWLt0o+sJvgxhCuGBJgHq4gjUlOLPZJ 5D5+E8+zoRBuhsOhONd6/OSE3SBJXVDfL4fZW0OPQIaHbTLDUnwIR5D2DCX9JTjYZC0t +vexYH+Td7fb5qcflOO1MlZoKDvnZmeKkSNG5oBl6CjfAJ85tZrAiy5Kp39h6Lqa6uqV eo7w== X-Gm-Message-State: AGi0PuaB7mkvBycI1nycMnuN38iDpCnw98g56jWN7Ti0ITH+hgu5u476 vbUBx7GefARG3UVTe+iCIXUkzrR0 X-Google-Smtp-Source: APiQypKqf0PHc/yn/Ye/sYu4/qCMbJQhLPQyijWa2uaMYw2Tz7TBR+I5eDjJ7yh4qUf1mnrpZvC2MA== X-Received: by 2002:a2e:a310:: with SMTP id l16mr3186692lje.255.1587153425475; Fri, 17 Apr 2020 12:57:05 -0700 (PDT) Received: from walnut.lan (balticom-231-46.balticom.lv. [83.99.231.46]) by smtp.gmail.com with ESMTPSA id z7sm16895686ljc.17.2020.04.17.12.57.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 12:57:04 -0700 (PDT) To: Arch Linux Release Engineering Date: Fri, 17 Apr 2020 22:56:55 +0300 Message-Id: <20200417195655.88249-1-nl6720@gmail.com> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 Subject: [arch-releng] [archiso] [PATCH] Remove unsigned PreLoader.efi and HashTool.efi X-BeenThere: arch-releng@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Arch Linux Release Engineering List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: nl6720 via arch-releng Reply-To: Arch Linux Release Engineering Cc: nl6720 Errors-To: arch-releng-bounces@archlinux.org Sender: "arch-releng" In 908370a17e6f9e64b38e9763db9357f0020ed1d9 the deprecated prebootloader package was replaced with the efitools package that does not contain signed EFI binaries. The unsigned EFI binaries serve no purpose other than taking up space. Fixes FS#59487 . Signed-off-by: nl6720 --- configs/releng/build.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 659e8de..805e305 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -61,7 +61,7 @@ make_pacman_conf() { # Base installation, plus needed packages (airootfs) make_basefs() { mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init - mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install + mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh" install } # Additional packages (airootfs) @@ -153,10 +153,7 @@ make_isolinux() { # Prepare /EFI make_efi() { mkdir -p ${work_dir}/iso/EFI/boot - cp ${work_dir}/x86_64/airootfs/usr/share/efitools/efi/PreLoader.efi ${work_dir}/iso/EFI/boot/bootx64.efi - cp ${work_dir}/x86_64/airootfs/usr/share/efitools/efi/HashTool.efi ${work_dir}/iso/EFI/boot/ - - cp ${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi ${work_dir}/iso/EFI/boot/loader.efi + cp ${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi ${work_dir}/iso/EFI/boot/bootx64.efi mkdir -p ${work_dir}/iso/loader/entries cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/ @@ -190,10 +187,7 @@ make_efiboot() { cp ${work_dir}/iso/${install_dir}/boot/amd_ucode.img ${work_dir}/efiboot/EFI/archiso/amd_ucode.img mkdir -p ${work_dir}/efiboot/EFI/boot - cp ${work_dir}/x86_64/airootfs/usr/share/efitools/efi/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi - cp ${work_dir}/x86_64/airootfs/usr/share/efitools/efi/HashTool.efi ${work_dir}/efiboot/EFI/boot/ - - cp ${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi ${work_dir}/efiboot/EFI/boot/loader.efi + cp ${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi mkdir -p ${work_dir}/efiboot/loader/entries cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/