From 8df60cf25428207781fda6ad66c06325556a09a0 Mon Sep 17 00:00:00 2001 From: William Blevins Date: Sun, 18 Sep 2016 00:19:52 -0400 Subject: Sorting RPM tarball sources to correct nondeterminism in ordering. --- src/engine/SCons/Tool/packaging/rpm.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/engine/SCons/Tool/packaging/rpm.py b/src/engine/SCons/Tool/packaging/rpm.py index a132555..99124ed 100644 --- a/src/engine/SCons/Tool/packaging/rpm.py +++ b/src/engine/SCons/Tool/packaging/rpm.py @@ -95,6 +95,8 @@ def collectintargz(target, source, env): # find the .spec file for rpm and add it since it is not necessarily found # by the FindSourceFiles function. sources.extend( [s for s in source if str(s).rfind('.spec')!=-1] ) + # sort to keep sources from changing order across builds + sources.sort() # as the source contains the url of the source package this rpm package # is built from, we extract the target name -- cgit v0.12 From 43448eba072c9638416004986a10836df4d70d90 Mon Sep 17 00:00:00 2001 From: William Blevins Date: Sun, 18 Sep 2016 16:20:21 -0400 Subject: Updated CHANGES.TXT. --- src/CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 69fb621..4ae9cb2 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -43,6 +43,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - May find new (previously missed) Dlang dependencies. - May cause rebuild after upgrade due to dependency changes. - Updated Fortran-related tests to pass under GCC 5/6. + - Fixed SCons.Tool.Packaging.rpm.package source nondeterminism across builds. RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700 -- cgit v0.12