From nobody@FreeBSD.org  Sun May 19 19:15:04 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 7A1A6399
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 19 May 2013 19:15:04 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.FreeBSD.org (oldred.freebsd.org [8.8.178.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C76361D
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 19 May 2013 19:15:04 +0000 (UTC)
Received: from oldred.FreeBSD.org ([127.0.1.6])
	by oldred.FreeBSD.org (8.14.5/8.14.5) with ESMTP id r4JJF4Wh030985
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 19 May 2013 19:15:04 GMT
	(envelope-from nobody@oldred.FreeBSD.org)
Received: (from nobody@localhost)
	by oldred.FreeBSD.org (8.14.5/8.14.5/Submit) id r4JJF4RC030983;
	Sun, 19 May 2013 19:15:04 GMT
	(envelope-from nobody)
Message-Id: <201305191915.r4JJF4RC030983@oldred.FreeBSD.org>
Date: Sun, 19 May 2013 19:15:04 GMT
From: Garrett Cooper <yaneurabeya@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] make distributekernel when -DNO_ROOT is not specified is broken
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         178775
>Category:       conf
>Synopsis:       [PATCH] make distributekernel when -DNO_ROOT is not specified is broken
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 19 19:20:00 UTC 2013
>Closed-Date:    Mon May 20 21:17:14 UTC 2013
>Last-Modified:  Mon May 20 21:20:01 UTC 2013
>Originator:     Garrett Cooper
>Release:        10-CURRENT
>Organization:
EMC Isilon
>Environment:
FreeBSD fuji-current.local 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r+4f99885-dirty: Thu May 16 15:52:49 PDT 2013     root@fuji-current.local:/usr/obj/usr/src/sys/FUJI-NOCOMPAT  i386
>Description:
make distributekernel fails today with the following message if -DNO_ROOT is specified:

sed -e 's|^./kernel|.|' //usr/obj/usr/src/release/dist/kernel.premeta >  //usr/obj/usr/src/release/dist/kernel.meta
sed: //usr/obj/usr/src/release/dist/kernel.premeta: No such file or directory

The attached patch adds the needed guard for distributekernel to pass.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

From 25179851a175ff81ea6e3147286da11c2c1519ad Mon Sep 17 00:00:00 2001
From: Garrett Cooper <yanegomi@gmail.com>
Date: Sun, 19 May 2013 12:10:02 -0700
Subject: [PATCH] Fix distributekernel when NO_ROOT is not defined

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
---
 Makefile.inc1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 6a18156..296d725 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1051,8 +1051,10 @@ distributekernel distributekernel.debug:
 	    ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
 	    DESTDIR=${INSTALL_DDIR:S://:/:g:C:/$::}/kernel \
 	    ${.TARGET:S/distributekernel/install/}
+.if defined(NO_ROOT)
 	sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.meta
+.endif
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
 .if defined(NO_ROOT)
 	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
-- 
1.8.2.3



>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: brooks 
State-Changed-When: Mon May 20 21:16:56 UTC 2013 
State-Changed-Why:  
Committed.  Thanks for catching this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178775 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/178775: commit references a PR
Date: Mon, 20 May 2013 21:16:51 +0000 (UTC)

 Author: brooks
 Date: Mon May 20 21:16:38 2013
 New Revision: 250832
 URL: http://svnweb.freebsd.org/changeset/base/250832
 
 Log:
   Fix distributekernel in the non NO_ROOT case.
   
   PR:		conf/178775
   Submitted by:	Garrett Cooper <yaneurabeya@gmail.com>
 
 Modified:
   head/Makefile.inc1
 
 Modified: head/Makefile.inc1
 ==============================================================================
 --- head/Makefile.inc1	Mon May 20 20:47:40 2013	(r250831)
 +++ head/Makefile.inc1	Mon May 20 21:16:38 2013	(r250832)
 @@ -1032,8 +1032,10 @@ distributekernel distributekernel.debug:
  	    ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
  	    DESTDIR=${INSTALL_DDIR:S://:/:g:C:/$::}/kernel \
  	    ${.TARGET:S/distributekernel/install/}
 +.if defined(NO_ROOT)
  	sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
  	    ${DESTDIR}/${DISTDIR}/kernel.meta
 +.endif
  .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
  .if defined(NO_ROOT)
  	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
