From ca05c0d637910683f861aa3953a68419e6fa02aa Mon Sep 17 00:00:00 2001 From: Paul Wise Date: Wed, 31 Aug 2016 16:08:26 +0800 Subject: Vary the lengths of the two user names Signed-off-by: Mattia Rizzolo --- bin/reproducible_build.sh | 4 ++-- bin/reproducible_common.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 02b70b27..3dde1feb 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -586,7 +586,7 @@ first_build() { local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR) cat > "$TMPCFG" << EOF BUILDUSERID=1111 -export BUILDUSERNAME=pbuilder1 +export BUILDUSERNAME=pbuilderfirst export BUILDUSERGECOS="first user,first room,first work-phone,first home-phone,first other" # pbuilder sets HOME to the value of BUILD_HOME… BUILD_HOME=/nonexistent/first-build @@ -644,7 +644,7 @@ second_build() { esac cat > "$TMPCFG" << EOF BUILDUSERID=2222 -export BUILDUSERNAME=pbuilder2 +export BUILDUSERNAME=pbuildersecond export BUILDUSERGECOS="second user,second room,second work-phone,second home-phone,second other" # pbuilder sets HOME to the value of BUILD_HOME… BUILD_HOME=/nonexistent/second-build diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 11f247a3..276cff6c 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -404,8 +404,8 @@ write_variation_table() { fi if [ "$1" = "debian" ] ; then write_page "env BUILDUSERIDBUILDUSERID=\"1111\"BUILDUSERID=\"2222\"" - write_page "env BUILDUSERNAMEBUILDUSERNAME=\"pbuilder1\"BUILDUSERNAME=\"pbuilder2\"" - write_page "env USERUSER=\"pbuilder1\"USER=\"pbuilder2\"" + write_page "env BUILDUSERNAMEBUILDUSERNAME=\"pbuilderfirst\"BUILDUSERNAME=\"pbuildersecond\"" + write_page "env USERUSER=\"pbuilderfirst\"USER=\"pbuildersecond\"" write_page "env HOMEHOME=\"/nonexistent/first-build\"HOME=\"/nonexistent/second-build\"" write_page "uiduid=1111uid=2222" write_page "gidgid=1111gid=2222" -- cgit v1.2.3-54-g00ecf