From owner-svn-src-all@freebsd.org Thu Dec 15 12:59:45 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B8470C8163B for ; Thu, 15 Dec 2016 12:59:45 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: from mail-wj0-x22f.google.com (mail-wj0-x22f.google.com [IPv6:2a00:1450:400c:c01::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4A95F1CCE for ; Thu, 15 Dec 2016 12:59:45 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: by mail-wj0-x22f.google.com with SMTP id xy5so63744026wjc.0 for ; Thu, 15 Dec 2016 04:59:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=multiplay-co-uk.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to; bh=KY+xC2ajXpJ+tQBLgqZfEVBgzFCTlHzZYu4mgwqpv3U=; b=yzwKOIQBn8M3bcdrciUedcEmmRa9K7bwzQ8PKgs8ZbXRtAh1ZBbi2V7oQmgMOIDylk a/qBNbWauC01RbWpyjJEjz5iE8S7EArTq77Jo+LePPTKoMyQPbn3wPg2LxMMm0gkd8xK VNMYOySef4H3SaxL35s5UX6a0aL3YNPAkdxP6ehWSsvXh2xxaxp99A0wXq7l6hWXIh91 r+LYtqRrddIF+TuxVAvMLvItNp6l35JEpOLwraU9XIYPM9ftcUBK95Z6vF7nOmQzlpZV K3rNGOYnY0Psgl/4IFy9UZdoqihsnzyJIFZL6jx1VJDAJfbqdZE+ZcK255dszraPjK3l 0JTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to; bh=KY+xC2ajXpJ+tQBLgqZfEVBgzFCTlHzZYu4mgwqpv3U=; b=BjADTiUzsL0XQ7WIM1PZr14jVhoS15/R5I8nB80f8Dc1aj0AJLq4gsWlUxsT4Hqqe6 fDGV2xKJdj+BPltV7e+vOe6LQhDjz4jp/3Yfp5FTgkAO6fRaKNMfHQjDw8LPPbQvZkBY HTeON2TQk9KXmRRaJXuksNOUFpy1gu0TGz+3TBJDMQYYr5e7dtFukJFoKZyZh5kJu90M gmaglhuPaNtUaRlEEH5mIqjBjWqxHUk6HGHbKaBuuV0LtI7Lu827vuzf4CBuTmCTUov5 x+8v7aKzDxvTpS3nIsBhFNch6A3GwA90LBI+r3x69nTQGKaLMTaSSjyzIts22E+PVc7m 6ZVw== X-Gm-Message-State: AKaTC0168nRMOAp9gg5nH5EcMMMk/4PITsP9y5y/uxzOdhGXpsjcqvfdRlcokVN3NfP0+spd X-Received: by 10.194.88.3 with SMTP id bc3mr1242233wjb.143.1481806783601; Thu, 15 Dec 2016 04:59:43 -0800 (PST) Received: from [10.10.1.58] ([185.97.61.26]) by smtp.gmail.com with ESMTPSA id 6sm1973642wjt.5.2016.12.15.04.59.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2016 04:59:42 -0800 (PST) Subject: Re: svn commit: r310112 - head/sys/conf To: Ed Maste , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201612151257.uBFCv3ih001961@repo.freebsd.org> From: Steven Hartland Message-ID: Date: Thu, 15 Dec 2016 12:57:10 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <201612151257.uBFCv3ih001961@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Dec 2016 12:59:45 -0000 Thanks for doing this :) On 15/12/2016 12:57, Ed Maste wrote: > Author: emaste > Date: Thu Dec 15 12:57:03 2016 > New Revision: 310112 > URL: https://svnweb.freebsd.org/changeset/base/310112 > > Log: > newvers.sh: add option to eliminate kernel build metadata > > Build metadata (username, hostname, etc.) prevents the FreeBSD kernel > from building reproducibly. Add an option to disable inclusion of that > metadata but retain the release information and SVN/git VCS details. > See https://reproducible-builds.org/ for additional background. > > Reviewed by: bapt > Obtained from: NetBSD > MFC after: 1 month > Sponsored by: Reproducible Builds World Summit 2, Berlin > Differential Revision: https://reviews.freebsd.org/D4347 > > Modified: > head/sys/conf/newvers.sh > > Modified: head/sys/conf/newvers.sh > ============================================================================== > --- head/sys/conf/newvers.sh Thu Dec 15 10:51:35 2016 (r310111) > +++ head/sys/conf/newvers.sh Thu Dec 15 12:57:03 2016 (r310112) > @@ -30,6 +30,14 @@ > # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 > # $FreeBSD$ > > +# Command line options: > +# > +# -r Reproducible build. Do not embed directory names, user > +# names, time stamps or other dynamic information into > +# the outuput file. This is intended to allow two builds > +# done at different times and even by different people on > +# different hosts to produce identical output. > + > TYPE="FreeBSD" > REVISION="12.0" > BRANCH="CURRENT" > @@ -250,10 +258,28 @@ if [ -n "$hg_cmd" ] ; then > fi > fi > > +include_metadata=true > +while getopts r opt; do > + case "$opt" in > + r) > + include_metadata= > + ;; > + esac > +done > +shift $((OPTIND - 1)) > + > +if [ -z "${include_metadata}" ]; then > + VERINFO="${VERSION} ${svn}${git}${hg}${p4version}" > + VERSTR="${VERINFO}\\n" > +else > + VERINFO="${VERSION} #${v}${svn}${git}${hg}${p4version}: ${t}" > + VERSTR="${VERINFO}\\n ${u}@${h}:${d}\\n" > +fi > + > cat << EOF > vers.c > $COPYRIGHT > -#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${hg}${p4version}: ${t}" > -#define VERSTR "${VERSION} #${v}${svn}${git}${hg}${p4version}: ${t}\\n ${u}@${h}:${d}\\n" > +#define SCCSSTR "@(#)${VERINFO}" > +#define VERSTR "${VERSTR}" > #define RELSTR "${RELEASE}" > > char sccs[sizeof(SCCSSTR) > 128 ? sizeof(SCCSSTR) : 128] = SCCSSTR; >