From owner-freebsd-bugs@FreeBSD.ORG Sun May 19 19:20:00 2013 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.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 7A546734 for ; Sun, 19 May 2013 19:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 5DB13658 for ; Sun, 19 May 2013 19:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r4JJK0Uk075637 for ; Sun, 19 May 2013 19:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r4JJK09R075636; Sun, 19 May 2013 19:20:00 GMT (envelope-from gnats) Resent-Date: Sun, 19 May 2013 19:20:00 GMT Resent-Message-Id: <201305191920.r4JJK09R075636@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, Garrett Cooper 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 ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: conf/178775: [PATCH] make distributekernel when -DNO_ROOT is not specified is broken X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 May 2013 19:20:00 -0000 >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: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun May 19 19:20:00 UTC 2013 >Closed-Date: >Last-Modified: >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 Date: Sun, 19 May 2013 12:10:02 -0700 Subject: [PATCH] Fix distributekernel when NO_ROOT is not defined Signed-off-by: Garrett Cooper --- 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: >Unformatted: