>From d7c348de603ef11f63fb4d8a0ddcc51c3e7b44dc Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Wed, 18 Dec 2013 02:23:47 +0400 Subject: [PATCH] mki-copy-efiboot: drop -signed subpackages There are no (un)signed EFI subpackages now but presence of a signature or the lack thereof is being determined by the build environment or postprocessing; just drop the code written to support the experimental state of affairs. --- tools/mki-copy-efiboot | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/mki-copy-efiboot b/tools/mki-copy-efiboot index 58f70a4..0116430 100755 --- a/tools/mki-copy-efiboot +++ b/tools/mki-copy-efiboot @@ -30,11 +30,11 @@ pkgs="$pkgs $EFI_BOOTLOADER" pkgs="$pkgs $EFI_SHELL" [ -z "${EFI_CERT:-}" ] || - pkgs="$pkgs alt-uefi-keys shim-signed $EFI_BOOTLOADER-signed" + pkgs="$pkgs alt-uefi-keys shim-signed" case "${EFI_BOOTLOADER:-}" in refind) # won't boot unsigned kernels in SB mode - pkgs="$pkgs elilo${EFI_CERT:+-signed}" + pkgs="$pkgs elilo" ;; esac @@ -69,11 +69,9 @@ mkdir $verbose -p -- \$boot if [ -n "${EFI_CERT:-}" ]; then shim_path=\$boot/bootx64.efi bin_path=\$boot/grubx64.efi - bin_suffix=-signed else shim_path= bin_path=\$boot/bootx64.efi - bin_suffix= fi stage2_size="\$[ \$(stat -c%s \$stage2) / 1024 + 1 ]" @@ -84,7 +82,7 @@ efi_bindir=/usr/lib64/efi copy_shell() { dest="\$efi/\$shell" - src="\$efi_bindir/shell${EFI_CERT:+-signed}.efi" + src="\$efi_bindir/shell.efi" [ ! -f "\$src" ] || cp $verbose -pLf "\$src" "\$dest" } @@ -115,7 +113,7 @@ copy_kernel() { copy_elilo() { copy_kernel - cp $verbose -pLf \$efi_bindir/elilo\$bin_suffix.efi \${1:-\$bin_path} + cp $verbose -pLf \$efi_bindir/elilo.efi \${1:-\$bin_path} cat > \$boot/elilo.conf <<- ELILO_EOF default="linux" image="vmlinuz" @@ -126,7 +124,6 @@ copy_elilo() { ELILO_EOF } -# refind is currently signed by default refind_aux=\$efi/refind refind_boot=\$refind_aux/refind_x64.efi -- 1.8.3.4