diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-31 17:12:27 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-12 14:25:13 +0000 |
commit | 85167b3594c978e61da11fe3511cd8014a1a7224 (patch) | |
tree | 3c3cad24645fbf63ebaf0bc8362f67dc72cb0ad0 /meta/recipes-bsp | |
parent | c78be2d8f8d2714a5a542af61a6cbade927ec07c (diff) | |
download | poky-85167b3594c978e61da11fe3511cd8014a1a7224.tar.gz |
grub: Further reproducibility fix
Fix the ordering in the generated unidata.c file to aid reproducibility.
[YOCTO #14167]
(From OE-Core rev: c0f96eadf9a85c911ba551d619c32794bb620dde)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 6d9c9f7604fd32ef926726a46ae053bbab6ccb4f)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-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 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 | |||
8 | from grub-core/Makefile.core.def with gentpl.py is not deterministic due to | 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. | 9 | missing sorting of the list used to generate it. Add such a sort. |
10 | 10 | ||
11 | Also ensure the generated unidata.c file is deterministic by sorting the | ||
12 | keys of the dict. | ||
13 | |||
11 | Upstream-Status: Pending | 14 | Upstream-Status: Pending |
12 | Richard Purdie <richard.purdie@linuxfoundation.org> | 15 | Richard 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): |
44 | Index: 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])) | ||