diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
| commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
| tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta/conf/image-uefi.conf | |
| parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
| download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz | |
Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/conf/image-uefi.conf')
| -rw-r--r-- | poky/meta/conf/image-uefi.conf | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/poky/meta/conf/image-uefi.conf b/poky/meta/conf/image-uefi.conf index 882a0e720c..aaeff12ccb 100644 --- a/poky/meta/conf/image-uefi.conf +++ b/poky/meta/conf/image-uefi.conf @@ -8,12 +8,9 @@ EFI_PREFIX ?= "/boot" # Location inside rootfs. EFI_FILES_PATH = "${EFI_PREFIX}${EFIDIR}" -# The EFI name for the architecture -EFI_ARCH ?= "INVALID" -EFI_ARCH_x86 = "ia32" -EFI_ARCH_x86-64 = "x64" -EFI_ARCH_aarch64 = "aa64" -EFI_ARCH_arm = "arm" - # Determine name of bootloader image -EFI_BOOT_IMAGE ?= "boot${EFI_ARCH}.efi" +EFI_BOOT_IMAGE ?= "bootINVALID.efi" +EFI_BOOT_IMAGE_x86-64 = "bootx64.efi" +EFI_BOOT_IMAGE_x86 = "bootia32.efi" +EFI_BOOT_IMAGE_aarch64 = "bootaa64.efi" +EFI_BOOT_IMAGE_arm = "bootarm.efi" |