From owner-svn-src-stable@FreeBSD.ORG  Tue Sep  9 21:07:21 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CF16B74F;
 Tue,  9 Sep 2014 21:07:21 +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 BA3AD90B;
 Tue,  9 Sep 2014 21:07:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89L7Ljk090450;
 Tue, 9 Sep 2014 21:07:21 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89L7L49090449;
 Tue, 9 Sep 2014 21:07:21 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201409092107.s89L7L49090449@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 9 Sep 2014 21:07:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r271334 - stable/10/release
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Sep 2014 21:07:21 -0000

Author: gjb
Date: Tue Sep  9 21:07:21 2014
New Revision: 271334
URL: http://svnweb.freebsd.org/changeset/base/271334

Log:
  Connect the UEFI-capable memstick.img to the build.
  
  This is a direct commit to stable/10, as the script
  in head/ does UEFI by default.
  
  Approved by:	re (rodrigc)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/Makefile

Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile	Tue Sep  9 20:36:56 2014	(r271333)
+++ stable/10/release/Makefile	Tue Sep  9 21:07:21 2014	(r271334)
@@ -93,6 +93,10 @@ RELEASE_TARGETS+= mini-memstick.img
 IMAGES+=	memstick.img
 IMAGES+=	mini-memstick.img
 .endif
+.if exists(${.CURDIR}/${TARGET}/make-uefi-memstick.sh)
+RELEASE_TARGETS+=uefi-memstick.img
+IMAGES+=	uefi-memstick.img
+.endif
 
 CLEANFILES=	packagesystem *.txz MANIFEST system ${IMAGES}
 .if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
@@ -230,6 +234,12 @@ mini-memstick: mini-memstick.img
 mini-memstick.img: system
 	sh ${.CURDIR}/${TARGET}/make-memstick.sh bootonly ${.TARGET}
 
+uefi-memstick: uefi-memstick.img
+uefi-memstick.img: system
+.if exists(${.CURDIR}/${TARGET}/make-uefi-memstick.sh)
+	sh ${.CURDIR}/${TARGET}/make-uefi-memstick.sh release ${.TARGET}
+.endif
+
 packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
 	sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST
 	touch ${.TARGET}