summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-20 14:47:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-21 22:29:57 +0000
commit36422d0641aab1ba93b1b82963e4f96e331ef1b4 (patch)
tree0ad88de76c58536d8a324dc190d312c34049e42d /meta/recipes-bsp
parent36a9cee2054c900d14102cdc19e827b75c9f7213 (diff)
downloadpoky-36422d0641aab1ba93b1b82963e4f96e331ef1b4.tar.gz
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. (From OE-Core rev: cb5e96e05930eaff4d679166416d6c84d6e3236b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/grub/files/determinism.patch16
1 files changed, 16 insertions, 0 deletions
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.
4 4
5Be deterministic in the output by sorting the dependencies on each line. 5Be deterministic in the output by sorting the dependencies on each line.
6 6
7Also, the output of the SOURCES lines in grub-core/Makefile.core.am, generated
8from grub-core/Makefile.core.def with gentpl.py is not deterministic due to
9missing sorting of the list used to generate it. Add such a sort.
10
7Upstream-Status: Pending 11Upstream-Status: Pending
8Richard Purdie <richard.purdie@linuxfoundation.org> 12Richard Purdie <richard.purdie@linuxfoundation.org>
9 13
@@ -22,3 +26,15 @@ Index: grub-2.04/grub-core/genmoddep.awk
22 modlist = modlist " " depmod; 26 modlist = modlist " " depmod;
23 inverse_dependencies[depmod] = inverse_dependencies[depmod] " " mod 27 inverse_dependencies[depmod] = inverse_dependencies[depmod] " " mod
24 depcount[mod]++ 28 depcount[mod]++
29Index: grub-2.04/gentpl.py
30===================================================================
31--- grub-2.04.orig/gentpl.py
32+++ grub-2.04/gentpl.py
33@@ -568,6 +568,7 @@ def foreach_platform_value(defn, platfor
34 for group in RMAP[platform]:
35 for value in defn.find_all(group + suffix):
36 r.append(closure(value))
37+ r.sort()
38 return ''.join(r)
39
40 def platform_conditional(platform, closure):