diff options
| author | imp <imp@FreeBSD.org> | 2015-06-04 22:11:39 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2015-06-04 22:11:39 +0000 |
| commit | f94880e39491689664d40b39e8807585937048e2 (patch) | |
| tree | 5312059094676a4e9df33e2cc8424b68fb4dace2 | |
| parent | ceb5f63b1a6fbd04f737f76f4c8ee02749473811 (diff) | |
| download | FreeBSD-src-f94880e39491689664d40b39e8807585937048e2.zip FreeBSD-src-f94880e39491689664d40b39e8807585937048e2.tar.gz | |
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).
| -rw-r--r-- | share/mk/bsd.own.mk | 6 | ||||
| -rw-r--r-- | sys/conf/dtb.mk | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 0ca3af1..b06b1d4 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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 diff --git a/sys/conf/dtb.mk b/sys/conf/dtb.mk index 9822f46..2f864f0 100644 --- a/sys/conf/dtb.mk +++ b/sys/conf/dtb.mk @@ -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} |
