From 32201ba249861390fae34198eedd787972db09ea Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Wed, 27 Feb 2019 11:50:47 +0100 Subject: Do not store build host name if reproducible builds are wanted. See https://reproducible-builds.org/ for why this is good. This affected scons itself, which differed in the line __buildsys__ = "..." --- SConstruct | 8 ++++++-- src/CHANGES.txt | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 8f7ceaf..760b1c6 100644 --- a/SConstruct +++ b/SConstruct @@ -84,7 +84,10 @@ if not developer: build_system = ARGUMENTS.get('BUILD_SYSTEM') if not build_system: - build_system = socket.gethostname().split('.')[0] + if os.environ.get('SOURCE_DATE_EPOCH'): + build_system = '_reproducible' + else: + build_system = socket.gethostname().split('.')[0] version = ARGUMENTS.get('VERSION', '') if not version: @@ -159,7 +162,8 @@ command_line_variables = [ ("BUILD_SYSTEM=", "The system on which the packages were built. " + "The default is whatever hostname is returned " + - "by socket.gethostname()."), + "by socket.gethostname(). If SOURCE_DATE_EPOCH " + + "env var is set, '_reproducible' is the default."), ("CHECKPOINT=", "The specific checkpoint release being packaged, " + "which will be appended to the VERSION string. " + diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 0d02ec0..39b11f2 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -26,6 +26,9 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Add the textfile tool to the default tool list - Fix syntax on is/is not cluases: should not use with a literal + From Bernhard M. Wiedemann: + - Do not store build host name if reproducible builds are wanted + RELEASE 3.0.4 - Mon, 20 Jan 2019 22:49:27 +0000 -- cgit v0.12