diff options
Diffstat (limited to 'poky/meta/recipes-bsp/grub/files/determinism.patch')
-rw-r--r-- | poky/meta/recipes-bsp/grub/files/determinism.patch | 58 |
1 files changed, 35 insertions, 23 deletions
diff --git a/poky/meta/recipes-bsp/grub/files/determinism.patch b/poky/meta/recipes-bsp/grub/files/determinism.patch index 3c1f562c7..2828e8097 100644 --- a/poky/meta/recipes-bsp/grub/files/determinism.patch +++ b/poky/meta/recipes-bsp/grub/files/determinism.patch @@ -1,6 +1,9 @@ -The output in moddep.lst generated from syminfo.lst using genmoddep.awk is -not deterministic since the order of the dependencies on each line can vary -depending on how awk sorts the values in the array. +From b6f9b3f6fa782807c4a7ec16ee8ef868cdfbf468 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Mon, 15 Mar 2021 14:56:18 +0800 +Subject: [PATCH] The output in moddep.lst generated from syminfo.lst using + genmoddep.awk is not deterministic since the order of the dependencies on + each line can vary depending on how awk sorts the values in the array. Be deterministic in the output by sorting the dependencies on each line. @@ -13,11 +16,29 @@ keys of the dict. Upstream-Status: Pending Richard Purdie <richard.purdie@linuxfoundation.org> +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + gentpl.py | 1 + + grub-core/genmoddep.awk | 4 +++- + util/import_unicode.py | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) -Index: grub-2.04/grub-core/genmoddep.awk -=================================================================== ---- grub-2.04.orig/grub-core/genmoddep.awk -+++ grub-2.04/grub-core/genmoddep.awk +diff --git a/gentpl.py b/gentpl.py +index c86550d4f..589285192 100644 +--- a/gentpl.py ++++ b/gentpl.py +@@ -568,6 +568,7 @@ def foreach_platform_value(defn, platform, suffix, closure): + 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): +diff --git a/grub-core/genmoddep.awk b/grub-core/genmoddep.awk +index 04c2863e5..247436392 100644 +--- a/grub-core/genmoddep.awk ++++ b/grub-core/genmoddep.awk @@ -59,7 +59,9 @@ END { } modlist = "" @@ -29,22 +50,10 @@ 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): -Index: grub-2.04/util/import_unicode.py -=================================================================== ---- grub-2.04.orig/util/import_unicode.py -+++ grub-2.04/util/import_unicode.py +diff --git a/util/import_unicode.py b/util/import_unicode.py +index 08f80591e..1f434a069 100644 +--- a/util/import_unicode.py ++++ b/util/import_unicode.py @@ -174,7 +174,7 @@ infile.close () outfile.write ("struct grub_unicode_arabic_shape grub_unicode_arabic_shapes[] = {\n ") @@ -54,3 +63,6 @@ Index: grub-2.04/util/import_unicode.py try: if arabicsubst[x]['join'] == "DUAL": 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])) +-- +2.17.1 + |