Date: Thu, 4 Jun 2015 22:11:40 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r284002 - in stable/10: share/mk sys/conf Message-ID: <201506042211.t54MBeW1050301@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Thu Jun 4 22:11:39 2015 New Revision: 284002 URL: https://svnweb.freebsd.org/changeset/base/284002 Log: MFC: Merge more of the dtb machinery Merge 278459,278460,278461,278462 which define DTBDIR and other things needed for install to work. Although the commit in head kinda fixed install_as_user, it's unknown if that works in 10.x (it didn't the last time I tried). Modified: stable/10/share/mk/bsd.own.mk stable/10/sys/conf/dtb.mk Directory Properties: stable/10/ (props changed) Modified: stable/10/share/mk/bsd.own.mk ============================================================================== --- stable/10/share/mk/bsd.own.mk Thu Jun 4 21:54:46 2015 (r284001) +++ stable/10/share/mk/bsd.own.mk Thu Jun 4 22:11:39 2015 (r284002) @@ -143,6 +143,10 @@ KMODDIR?= /boot/kernel KMODOWN?= ${BINOWN} KMODGRP?= ${BINGRP} KMODMODE?= ${BINMODE} +DTBDIR?= /boot/dtb +DTBOWN?= root +DTBGRP?= wheel +DTBMODE?= 444 LIBDIR?= /usr/lib LIBCOMPATDIR?= /usr/lib/compat @@ -683,7 +687,7 @@ _uid!= id -u USER!= id -un .endif _gid!= id -gn -.for x in BIN CONF DOC INFO KMOD LIB MAN NLS SHARE +.for x in BIN CONF DOC DTB INFO KMOD LIB MAN NLS SHARE $xOWN= ${USER} $xGRP= ${_gid} .endfor Modified: stable/10/sys/conf/dtb.mk ============================================================================== --- stable/10/sys/conf/dtb.mk Thu Jun 4 21:54:46 2015 (r284001) +++ stable/10/sys/conf/dtb.mk Thu Jun 4 22:11:39 2015 (r284002) @@ -45,7 +45,6 @@ SYSDIR= ${_dir} .PATH: ${SYSDIR}/gnu/dts/${MACHINE} ${SYSDIR}/boot/fdt/dts/${MACHINE} -DTBDIR?=/boot/dtb DTB=${DTS:R:S/$/.dtb/} all: ${DTB} @@ -64,6 +63,10 @@ CLEANFILES+=${_dts:R:S/$/.dtb/} realinstall: _dtbinstall .ORDER: beforeinstall _kmodinstall _dtbinstall: +# Need to create this because installkernel doesn't invoke mtree with BSD.root.mtree +# to make sure the tree is setup properly. This may break ownership of ${DTBDIR} +# for no-root build. + mkdir -p ${DESTDIR}${DTBDIR} .for _dtb in ${DTB} ${INSTALL} -o ${DTBOWN} -g ${DTBGRP} -m ${DTBMODE} \ ${_INSTALLFLAGS} ${_dtb} ${DESTDIR}${DTBDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506042211.t54MBeW1050301>