Date: Thu, 26 Mar 2015 01:00:49 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280646 - projects/release-arm-redux/release Message-ID: <201503260100.t2Q10npw019725@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu Mar 26 01:00:48 2015 New Revision: 280646 URL: https://svnweb.freebsd.org/changeset/base/280646 Log: Add glue to make the md(4) device for populating the userland/kernel. Clean up a few variable names. Sponsored by: The FreeBSD Foundation Modified: projects/release-arm-redux/release/Makefile.arm Modified: projects/release-arm-redux/release/Makefile.arm ============================================================================== --- projects/release-arm-redux/release/Makefile.arm Thu Mar 26 00:07:40 2015 (r280645) +++ projects/release-arm-redux/release/Makefile.arm Thu Mar 26 01:00:48 2015 (r280646) @@ -19,19 +19,32 @@ CLEANFILES+= arm-all .if defined(WITH_ARM_IMAGES) && !empty(WITH_ARM_IMAGES) && !empty(BOARDS) . for BOARD in ${BOARDS} ARMTARGETS+= arm-${BOARD:tl} +ARMBEFORECLEAN+= arm-mdclean${BOARD:tl} CLEANDIRS+= arm-${BOARD:tl} CLEANFILES+= arm-buildworld${BOARD:tl} \ arm-buildkernel${BOARD:tl} \ arm-installworld${BOARD:tl} \ arm-installkernel${BOARD:tl} \ - arm-${BOARD:tu}.img \ - arm-${BOARD:tu}.raw \ + ${${BOARD:tu}IMAGE} \ + ${${BOARD:tu}MDDEV} \ + ${${BOARD:tu}MDFILE} \ build-arm-${BOARD:tl} \ build-arm-ports${BOARD:tl} +${BOARD:tu}IMAGE= arm-${BOARD:tu}.img +${BOARD:tu}MDDEV= arm-${BOARD:tu}.mddev +${BOARD:tu}MDFILE= arm-${BOARD:tu}.raw . if exists(${.CURDIR}/arm/Makefile.${BOARD}) . include "${.CURDIR}/arm/Makefile.${BOARD}" . endif +arm-mdcleanall: ${ARMBEFORECLEAN} + +arm-mdclean${BOARD:tl}: +.if exists(${${BOARD:tu}MDDEV}) + umount ${${BOARD:tu}MDFILE} || true + mdconfig -d -u $$(cat ${${BOARD:tu}MDDEV}) +.endif + arm-${BOARD:tl}: arm-buildworld${BOARD:tl} arm-buildkernel${BOARD:tl} \ arm-installworld${BOARD:tl} arm-installkernel${BOARD:tl} ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} build-${.TARGET} @@ -46,7 +59,7 @@ arm-buildkernel${BOARD:tl}: KERNCONF=${BOARD} buildkernel touch ${.TARGET} -arm-installworld${BOARD:tl}: +arm-installworld${BOARD:tl}: arm-mkfs${BOARD:tl} @echo ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${ARM_WFLAGS} \ installworld touch ${.TARGET} @@ -56,6 +69,12 @@ arm-installkernel${BOARD:tl}: KERNCONF=${BOARD} installkernel touch ${.TARGET} +arm-mkfs${BOARD:tl}: + mkdir -p ${.OBJDIR}/arm-${BOARD:tl} + truncate -s ${ARMSIZE} ${.OBJDIR}/arm-${BOARD:tu}.raw + echo $$(mdconfig -f ${${BOARD:tu}MDFILE}) > \ + ${${BOARD:tu}MDDEV} + build-arm-ports${BOARD:tl}: . if defined(ARMPORTS) && !empty(ARMPORTS) . if !exists(${PORTSDIR}/Makefile) @@ -70,5 +89,7 @@ build-arm-ports${BOARD:tl}: . endfor # main loop .endif # !WITH_ARM_IMAGES +beforeclean: arm-mdcleanall + arm-all: ${ARMTARGETS} touch ${.TARGET}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503260100.t2Q10npw019725>