|
 |
f96e0b |
From 53a8f5760591b14160bc07ef10f083882516ad27 Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Colin Watson <cjwatson@ubuntu.com>
|
|
|
f96e0b |
Date: Wed, 5 Sep 2012 09:00:39 +0100
|
|
|
f96e0b |
Subject: [PATCH 030/482] * util/import_gcry.py: Sort cipher_files, to make
|
|
|
f96e0b |
build system generation more deterministic.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 5 +++++
|
|
|
f96e0b |
util/import_gcry.py | 2 +-
|
|
|
f96e0b |
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index ff982b3..9124825 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,3 +1,8 @@
|
|
|
f96e0b |
+2012-09-05 Colin Watson <cjwatson@ubuntu.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+ * util/import_gcry.py: Sort cipher_files, to make build system
|
|
|
f96e0b |
+ generation more deterministic.
|
|
|
f96e0b |
+
|
|
|
f96e0b |
2012-09-05 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
* grub-core/disk/ieee1275/ofdisk.c (scan): Check function return value.
|
|
|
f96e0b |
diff --git a/util/import_gcry.py b/util/import_gcry.py
|
|
|
f96e0b |
index 18966a6..64c5870 100644
|
|
|
f96e0b |
--- a/util/import_gcry.py
|
|
|
f96e0b |
+++ b/util/import_gcry.py
|
|
|
f96e0b |
@@ -40,7 +40,7 @@ try:
|
|
|
f96e0b |
except:
|
|
|
f96e0b |
print ("WARNING: %s already exists" % cipher_dir_out)
|
|
|
f96e0b |
|
|
|
f96e0b |
-cipher_files = os.listdir (cipher_dir_in)
|
|
|
f96e0b |
+cipher_files = sorted (os.listdir (cipher_dir_in))
|
|
|
f96e0b |
conf = codecs.open (os.path.join ("grub-core", "Makefile.gcry.def"), "w", "utf-8")
|
|
|
f96e0b |
conf.write ("AutoGen definitions Makefile.tpl;\n\n")
|
|
|
f96e0b |
confutil = codecs.open ("Makefile.utilgcry.def", "w", "utf-8")
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|