From a46c4a0a1de9fcfb8ed07b4cf934c57960d3df04 Mon Sep 17 00:00:00 2001 From: Steffen Nurpmeso Date: Thu, 1 Mar 2018 19:31:05 +0100 Subject: [PATCH] Do not bake kernel version into binary (Simon McVittie, Paride Legovini).. I wrote to debian-devel@ due to the reproducibility problems (always ok for x86_64, mess with the others), and Simon responded with the absolutely right fact that the kernel version really has no place in the baked in identification. Go for uname(1) -sm instead of -srm. Also clarify that $OSFULLSPEC is not baked into the binary. --- make-config.sh | 5 +++-- make.rc | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/make-config.sh b/make-config.sh index 97794c4a..0ff1e56f 100644 --- a/make-config.sh +++ b/make-config.sh @@ -271,9 +271,10 @@ _os_early_setup_sunos() { os_setup() { # OSENV ends up in *build-osenv* - # OSFULLSPEC is used to recognize changes (i.e., machine type, updates etc.) + # OSFULLSPEC is used to recognize changes (i.e., machine type, updates + # etc.), it is not baked into the binary OS=`echo ${OS} | ${tr} '[A-Z]' '[a-z]'` - [ -n "${OSENV}" ] || OSENV=`uname -srm` + [ -n "${OSENV}" ] || OSENV=`uname -sm` [ -n "${OSFULLSPEC}" ] || OSFULLSPEC=`uname -a` msg 'Operating system is %s' ${OS} diff --git a/make.rc b/make.rc index 27bc9384..6c8ada3c 100644 --- a/make.rc +++ b/make.rc @@ -127,7 +127,9 @@ VAL_MIME_TYPES_SYS=/etc/mime.types # usually needed, but by setting any of the variables to true(1), as in # chown=/usr/bin/true, availability of unneeded programs can be faked. # We require uname(1) -s, echo(1), printf(1) etc. -# uname(1) can be circumvented by setting $OS (and $OSENV, $OSFULLSPEC). +# uname(1) can be circumvented by setting $OS (uname -s), $OSENV (uname +# -sm) and $OSFULLSPEC (uname -a: this is not baked into the binary, it +# is only used to recognize build environment changes). # $OS must be all-lowercase. ## FEATURE SET ## -- 2.11.4.GIT