diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-20 14:47:52 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-01 11:55:34 +0000 |
commit | 5e2092323a24fc76cf779e98d2c2ff35e9084df0 (patch) | |
tree | b23a0eb3316ffc197f1b38768a91e051abadb236 /meta | |
parent | 90ac10d25ef87608f76f1af0d3248a4f52d36774 (diff) | |
download | poky-5e2092323a24fc76cf779e98d2c2ff35e9084df0.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: fcb5fbb2e326e48236e03cc0d0540b6b0e7a287e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit cb5e96e05930eaff4d679166416d6c84d6e3236b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-bsp/grub/files/determinism.patch | 16 |
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 | ||
5 | Be deterministic in the output by sorting the dependencies on each line. | 5 | Be deterministic in the output by sorting the dependencies on each line. |
6 | 6 | ||
7 | Also, the output of the SOURCES lines in grub-core/Makefile.core.am, generated | ||
8 | from grub-core/Makefile.core.def with gentpl.py is not deterministic due to | ||
9 | missing sorting of the list used to generate it. Add such a sort. | ||
10 | |||
7 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
8 | Richard Purdie <richard.purdie@linuxfoundation.org> | 12 | Richard 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]++ |
29 | Index: 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): | ||