[oe-commits] [openembedded-core] 04/07: grub-efi-cfg, systemd-boot-cfg: use MACHINE_ARCH

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 90a47da8c50da49ecaf0e2786dc4d9a78c61189e
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Thu May 16 07:03:34 2019 +0000

    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"
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/grub-efi-cfg.bbclass     | 3 +++
 meta/classes/systemd-boot-cfg.bbclass | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/meta/classes/grub-efi-cfg.bbclass b/meta/classes/grub-efi-cfg.bbclass
index 5eeee6c..f661a69 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
 
diff --git a/meta/classes/systemd-boot-cfg.bbclass b/meta/classes/systemd-boot-cfg.bbclass
index 021c9f9..b3e0e6a 100644
--- a/meta/classes/systemd-boot-cfg.bbclass
+++ b/meta/classes/systemd-boot-cfg.bbclass
@@ -2,6 +2,9 @@ SYSTEMD_BOOT_CFG ?= "${S}/loader.conf"
 SYSTEMD_BOOT_ENTRIES ?= ""
 SYSTEMD_BOOT_TIMEOUT ?= "10"
 
+# Uses MACHINE specific KERNEL_IMAGETYPE
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 # Need UUID utility code.
 inherit fs-uuid
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.