From 99bfcf5f32271a2719619833986301a489f48111 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Fri, 19 Jan 2024 17:36:35 +0530 Subject: [PATCH] shim, coreos-sb-keys, grub_install.sh: retab to spaces Signed-off-by: Sayan Chowdhury --- build_library/grub_install.sh | 10 ++-- .../coreos-sb-keys-0.0.3.ebuild | 18 +++--- .../sys-boot/shim/shim-15.7.ebuild | 56 +++++++++---------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/build_library/grub_install.sh b/build_library/grub_install.sh index 324be19c90..63036bb0fb 100755 --- a/build_library/grub_install.sh +++ b/build_library/grub_install.sh @@ -60,7 +60,7 @@ case "${FLAGS_target}" in CORE_NAME="core.img" ;; x86_64-efi) - CORE_MODULES+=( serial linux efi_gop efinet pgp http tftp ) + CORE_MODULES+=( serial linux efi_gop efinet pgp http tftp ) CORE_NAME="core.efi" SBAT_ARG=( --sbat "${BOARD_ROOT}/usr/share/grub/sbat.csv" ) ;; @@ -168,7 +168,7 @@ if [[ ! -f "${ESP_DIR}/flatcar/grub/grub.cfg.tar" ]]; then fi sudo tar cf "${ESP_DIR}/flatcar/grub/grub.cfg.tar" \ - -C "${GRUB_TEMP_DIR}" "grub.cfg" + -C "${GRUB_TEMP_DIR}" "grub.cfg" fi info "Generating ${GRUB_DIR}/${CORE_NAME}" @@ -197,8 +197,8 @@ case "${FLAGS_target}" in x86_64-efi) info "Installing default x86_64 UEFI bootloader." sudo mkdir -p "${ESP_DIR}/EFI/boot" - # Use the test keys for signing unofficial builds - if [[ ${COREOS_OFFICIAL:-0} -ne 1 ]]; then + # Use the test keys for signing unofficial builds + if [[ ${COREOS_OFFICIAL:-0} -ne 1 ]]; then # Sign the GRUB with the shim-embedded key sudo sbsign --key /usr/share/sb_keys/shim.key \ --cert /usr/share/sb_keys/shim.pem \ @@ -221,7 +221,7 @@ case "${FLAGS_target}" in "${ESP_DIR}/EFI/boot/grub.efi" sudo cp "/usr/lib/shim/shim.efi" \ "${ESP_DIR}/EFI/boot/bootx64.efi" - fi + fi # copying from vfat so ignore permissions if [[ -n "${FLAGS_copy_efi_grub}" ]]; then cp --no-preserve=mode "${ESP_DIR}/EFI/boot/grubx64.efi" \ diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.3.ebuild index db4dc4b974..9562a134a1 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.3.ebuild @@ -15,16 +15,16 @@ IUSE="" S="${WORKDIR}" src_install() { - insinto /usr/share/sb_keys - newins "${FILESDIR}/PK.key" PK.key - newins "${FILESDIR}/PK.crt" PK.crt - newins "${FILESDIR}/KEK.key" KEK.key - newins "${FILESDIR}/KEK.crt" KEK.crt - newins "${FILESDIR}/DB.key" DB.key - newins "${FILESDIR}/DB.crt" DB.crt + insinto /usr/share/sb_keys + newins "${FILESDIR}/PK.key" PK.key + newins "${FILESDIR}/PK.crt" PK.crt + newins "${FILESDIR}/KEK.key" KEK.key + newins "${FILESDIR}/KEK.crt" KEK.crt + newins "${FILESDIR}/DB.key" DB.key + newins "${FILESDIR}/DB.crt" DB.crt - # shim keys - newins "${FILESDIR}/shim.key" shim.key + # shim keys + newins "${FILESDIR}/shim.key" shim.key newins "${FILESDIR}/shim.der" shim.der newins "${FILESDIR}/shim.pem" shim.pem } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-15.7.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-15.7.ebuild index 40fadb89a7..af215598e1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-15.7.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-15.7.ebuild @@ -19,37 +19,37 @@ RDEPEND="" # to be addressed by patching this check out after making sure that # our copy of gnu-efi is as usable as the bundled one. DEPEND=" - dev-libs/openssl - coreos-base/coreos-sb-keys + dev-libs/openssl + coreos-base/coreos-sb-keys " src_compile() { - local emake_args=( - CROSS_COMPILE="${CHOST}-" - ) - # Apparently our environment already has the ARCH variable in - # it, and Makefile picks it up instead of figuring it out - # itself with the compiler -dumpmachine flag. But also it - # expects a different format of the values. It wants x86_64 - # instead of amd64, and aarch64 instead of arm64. - if use amd64; then - emake_args+=( ARCH=x86_64 ) - elif use arm64; then - emake_args+=( ARCH=aarch64 ) - fi - emake_args+=( ENABLE_SBSIGN=1 ) - emake_args+=( VENDOR_CERT_FILE="/usr/share/sb_keys/shim.der" ) - emake "${emake_args[@]}" || die + local emake_args=( + CROSS_COMPILE="${CHOST}-" + ) + # Apparently our environment already has the ARCH variable in + # it, and Makefile picks it up instead of figuring it out + # itself with the compiler -dumpmachine flag. But also it + # expects a different format of the values. It wants x86_64 + # instead of amd64, and aarch64 instead of arm64. + if use amd64; then + emake_args+=( ARCH=x86_64 ) + elif use arm64; then + emake_args+=( ARCH=aarch64 ) + fi + emake_args+=( ENABLE_SBSIGN=1 ) + emake_args+=( VENDOR_CERT_FILE="/usr/share/sb_keys/shim.der" ) + emake "${emake_args[@]}" || die } src_install() { - local suffix - suffix='' - if use amd64; then - suffix=x64 - elif use arm64; then - suffix=aa64 - fi - insinto /usr/lib/shim - newins "shim${suffix}.efi" 'shim.efi' - newins "mm${suffix}.efi" "mm${suffix}.efi" + local suffix + suffix='' + if use amd64; then + suffix=x64 + elif use arm64; then + suffix=aa64 + fi + insinto /usr/lib/shim + newins "shim${suffix}.efi" 'shim.efi' + newins "mm${suffix}.efi" "mm${suffix}.efi" }