Date: Sun, 19 May 2013 19:15:04 GMT From: Garrett Cooper <yaneurabeya@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: conf/178775: [PATCH] make distributekernel when -DNO_ROOT is not specified is broken Message-ID: <201305191915.r4JJF4RC030983@oldred.FreeBSD.org> Resent-Message-ID: <201305191920.r4JJK09R075636@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305191915.r4JJF4RC030983>