From owner-svn-src-projects@FreeBSD.ORG Thu Mar 26 01:00:49 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CA1F4BDE; Thu, 26 Mar 2015 01:00:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9C367DE9; Thu, 26 Mar 2015 01:00:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2Q10nKh019726; Thu, 26 Mar 2015 01:00:49 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2Q10npw019725; Thu, 26 Mar 2015 01:00:49 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201503260100.t2Q10npw019725@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 26 Mar 2015 01:00:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280646 - projects/release-arm-redux/release X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2015 01:00:49 -0000 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}