aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2015-02-09 16:21:49 +0000
committerWarner Losh <imp@FreeBSD.org>2015-02-09 16:21:49 +0000
commit9f78f7b262e99b7a8d0a7946b4a0dcbc9256f9ca (patch)
treecbdd2e85cb50e93c46bf9dde69464e7b46716048
parent2cfaebb6818c86ee6a4164663d66fca5d37bf212 (diff)
downloadsrc-9f78f7b262e99b7a8d0a7946b4a0dcbc9256f9ca.tar.gz
src-9f78f7b262e99b7a8d0a7946b4a0dcbc9256f9ca.zip
Move these definitions to bsd.own.mk along side the kernel directory /
user defines. Make this work with WITH_INSTALL_AS_USER as well. Noticed by: ian@
Notes
Notes: svn path=/head/; revision=278462
-rw-r--r--share/mk/bsd.own.mk6
-rw-r--r--sys/conf/dtb.mk4
2 files changed, 5 insertions, 5 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 486914bc19bf..ca77f859705f 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -141,7 +141,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
@@ -164,6 +164,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
diff --git a/sys/conf/dtb.mk b/sys/conf/dtb.mk
index 1ff3eb444b62..ea1baefe99ef 100644
--- a/sys/conf/dtb.mk
+++ b/sys/conf/dtb.mk
@@ -45,10 +45,6 @@ SYSDIR= ${_dir}
.PATH: ${SYSDIR}/gnu/dts/${MACHINE} ${SYSDIR}/boot/fdt/dts/${MACHINE}
-DTBDIR?=/boot/dtb
-DTBOWN?=root
-DTBGRP?=wheel
-DTBMODE?=444
DTB=${DTS:R:S/$/.dtb/}
all: ${DTB}