Date: Tue, 03 Sep 2019 14:08:20 -0000 From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346618 - head/sys/conf Message-ID: <201904240111.x3O1BoRc054914@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Wed Apr 24 01:11:50 2019 New Revision: 346618 URL: https://svnweb.freebsd.org/changeset/base/346618 Log: fdt: stop installing FDT_DTS_FILE r346307 inadvertently started installing FDT_DTS_FILE along with the kernel. While this isn't necessarily bad, it was not intended or discussed and it actively breaks some current setups that don't anticipate any .dtb being installed when it's using static fdt. This change could be reconsidered down the line, but it needs to be done with prior discussion. Fix it by pushing FDT_DTS_FILE build down into the raw dtb.build.mk bits. This technically allows modules building DTS to accidentally specify an FDT_DTS_FILE that gets built but isn't otherwise useful (since it's not installed), but I suspect this isn't a big deal and would get caught with any kind of testing -- and perhaps this might end up useful in some other way, for example by some module wanting to embed fdt in some other way than our current/normal mechanism. Reported by: Mori Hiroki <yamori813@yahoo.co.jp> MFC after: 3 days X-MFC-With: r346307 Modified: head/sys/conf/dtb.build.mk head/sys/conf/kern.post.mk Modified: head/sys/conf/dtb.build.mk ============================================================================== --- head/sys/conf/dtb.build.mk Wed Apr 24 00:23:06 2019 (r346617) +++ head/sys/conf/dtb.build.mk Wed Apr 24 01:11:50 2019 (r346618) @@ -43,7 +43,7 @@ DTBO=${DTSO:T:R:S/$/.dtbo/} # Add dependencies on the source file so that out-of-tree things can be included # without any .PATH additions. -.for _dts in ${DTS} +.for _dts in ${DTS} ${FDT_DTS_FILE} ${_dts:R:T}.dtb: ${_dts} .endfor Modified: head/sys/conf/kern.post.mk ============================================================================== --- head/sys/conf/kern.post.mk Wed Apr 24 00:23:06 2019 (r346617) +++ head/sys/conf/kern.post.mk Wed Apr 24 01:11:50 2019 (r346618) @@ -8,10 +8,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. -.if !empty(FDT_DTS_FILE) -DTS+= ${FDT_DTS_FILE} -.endif -.if defined(DTS) || defined(DTSO) +.if defined(DTS) || defined(DTSO) || defined(FDT_DTS_FILE) .include "dtb.build.mk" KERNEL_EXTRA+= ${DTB} ${DTBO}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904240111.x3O1BoRc054914>