From owner-freebsd-stable  Thu Oct  2 14:03:14 1997
Return-Path: <owner-freebsd-stable>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id OAA22879
          for stable-outgoing; Thu, 2 Oct 1997 14:03:14 -0700 (PDT)
Received: from hetzels (171-158-235.ipt.aol.com [152.171.158.235])
          by hub.freebsd.org (8.8.7/8.8.7) with SMTP id OAA22863;
          Thu, 2 Oct 1997 14:03:03 -0700 (PDT)
From: "Scot W. Hetzel" <hetzels@aol.com>
To: "Stable" <stable@FreeBSD.ORG>, "Current" <current@FreeBSD.ORG>
Subject: CTM patch level added to newvers.sh
Date: Thu, 2 Oct 1997 15:07:13 -0500
Message-ID: <01bccf6e$c649aa80$0400000a@hetzels>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 4.71.1712.3
X-MimeOLE: Produced By Microsoft MimeOLE V4.71.1712.3
Sender: owner-freebsd-stable@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

I am currently tracking 2.2-STABLE and use the following patch to newvers.sh
to have my kernel indicate what CTM patch was used to create it.

example:

Copyright (c) 1992-1997 FreeBSD Inc.
Copyright (c) 1982, 1986, 1989, 1991, 1993
        The Regents of the University of California.  All rights reserved.
FreeBSD 2.2-STABLE (0448) #0: Fri Sep 26 21:16:21 CDT 1997

                                  ^^^^^^^

Last CTM update applied 0448.

The CTM value will only be shown if the user is using STABLE or CURRENT and
has the .ctm_status file in the src directory.

Could the attched patch be applied to the src tree for both CURRENT's and
STABLE's newvers.sh?

Also, is there a better way of locating the .ctm_status file (look at
variable S1)?

Thanks,

Scot

------cut here----
*** /sys/conf/newvers.sh.orig Thu Jun  5 18:01:42 1997
--- /sys/conf/newvers.sh Thu Oct  2 14:55:05 1997
***************
*** 39,47 ****
--- 39,62 ----
  BRANCH="STABLE"
  RELEASE="${REVISION}-${BRANCH}"
  SNAPDATE=""
+
+ #Location of .ctm_status file
+ S1="../../.."
+ CTM_STATUS="${S1}/.ctm_status"
+
  if [ "X${SNAPDATE}" != "X" ]; then
   RELEASE="${RELEASE}-${SNAPDATE}"
  fi
+
+ #Add CTM patch level for the STABLE or CURRENT Branches
+ #Only if we are using CTM (.ctm_status exists in the source directory)
+ if [ "${BRANCH}" = "STABLE" ] || [ "${BRANCH}" = "CURRENT" ]; then
+  if [ -f ${CTM_STATUS} ]; then
+   sCTM=`awk '{ printf "%04d", $2 }' ${CTM_STATUS}`
+   RELEASE="${RELEASE} (${sCTM})"
+  fi
+ fi
+
  VERSION="${TYPE} ${RELEASE}"

  RELDATE="222001"
------cut here----