From owner-svn-src-all@freebsd.org  Mon Oct 24 01:14:27 2016
Return-Path: <owner-svn-src-all@freebsd.org>
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 ECD07C1F240;
 Mon, 24 Oct 2016 01:14:27 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BE5758AA;
 Mon, 24 Oct 2016 01:14:27 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9O1EQK4058040;
 Mon, 24 Oct 2016 01:14:26 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9O1EQYK058039;
 Mon, 24 Oct 2016 01:14:26 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201610240114.u9O1EQYK058039@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 24 Oct 2016 01:14:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r307835 - stable/11/sys/kern
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Oct 2016 01:14:28 -0000

Author: emaste
Date: Mon Oct 24 01:14:26 2016
New Revision: 307835
URL: https://svnweb.freebsd.org/changeset/base/307835

Log:
  MFC r307522: makesyscalls.sh: remove trailing space on the "created from" line
  
  In r10905 and r10906 makesyscalls was modified to avoid emitting a
  literal $Id$ string in the generated file, with:
  
      gsub("[$]Id: ", "", $0)
      gsub(" [$]", "", $0)
  
  Then r11294 added some functionality and also tried to address the $Id$
  problem in a different way, by removing every $:
  
      sed -e 's/\$//g ...
  
  This rendered the gsub infeffective. The gsub was later updated to
  track the $Id$ -> $FreeBSD$ switch, even though it did not do anything.
  
  Revert the addition of the s/\$//g, and update the gsub to keep the
  resulting format the same.

Modified:
  stable/11/sys/kern/makesyscalls.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/makesyscalls.sh
==============================================================================
--- stable/11/sys/kern/makesyscalls.sh	Mon Oct 24 00:46:38 2016	(r307834)
+++ stable/11/sys/kern/makesyscalls.sh	Mon Oct 24 01:14:26 2016	(r307835)
@@ -65,7 +65,6 @@ if [ -n "$2" ]; then
 fi
 
 sed -e '
-s/\$//g
 :join
 	/\\$/{a\
 
@@ -147,7 +146,7 @@ s/\$//g
 		printf " * $%s$\n", "FreeBSD" > systrace
 	}
 	NR == 1 {
-		gsub("[$]FreeBSD: ", "", $0)
+		gsub("[$]FreeBSD: ", "FreeBSD: ", $0)
 		gsub(" [$]", "", $0)
 
 		printf " * created from%s\n */\n\n", $0 > syssw