summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2019-05-16 07:03:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-16 16:35:12 +0100
commitf91866aaf13d350431f6ccac3fc941072a4ad80d (patch)
tree1336d91dda4ac4635b0ef6f9172249a3266688e1
parent06abb513ecf33d7e8d1500fcfe13404d9f213e38 (diff)
downloadpoky-f91866aaf13d350431f6ccac3fc941072a4ad80d.tar.gz
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 <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/grub-efi-cfg.bbclass3
-rw-r--r--meta/classes/systemd-boot-cfg.bbclass3
2 files changed, 6 insertions, 0 deletions
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"
27GRUB_ROOT ?= "${ROOT}" 27GRUB_ROOT ?= "${ROOT}"
28APPEND ?= "" 28APPEND ?= ""
29 29
30# Uses MACHINE specific KERNEL_IMAGETYPE
31PACKAGE_ARCH = "${MACHINE_ARCH}"
32
30# Need UUID utility code. 33# Need UUID utility code.
31inherit fs-uuid 34inherit fs-uuid
32 35
diff --git a/meta/classes/systemd-boot-cfg.bbclass b/meta/classes/systemd-boot-cfg.bbclass
index 021c9f9331..b3e0e6ad41 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"
2SYSTEMD_BOOT_ENTRIES ?= "" 2SYSTEMD_BOOT_ENTRIES ?= ""
3SYSTEMD_BOOT_TIMEOUT ?= "10" 3SYSTEMD_BOOT_TIMEOUT ?= "10"
4 4
5# Uses MACHINE specific KERNEL_IMAGETYPE
6PACKAGE_ARCH = "${MACHINE_ARCH}"
7
5# Need UUID utility code. 8# Need UUID utility code.
6inherit fs-uuid 9inherit fs-uuid
7 10