From owner-svn-src-projects@FreeBSD.ORG Tue Jan 15 21:25:02 2013 Return-Path: Delivered-To: svn-src-projects@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 048A4E33; Tue, 15 Jan 2013 21:25:02 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D2EDB912; Tue, 15 Jan 2013 21:25:01 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0FLP1Ss047025; Tue, 15 Jan 2013 21:25:01 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0FLP1Nv047024; Tue, 15 Jan 2013 21:25:01 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201301152125.r0FLP1Nv047024@svn.freebsd.org> From: Brooks Davis Date: Tue, 15 Jan 2013 21:25:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245474 - projects/mtree X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2013 21:25:02 -0000 Author: brooks Date: Tue Jan 15 21:25:01 2013 New Revision: 245474 URL: http://svnweb.freebsd.org/changeset/base/245474 Log: Document the METALOG variable. Always metalog when when doing an unprivileged install. Add the NO_ROOT variable rather than running id to decide if we should do an unprivileged install. Modified: projects/mtree/Makefile.inc1 Modified: projects/mtree/Makefile.inc1 ============================================================================== --- projects/mtree/Makefile.inc1 Tue Jan 15 20:25:16 2013 (r245473) +++ projects/mtree/Makefile.inc1 Tue Jan 15 21:25:01 2013 (r245474) @@ -4,6 +4,8 @@ # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEAN do not clean at all +# -DDB_FROM_SRC use the user/group databases in src/etc instead of +# the system database when installing. # -DNO_SHARE do not go into share subdir # -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ} # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel @@ -11,10 +13,9 @@ # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel # -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel # -DNO_PORTSUPDATE do not update ports in ${MAKE} update +# -DNO_ROOT install without using root privilege # -DNO_DOCUPDATE do not update doc in ${MAKE} update # -DNO_WWWUPDATE do not update www in ${MAKE} update -# -DDB_FROM_SRC use the user/group databases in src/etc instead of -# the system database when installing. # -DNO_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list # LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target @@ -22,6 +23,8 @@ # to be created before files are installed # LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools # list +# METALOG="path to metadata log" to write permission and ownership +# when NO_ROOT is set # TARGET="machine" to crossbuild world for a different machine type # TARGET_ARCH= may be required when a TARGET supports multiple endians # BUILDENV_SHELL= shell to launch for the buildenv target (def:/bin/sh) @@ -346,14 +349,12 @@ LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDES ${IMAKE_INSTALL} .endif -.if !empty(METALOG) -INSTALLFLAGS= -M ${METALOG} -D ${DESTDIR} -.endif -USER!= id -u -.if ${USER} != 0 -INSTALLFLAGS+= -U -MTREEFLAGS+= -W +.if defined(NO_ROOT) +METALOG?= ${DESTDIR}/${DISTDIR}/METALOG +INSTALLFLAGS= -U -M ${METALOG} -D ${DESTDIR} +MTREEFLAGS= -W .endif + IMAKEENV= ${CROSSENV:N_LDSCRIPTROOT=*} IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 \ ${IMAKE_INSTALL} ${IMAKE_MTREE}