* New upstream release.debian/15+1533136590.3beb971-1

  - debian/patches/second-stage-path: dropped; the default loader path now
    includes an arch suffix.
  - debian/patches/sbsigntool-no-pesign: dropped; no longer needed.
* Drop remaining patches that were not being applied.
* Sync packaging from Ubuntu:
  - debian/copyright: Update upstream source location.
  - debian/control: add a Build-Depends on libelf-dev.
  - Enable arm64 build.
  - debian/patches/fixup_git.patch: don't run git in clean; we're not
    really in a git tree.
  - debian/rules, debian/shim.install: use the upstream install target as
    intended, and move files to the target directory using dh_install.
  - define RELEASE and COMMIT_ID for the snapshot.
  - Set ENABLE_HTTPBOOT to enable the HTTP Boot feature.
  - Update dh_auto_build/dh_auto_clean/dh_auto_install for new upstream
    options: set MAKELEVEL.
  - Define an EFI_ARCH variable, and use that for paths to shim. This
    makes it possible to build a shim for other architectures than amd64.
  - Set EFIDIR=$distro for dh_auto_install; that will let files be installed
    in the "right" final directories, and makes boot.csv for us.
  - Set ENABLE_SHIM_CERT, to keep using ephemeral self-signed certs built
    at compile-time for MokManager and fallback.
  - Set ENABLE_SBSIGN, to use sbsign instead of pesign for signing fallback
    and MokManager.

1 files changed, 16 insertions, 19 deletions

diff --git a/lib/execute.c b/lib/execute.c
index 89328c68..3aff28ad 100644
--- a/lib/execute.c
+++ b/lib/execute.c
@@ -41,8 +41,7 @@
 #include <efi.h>
 #include <efilib.h>
 
-#include <guid.h>
-#include <execute.h>
+#include "shim.h"
 
 EFI_STATUS
 generate_path(CHAR16* name, EFI_LOADED_IMAGE *li, EFI_DEVICE_PATH **path, CHAR16 **PathName)
@@ -74,7 +73,7 @@ generate_path(CHAR16* name, EFI_LOADED_IMAGE *li, EFI_DEVICE_PATH **path, CHAR16
 	*PathName = AllocatePool((pathlen + 1 + StrLen(name))*sizeof(CHAR16));
 
 	if (!*PathName) {
-		Print(L"Failed to allocate path buffer\n");
+		console_print(L"Failed to allocate path buffer\n");
 		efi_status = EFI_OUT_OF_RESOURCES;
 		goto error;
 	}
@@ -96,32 +95,30 @@ error:
 EFI_STATUS
 execute(EFI_HANDLE image, CHAR16 *name)
 {
-	EFI_STATUS status;
+	EFI_STATUS efi_status;
 	EFI_HANDLE h;
 	EFI_LOADED_IMAGE *li;
 	EFI_DEVICE_PATH *devpath;
 	CHAR16 *PathName;
 
-	status = uefi_call_wrapper(BS->HandleProtocol, 3, image,
-				   &IMAGE_PROTOCOL, (void **)&li);
-	if (status != EFI_SUCCESS)
-		return status;
+	efi_status = gBS->HandleProtocol(image, &IMAGE_PROTOCOL,
+					 (void **) &li);
+	if (EFI_ERROR(efi_status))
+		return efi_status;
 
-	
-	status = generate_path(name, li, &devpath, &PathName);
-	if (status != EFI_SUCCESS)
-		return status;
+	efi_status = generate_path(name, li, &devpath, &PathName);
+	if (EFI_ERROR(efi_status))
+		return efi_status;
 
-	status = uefi_call_wrapper(BS->LoadImage, 6, FALSE, image,
-				   devpath, NULL, 0, &h);
-	if (status != EFI_SUCCESS)
+	efi_status = gBS->LoadImage(FALSE, image, devpath, NULL, 0, &h);
+	if (EFI_ERROR(efi_status))
 		goto out;
-	
-	status = uefi_call_wrapper(BS->StartImage, 3, h, NULL, NULL);
-	uefi_call_wrapper(BS->UnloadImage, 1, h);
+
+	efi_status = gBS->StartImage(h, NULL, NULL);
+	gBS->UnloadImage(h);
 
  out:
 	FreePool(PathName);
 	FreePool(devpath);
-	return status;
+	return efi_status;
 }