svn commit: r338247 - head/sys/conf

[Emmanuel Vadot]

Author: manu
Date: Thu Aug 23 13:23:54 2018
New Revision: 338247
URL: https://svnweb.freebsd.org/changeset/base/338247

Log:
  dtb: aarch64 uses vendor subdirectories, handle that

Modified:
  head/sys/conf/dtb.mk

Modified: head/sys/conf/dtb.mk
==============================================================================
--- head/sys/conf/dtb.mk	Thu Aug 23 13:23:21 2018	(r338246)
+++ head/sys/conf/dtb.mk	Thu Aug 23 13:23:54 2018	(r338247)
@@ -84,8 +84,14 @@ _dtbinstall:
 # entries in the NO_ROOT case.
 	test -d ${DESTDIR}${DTBDIR} || ${INSTALL} -d -o ${DTBOWN} -g ${DTBGRP} ${DESTDIR}${DTBDIR}
 .for _dtb in ${DTB}
+.if ${MACHINE_CPUARCH} == "aarch64"
+	test -d ${DESTDIR}${DTBDIR}/${_dtb:H} || ${INSTALL} -d -o ${DTBOWN} -g ${DTBGRP} ${DESTDIR}${DTBDIR}/${_dtb:H}
 	${INSTALL} -o ${DTBOWN} -g ${DTBGRP} -m ${DTBMODE} \
+	    ${_INSTALLFLAGS} ${_dtb:T} ${DESTDIR}${DTBDIR}/${_dtb:H}
+.else
+	${INSTALL} -o ${DTBOWN} -g ${DTBGRP} -m ${DTBMODE} \
 	    ${_INSTALLFLAGS} ${_dtb} ${DESTDIR}${DTBDIR}/
+.endif
 .endfor
 	test -d ${DESTDIR}${DTBODIR} || ${INSTALL} -d -o ${DTBOWN} -g ${DTBGRP} ${DESTDIR}${DTBODIR}
 .for _dtbo in ${DTBO}