Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Oct 2016 01:22:01 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r307836 - stable/10/sys/kern
Message-ID:  <201610240122.u9O1M1vD059744@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Mon Oct 24 01:22:01 2016
New Revision: 307836
URL: https://svnweb.freebsd.org/changeset/base/307836

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/10/sys/kern/makesyscalls.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/makesyscalls.sh
==============================================================================
--- stable/10/sys/kern/makesyscalls.sh	Mon Oct 24 01:14:26 2016	(r307835)
+++ stable/10/sys/kern/makesyscalls.sh	Mon Oct 24 01:22:01 2016	(r307836)
@@ -62,7 +62,6 @@ if [ -n "$2" ]; then
 fi
 
 sed -e '
-s/\$//g
 :join
 	/\\$/{a\
 
@@ -140,7 +139,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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610240122.u9O1M1vD059744>