Re: netbsd-RPI_INSTALL.img.gz. Stop

[Harold Gutch <logix%foobar.franken.de@localhost>]

On Wed, Dec 13, 2017 at 10:41:47AM +0100, Harold Gutch wrote:
> Hi,
> 
> On Wed, Dec 13, 2017 at 04:05:05PM +0900, Jun Ebihara wrote:
> > HEAD/201712121800Z/evbarm-earmv6hf.build.failed,
> > 
> > nbmake[1]: nbmake[1]: don't know how to make /home/builds/ab/HEAD/evbarm-earmv6hf/201712121800Z-rlse/evbarm/installation/instkernel/netbsd-RPI_INSTALL.img.gz. Stop
> > 
> > on
> > http://releng.netbsd.org/builds/HEAD/201712121800Z/evbarm-earmv6hf.build.failed
> > 
> > also in 
> > HEAD/201712121800Z/evbarm-arm.build.failed
> > HEAD/201712121800Z/evbarm-earm.build.failed
> > HEAD/201712121800Z/evbarm-earmhf.build.failed
> 
> Can you please try the attached diff?  It seems to fix the build for
> me, but I haven't run a full build from a fresh tree yet.

With that diff my build indeed finished, but it introduced a few
duplicate make targets that luckily were ignored by make but still
should not be there.  This new diff looks better, and also it now
includes the missing .dtb files in the rpi_inst.img image.  Please
apply this *instead* of the first one.

I have not yet verified if a clean build succeeds with it, and neither
if rpi_inst.img works as expected (boots and lets you ssh into a
sysinst).


  Harold

--- src/distrib/evbarm/instkernel/instkernel/Makefile	11 Dec 2017 11:38:14 -0000	1.28
+++ src/distrib/evbarm/instkernel/instkernel/Makefile	13 Dec 2017 12:55:08 -0000
@@ -14,7 +14,7 @@
 .for i in ${BUILD_KERNELS:M*_INSTALL}
 .if ${i} == "RPI_INSTALL" || ${i} == "RPI2_INSTALL"
 MDSETTARGETS+=		${i}	${SSHRAMDISK}	netbsd-${i}
-MDSET_SUFFIXES.${i}=	bin create-bin  img create-img
+MDSET_SUFFIXES.netbsd-${i}=	bin create-bin  img create-img
 .else
 MDSETTARGETS+=		${i}	${RAMDISK}	-
 .endif
--- src/distrib/utils/embedded/conf/rpi_inst.conf	28 Nov 2017 02:56:44 -0000	1.10
+++ src/distrib/utils/embedded/conf/rpi_inst.conf	13 Dec 2017 14:56:34 -0000
@@ -3,7 +3,8 @@
 #
 
 board=rpi_inst
-kernel=$src/sys/arch/evbarm/compile/RPI/netbsd-RPI_INSTALL.bin
+kerneldir=${KERNOBJDIR}/RPI_INSTALL
+kernel=$kerneldir/netbsd-RPI_INSTALL.img
 
 . ${DIR}/conf/evbarm.conf
 
@@ -75,6 +76,7 @@
 
 firmwaredir=$src/external/broadcom/rpi-firmware/dist
 firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
+dtbs="$(${MAKE} -C ${kerneldir} -v DTB)"
 
 populate() {
 	cat > ${mnt}/boot/cmdline.txt << EOF
@@ -110,6 +112,10 @@
 			echo " $f"
 			cp ${firmwaredir}/${f} . || exit 1
 		done
+		for f in ${dtbs}; do
+			echo " $f"
+			cp ${kerneldir}/${f} . || exit 1
+		done
 	) || fail "Copy of firmware to ${mnt}/boot failed"
 
 }