Wed Jul 10 20:25:21 2013 UTC ()
If using mdsetimage to install a ramdisk install, add the ramdisk to SYSTEM_DEP
so the kernel will be relinked and the new ramdisk installed.


(matt)
diff -r1.24 -r1.25 src/sys/arch/evbarm/conf/Makefile.evbarm.inc

cvs diff -r1.24 -r1.25 src/sys/arch/evbarm/conf/Makefile.evbarm.inc (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/Makefile.evbarm.inc 2013/06/28 05:59:38 1.24
+++ src/sys/arch/evbarm/conf/Makefile.evbarm.inc 2013/07/10 20:25:21 1.25
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile.evbarm.inc,v 1.24 2013/06/28 05:59:38 matt Exp $ 1# $NetBSD: Makefile.evbarm.inc,v 1.25 2013/07/10 20:25:21 matt Exp $
2 2
3# 3#
4# If this is a install kernel and the ramdisk image exists in the object 4# If this is a install kernel and the ramdisk image exists in the object
5# tree, insert it into the kernel *before* we make the u-boot images. 5# tree, insert it into the kernel *before* we make the u-boot images.
6# 6#
7RAMDISKNAME?= ramdisk 7RAMDISKNAME?= ramdisk
8.if ${KERNEL_BUILD:T:M*INSTALL} != "" 8.if ${KERNEL_BUILD:T:M*INSTALL} != ""
9RAMDISKDIR!= cd ${NETBSDSRCDIR}/distrib/${THISARM:T}/instkernel/${RAMDISKNAME} && ${PRINTOBJDIR} 9RAMDISKDIR!= cd ${NETBSDSRCDIR}/distrib/${THISARM:T}/instkernel/${RAMDISKNAME} && ${PRINTOBJDIR}
10 10
11.if exists(${RAMDISKDIR}/${RAMDISKNAME}.fs) 11.if exists(${RAMDISKDIR}/${RAMDISKNAME}.fs)
 12SYSTEM_DEP+= ${RAMDISKDIR}/${RAMDISKNAME}.fs
12SYSTEM_LD_TAIL_EXTRA+=; \ 13SYSTEM_LD_TAIL_EXTRA+=; \
13 echo ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/${RAMDISKNAME}.fs; \ 14 echo ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/${RAMDISKNAME}.fs; \
14 ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/${RAMDISKNAME}.fs 15 ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/${RAMDISKNAME}.fs
15.endif 16.endif
16.endif 17.endif
17 18
18.if defined(BOARDMKFRAG) # Must be a full pathname. 19.if defined(BOARDMKFRAG) # Must be a full pathname.
19.include "${BOARDMKFRAG}" 20.include "${BOARDMKFRAG}"
20.endif 21.endif
21 22
22EXTRA_CLEAN+= ldscript tmp ${KERNELS:=.map} 23EXTRA_CLEAN+= ldscript tmp ${KERNELS:=.map}
23 24
24.if defined(KERNEL_BASE_PHYS) 25.if defined(KERNEL_BASE_PHYS)