From: Richard Purdie Date: Sun, 20 Dec 2020 14:47:52 +0000 (+0000) Subject: grub: Add second fix for determinism issue X-Git-Tag: 2020-10.2~148 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5d758a1568e5bd03fc55885d1a26de34aee7ebbd;p=openembedded-core.git grub: Add second fix for determinism issue There is a second list sorting problem in a generator script within grub, add a sort() of a list to resolve this. Signed-off-by: Richard Purdie (cherry picked from commit cb5e96e05930eaff4d679166416d6c84d6e3236b) Signed-off-by: Anuj Mittal --- diff --git a/meta/recipes-bsp/grub/files/determinism.patch b/meta/recipes-bsp/grub/files/determinism.patch index c4b1d3a2a8..fac80e7b54 100644 --- a/meta/recipes-bsp/grub/files/determinism.patch +++ b/meta/recipes-bsp/grub/files/determinism.patch @@ -4,6 +4,10 @@ depending on how awk sorts the values in the array. Be deterministic in the output by sorting the dependencies on each line. +Also, the output of the SOURCES lines in grub-core/Makefile.core.am, generated +from grub-core/Makefile.core.def with gentpl.py is not deterministic due to +missing sorting of the list used to generate it. Add such a sort. + Upstream-Status: Pending Richard Purdie @@ -22,3 +26,15 @@ Index: grub-2.04/grub-core/genmoddep.awk modlist = modlist " " depmod; inverse_dependencies[depmod] = inverse_dependencies[depmod] " " mod depcount[mod]++ +Index: grub-2.04/gentpl.py +=================================================================== +--- grub-2.04.orig/gentpl.py ++++ grub-2.04/gentpl.py +@@ -568,6 +568,7 @@ def foreach_platform_value(defn, platfor + for group in RMAP[platform]: + for value in defn.find_all(group + suffix): + r.append(closure(value)) ++ r.sort() + return ''.join(r) + + def platform_conditional(platform, closure):