commit 71897bfb229ad58c4758aa5440fd18737fdd812a
author Oleksandr Tymoshenko <ovt@google.com> Tue Mar 23 00:47:16 2021 +0000
committer Oleksandr Tymoshenko <ovt@google.com> Fri Apr 02 23:37:04 2021 +0000
tree 2a2328d231626cb811937e9c8fb967664111497e
parent 50b49a44feef37bd8f018ac705ed6ef132fe86de

project-lakitu: deprecate gsetup tools on ESP

Vanadium team deprecate GSetup tool so remove references from COS images

BUG=b/183229065
TEST=presubmit
RELEASE_NOTE=None

Change-Id: I65fa38135142637815d42a61258b7e034f5222c3
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/14650
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
Reviewed-by: Roy Yang <royyang@google.com>

project-lakitu/scripts/board_specific_setup.sh

diff --git a/project-lakitu/scripts/board_specific_setup.sh b/project-lakitu/scripts/board_specific_setup.sh
index 9e47a82..ab214f2 100644
--- a/project-lakitu/scripts/board_specific_setup.sh
+++ b/project-lakitu/scripts/board_specific_setup.sh
@@ -268,12 +268,6 @@
   # Don't delete bootx64.efi here, since it can be the shim now.
   sudo rm -f "${root_fs_dir}"/boot/efi/boot/bootia32.efi
   info "Successfully deleted legacy EFI bootloaders"
-
-  info "Populating dbx"
-  sudo mkdir -p "${esp_fs_dir}"/efi/Google/GSetup/dbx
-  sudo cp "${script_root}"/dbx/* "${esp_fs_dir}"/efi/Google/GSetup/dbx
-  sudo chmod -R 755 "${esp_fs_dir}"/efi/Google/GSetup/dbx
-  info "Successfully populated dbx"
 }
 
 # Align Azure images to 1MB page size.

project-lakitu/scripts/bootloader_install.sh

diff --git a/project-lakitu/scripts/bootloader_install.sh b/project-lakitu/scripts/bootloader_install.sh
index 6d5dd1d..1c1f526 100755
--- a/project-lakitu/scripts/bootloader_install.sh
+++ b/project-lakitu/scripts/bootloader_install.sh
@@ -108,22 +108,6 @@
     return 1
   fi
 
-  info "Setting up UEFI booting on ${IMAGE}"
-  # Directory for GSetup data.
-  sudo mkdir -p "${ESP_DIR}/EFI/Google/GSetup"
-  # Boot sequence.
-  if [[ "${ARCH}" == "amd64" ]]; then
-    echo "\\efi\\boot\\shimx64.efi" | \
-        sudo tee "${ESP_DIR}/EFI/Google/GSetup/Boot" > /dev/null
-  elif [[ "${ARCH}" == "arm64" ]]; then
-    echo "\\efi\\boot\\shimaa64.efi" | \
-        sudo tee "${ESP_DIR}/EFI/Google/GSetup/Boot" > /dev/null
-  else
-    error "Could not set up UEFI booting on unsupported architecture: ${ARCH}"
-    return 1
-  fi
-  info "Successfully set up UEFI booting on ${IMAGE}"
-
   cleanup
   trap - EXIT
   info "Successfully installed bootloaders on ${IMAGE}"