Re: Adding firmware for USB ethernet to RPI install image

[Martin Husemann <martin%duskware.de@localhost>]

And here is the patch - oops.

Martin

Index: distrib/common/Makefile.image
===================================================================
RCS file: /cvsroot/src/distrib/common/Makefile.image,v
retrieving revision 1.33
diff -u -r1.33 Makefile.image
--- distrib/common/Makefile.image       27 Jan 2014 08:18:07 -0000      1.33
+++ distrib/common/Makefile.image       1 Aug 2014 14:25:39 -0000
@@ -13,6 +13,7 @@
 #
 # Optional variables:
 #      IMAGE           name of target image
+#      IMAGEPREBUILD   additional operations to run pre image creation
 #      IMAGEPOSTBUILD  operation to run on ${IMAGE} ${.TARGET} after its built
 #                      (if this returns non zero, ${.TARGET} is removed)
 #      CRUNCHBIN       name of crunchgen(1)ed binary
@@ -84,6 +85,9 @@
 .if defined(IMAGE)                                             # {
 IMGMAKEFSOPTIONS?= -o bsize=4096,fsize=512
 ${IMAGE}: ${WORKBUILT}
+.if defined(IMAGEPREBUILD)
+       ${IMAGEPREBUILD}
+.endif
        [ "${.OODATE}" = ${WORKBUILT} -a -f ${IMAGE} -a ! ${IMAGE} -ot 
${WORKBUILT} ]  || { \
        ${_MKSHMSG_CREATE} ${.CURDIR:T}/${.TARGET}; \
        rm -f ${.TARGET} ${.TARGET}.tmp; \
Index: distrib/evbarm/instkernel/sshramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/evbarm/instkernel/sshramdisk/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- distrib/evbarm/instkernel/sshramdisk/Makefile       2 Mar 2014 13:25:43 
-0000       1.3
+++ distrib/evbarm/instkernel/sshramdisk/Makefile       1 Aug 2014 14:25:39 
-0000
@@ -4,7 +4,7 @@
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 IMAGE=         sshramdisk.fs
-IMAGESIZE=     3800k
+IMAGESIZE=     8600k
 MAKEFS_FLAGS=  -f 15
 
 WARNS=         1
@@ -20,6 +20,7 @@
                ${NETBSDSRCDIR}/etc/group \
                ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
                ${DISTRIBDIR}/common/services
+IMAGEPREBUILD= ${TOOL_PAX} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
 
 # Use stubs to eliminate some large stuff from libc
 HACKSRC=       ${DISTRIBDIR}/utils/libhack
Index: sys/arch/evbarm/conf/RPI_INSTALL
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/RPI_INSTALL,v
retrieving revision 1.3
diff -u -r1.3 RPI_INSTALL
--- sys/arch/evbarm/conf/RPI_INSTALL    1 May 2014 18:43:45 -0000       1.3
+++ sys/arch/evbarm/conf/RPI_INSTALL    1 Aug 2014 14:25:39 -0000
@@ -7,5 +7,8 @@
 include "arch/evbarm/conf/RPI"
 include "arch/evbarm/conf/INSTALL"
 
+no options     MEMORY_DISK_ROOT_SIZE
+options        MEMORY_DISK_ROOT_SIZE=17250
+
 makeoptions    RAMDISKNAME=sshramdisk
 no makeoptions DEBUG