From owner-freebsd-bugs@FreeBSD.ORG Thu Oct 20 18:50:10 2011 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CE311065670 for ; Thu, 20 Oct 2011 18:50:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 476368FC0C for ; Thu, 20 Oct 2011 18:50:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p9KIoA0i080355 for ; Thu, 20 Oct 2011 18:50:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p9KIoA5v080354; Thu, 20 Oct 2011 18:50:10 GMT (envelope-from gnats) Resent-Date: Thu, 20 Oct 2011 18:50:10 GMT Resent-Message-Id: <201110201850.p9KIoA5v080354@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, David Wolfskill Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DDC89106564A for ; Thu, 20 Oct 2011 18:40:24 +0000 (UTC) (envelope-from david@freebeast.catwhisker.org) Received: from freebeast.catwhisker.org (m209-73.dsl.rawbw.com [198.144.209.73]) by mx1.freebsd.org (Postfix) with ESMTP id A148A8FC14 for ; Thu, 20 Oct 2011 18:40:24 +0000 (UTC) Received: from freebeast.catwhisker.org (localhost [127.0.0.1]) by freebeast.catwhisker.org (8.14.5/8.14.5) with ESMTP id p9KCgukJ002453; Thu, 20 Oct 2011 05:42:56 -0700 (PDT) (envelope-from david@freebeast.catwhisker.org) Received: (from david@localhost) by freebeast.catwhisker.org (8.14.5/8.14.5/Submit) id p9KCgi9D002452; Thu, 20 Oct 2011 05:42:44 -0700 (PDT) (envelope-from david) Message-Id: <201110201242.p9KCgi9D002452@freebeast.catwhisker.org> Date: Thu, 20 Oct 2011 05:42:44 -0700 (PDT) From: David Wolfskill To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: conf/161843: SVN-detection in sys/conf/newvers.sh fails with subversion-1.7 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: David Wolfskill List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Oct 2011 18:50:10 -0000 >Number: 161843 >Category: conf >Synopsis: SVN-detection in sys/conf/newvers.sh fails with subversion-1.7 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Oct 20 18:50:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: David Wolfskill >Release: FreeBSD 10.0-CURRENT i386 >Organization: Wolfkill & owling Residence >Environment: System: FreeBSD freebeast.catwhisker.org 10.0-CURRENT FreeBSD 10.0-CURRENT #626 r226563M: Thu Oct 20 05:04:03 PDT 2011 root@freebeast.catwhisker.org:/usr/obj/usr/src/sys/GENERIC i386 >Description: Stock version of sys/conf/newvers.sh looks for ${SYSDIR}/.svn to determine if ${SYSDIR} is likely to be a subversion working copy. This is fine for subsversion-1.6 (and earlier), but as of 1.7, the only .svn subdirectory in the working copy is at the root of the working copy. As a result, if subversion-1.7 is in use, newvers.sh fails to detect that ${SYSDIR} could be a subversion working copy, and therefore fails to try to invoke svnversion, so the SVN GRN doesn't get placed in the uname output -- rather than the above, it looks more like: FreeBSD freebeast.catwhisker.org 10.0-CURRENT FreeBSD 10.0-CURRENT #625: Wed Oct 19 05:22:52 PDT 2011 root@freebeast.catwhisker.org:/usr/obj/usr/src/sys/GENERIC i386 >How-To-Repeat: Upgrade to or install the 1.7 version of the devel/subversion port, ensure that /usr/src is a subversion working copy suitable for use with subversion-1.7 (and that kernel sources have been modified), then rebuild the kernel. After rebooting, examine the output of "uname -a". >Fix: Index: sys/conf/newvers.sh =================================================================== --- sys/conf/newvers.sh (revision 226563) +++ sys/conf/newvers.sh (working copy) @@ -88,7 +88,7 @@ i=`${MAKE:-make} -V KERN_IDENT` for dir in /bin /usr/bin /usr/local/bin; do - if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then + if [ -d "${SYSDIR}/../.svn" -a -x "${dir}/svnversion" ] ; then svnversion=${dir}/svnversion break fi [Note: I have tested the above; that's how the original "uname" output (at the top of the PR) was created; note that it shows the GRN.] >Release-Note: >Audit-Trail: >Unformatted: