From owner-p4-projects@FreeBSD.ORG  Sat Mar  7 19:22:31 2015
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id F36AA7FC; Sat,  7 Mar 2015 19:22:30 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B42487F9
 for <perforce@freebsd.org>; Sat,  7 Mar 2015 19:22:30 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 852169F9
 for <perforce@freebsd.org>; Sat,  7 Mar 2015 19:22:30 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id t27JMUQi097050
 for <perforce@freebsd.org>; Sat, 7 Mar 2015 19:22:30 GMT
 (envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id t27JMUNh097047
 for perforce@freebsd.org; Sat, 7 Mar 2015 19:22:30 GMT
 (envelope-from jmg@freebsd.org)
Date: Sat, 7 Mar 2015 19:22:30 GMT
Message-Id: <201503071922.t27JMUNh097047@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
Subject: PERFORCE change 1206968 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Mar 2015 19:22:31 -0000

http://p4web.freebsd.org/@@1206968?ac=10

Change 1206968 by jmg@jmg_carbon2 on 2015/03/07 19:21:50

	add code to support NO_ROOT kernel installs...

Affected files ...

.. //depot/projects/pciehotplug/sys/conf/kern.post.mk#2 edit

Differences ...

==== //depot/projects/pciehotplug/sys/conf/kern.post.mk#2 (text+ko) ====

@@ -23,6 +23,11 @@
 MKMODULESENV+=	WITH_CTF="${WITH_CTF}"
 .endif
 
+.if defined(NO_ROOT)
+METALOG?=	${DESTDIR}/${DISTDIR}/METALOG
+INSTALLFLAGS+=	-U -M ${METALOG} -D ${DESTDIR}
+.endif
+
 .MAIN: all
 
 .for target in all clean cleandepend cleandir clobber depend install \
@@ -32,6 +37,7 @@
 ${target}: modules-${target}
 modules-${target}:
 	cd $S/modules; ${MKMODULESENV} ${MAKE} \
+	    INSTALLFLAGS="${INSTALLFLAGS}" \
 	    ${target:S/^reinstall$/install/:S/^clobber$/cleandir/}
 .endif
 .endfor
@@ -262,21 +268,21 @@
 	fi
 .endif
 	mkdir -p ${DESTDIR}${KODIR}
-	${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}
+	${INSTALL} ${INSTALLFLAGS} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}
 .if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no"
-	${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
+	${INSTALL} ${INSTALLFLAGS} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
 .endif
 .if defined(KERNEL_EXTRA_INSTALL)
-	${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}
+	${INSTALL} ${INSTALLFLAGS} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}
 .endif
 
 
 
 kernel-reinstall:
 	@-chflags -R noschg ${DESTDIR}${KODIR}
-	${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}
+	${INSTALL} ${INSTALLFLAGS} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}
 .if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no"
-	${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
+	${INSTALL} ${INSTALLFLAGS} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
 .endif
 
 config.o env.o hints.o vers.o vnode_if.o: