d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fdt: Fix installation of aarch64 dtb

Browse Source 
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.

Reported by:	manu
Tested by:	manu
Reviewed by:	manu
MFC after:	3 days
This commit is contained in:
kevans 2019-05-02 16:56:03 +00:00
parent efa57a39e8
commit 67bdbf024d
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/conf/dtb.build.mk
View File

@ -24,7 +24,16 @@ SYSDIR= ${_dir:tA}
.error "can't find kernel source tree" .error "can't find kernel source tree"
.endif .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/} DTBO=${DTSO:T:R:S/$/.dtbo/}
.SUFFIXES: .dtb .dts .dtbo .dtso .SUFFIXES: .dtb .dts .dtbo .dtso