summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-31 17:12:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-09 09:17:16 +0000
commita3617b35e7479fac128276f99dd8ecf5b507fef1 (patch)
treed7e498b03e1f93bcfc2f8a2fa6fc5275b6210ae4
parent10fe06aeb81e90802cfc00bf660f5604d277a095 (diff)
downloadpoky-a3617b35e7479fac128276f99dd8ecf5b507fef1.tar.gz
grub: Further reproducibility fix
Fix the ordering in the generated unidata.c file to aid reproducibility. [YOCTO #14167] (From OE-Core rev: 0071fbd646208357e4f9117a6ce7653a8f30f301) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 6d9c9f7604fd32ef926726a46ae053bbab6ccb4f) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 fac80e7b54..3c1f562c71 100644
--- a/meta/recipes-bsp/grub/files/determinism.patch
+++ b/meta/recipes-bsp/grub/files/determinism.patch
@@ -8,6 +8,9 @@ Also, 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 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. 9missing sorting of the list used to generate it. Add such a sort.
10 10
11Also ensure the generated unidata.c file is deterministic by sorting the
12keys of the dict.
13
11Upstream-Status: Pending 14Upstream-Status: Pending
12Richard Purdie <richard.purdie@linuxfoundation.org> 15Richard Purdie <richard.purdie@linuxfoundation.org>
13 16
@@ -38,3 +41,16 @@ Index: grub-2.04/gentpl.py
38 return ''.join(r) 41 return ''.join(r)
39 42
40 def platform_conditional(platform, closure): 43 def platform_conditional(platform, closure):
44Index: grub-2.04/util/import_unicode.py
45===================================================================
46--- grub-2.04.orig/util/import_unicode.py
47+++ grub-2.04/util/import_unicode.py
48@@ -174,7 +174,7 @@ infile.close ()
49
50 outfile.write ("struct grub_unicode_arabic_shape grub_unicode_arabic_shapes[] = {\n ")
51
52-for x in arabicsubst:
53+for x in sorted(arabicsubst):
54 try:
55 if arabicsubst[x]['join'] == "DUAL":
56 outfile.write ("{0x%x, 0x%x, 0x%x, 0x%x, 0x%x},\n " % (arabicsubst[x][0], arabicsubst[x][1], arabicsubst[x][2], arabicsubst[x][3], arabicsubst[x][4]))