svn commit: r347169 - stable/12/sys/conf

[Kyle Evans]

Author: kevans
Date: Mon May  6 02:08:52 2019
New Revision: 347169
URL: https://svnweb.freebsd.org/changeset/base/347169

Log:
  MFC r347021: fdt: Fix installation of aarch64 dtb
  
  r345519 rewrote parts of how we build .dtb, but mistakenly dropped the
  vendor dir for aarch64.  Simply drop the :T for building ${DTB} in the
  aarch64 case- it'll get applied at install-time as-needed, with :H:T for
  determining the vendor dir.

Modified:
  stable/12/sys/conf/dtb.build.mk
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/conf/dtb.build.mk
==============================================================================
--- stable/12/sys/conf/dtb.build.mk	Mon May  6 00:57:05 2019	(r347168)
+++ stable/12/sys/conf/dtb.build.mk	Mon May  6 02:08:52 2019	(r347169)
@@ -24,7 +24,16 @@ SYSDIR=	${_dir:tA}
 .error "can't find kernel source tree"
 .endif
 
-DTB=${DTS:T:R:S/$/.dtb/}
+.for _dts in ${DTS}
+# DTB for aarch64 needs to preserve the immediate parent of the .dts, because
+# these DTS are vendored and should be installed into their vendored directory.
+.if ${MACHINE_ARCH} == "aarch64"
+DTB+=	${_dts:R:S/$/.dtb/}
+.else
+DTB+=	${_dts:T:R:S/$/.dtb/}
+.endif
+.endfor
+
 DTBO=${DTSO:T:R:S/$/.dtbo/}
 
 .SUFFIXES: .dtb .dts .dtbo .dtso