From f91866aaf13d350431f6ccac3fc941072a4ad80d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 16 May 2019 07:03:34 +0000 Subject: grub-efi-cfg, systemd-boot-cfg: use MACHINE_ARCH * both use KERNEL_IMAGETYPE variable which is MACHINE specific * fixes: === Comparing signatures for task do_configure.sigdata between hammerhead and mako === ERROR: grub-bootconf different signature for task do_configure.sigdata between hammerhead and mako basehash changed from 710332f3ec15670302dd690708730c9e418d53790ce36d6a91b049ae4f7069b1 to c9a46e58b4634b5fd47d20683f8320e15f5c4cb7628e3a62ed97d8528d7aabd2 Variable KERNEL_IMAGETYPE value changed from 'zImage-dtb' to 'zImage' ERROR: systemd-bootconf different signature for task do_configure.sigdata between hammerhead and mako basehash changed from 2abbaf6d7760696fbf1ff5df5705239b475ccbf6f0c831fc4031984c0ce0e9f2 to 24f1e7886dee02b04bc180acc1c946ad82ce842655e5a5f4a8006f4a8490f985 Variable KERNEL_IMAGETYPE value changed from 'zImage-dtb' to 'zImage' detected with: openembedded-core/scripts/sstate-diff-machines.sh --targets=world --tmpdir=tmp-glibc/ --analyze --machines="hammerhead mako qemux86" (From OE-Core rev: 90a47da8c50da49ecaf0e2786dc4d9a78c61189e) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/classes/grub-efi-cfg.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/classes/grub-efi-cfg.bbclass') diff --git a/meta/classes/grub-efi-cfg.bbclass b/meta/classes/grub-efi-cfg.bbclass index 5eeee6c2e3..f661a69f83 100644 --- a/meta/classes/grub-efi-cfg.bbclass +++ b/meta/classes/grub-efi-cfg.bbclass @@ -27,6 +27,9 @@ EFIDIR = "/EFI/BOOT" GRUB_ROOT ?= "${ROOT}" APPEND ?= "" +# Uses MACHINE specific KERNEL_IMAGETYPE +PACKAGE_ARCH = "${MACHINE_ARCH}" + # Need UUID utility code. inherit fs-uuid -- cgit v1.2.3-54-g00ecf