From owner-svn-src-stable@FreeBSD.ORG Fri Sep 12 18:23:23 2014 Return-Path: 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 A1DDCE3A; Fri, 12 Sep 2014 18:23:23 +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 7291377A; Fri, 12 Sep 2014 18:23:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CINNM8085031; Fri, 12 Sep 2014 18:23:23 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8CINNw0085030; Fri, 12 Sep 2014 18:23:23 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201409121823.s8CINNw0085030@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 12 Sep 2014 18:23:23 +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: r271477 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2014 18:23:23 -0000 Author: gjb Date: Fri Sep 12 18:23:22 2014 New Revision: 271477 URL: http://svnweb.freebsd.org/changeset/base/271477 Log: Connect the UEFI-capable disc1.iso and dvd1.iso variants to the build. This is a direct commit to stable/10. Approved by: re (marius) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/Makefile Modified: stable/10/release/Makefile ============================================================================== --- stable/10/release/Makefile Fri Sep 12 18:20:35 2014 (r271476) +++ stable/10/release/Makefile Fri Sep 12 18:23:22 2014 (r271477) @@ -97,6 +97,16 @@ IMAGES+= mini-memstick.img RELEASE_TARGETS+=uefi-memstick.img IMAGES+= uefi-memstick.img .endif +.if exists(${.CURDIR}/${TARGET}/mkisoimages-uefi.sh) +RELEASE_TARGETS+=uefi-disc1.iso +RELEASE_TARGETS+=uefi-bootonly.iso +IMAGES+= uefi-disc1.iso +IMAGES+= uefi-bootonly.iso +. if defined(WITH_DVD) && !empty(WITH_DVD) +RELEASE_TARGETS+=uefi-dvd1.iso +IMAGES+= uefi-dvd1.iso +. endif +.endif CLEANFILES= packagesystem *.txz MANIFEST system ${IMAGES} .if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES) @@ -220,9 +230,24 @@ release.iso: disc1.iso disc1.iso: system sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} release +uefi-disc1.iso: system +.if exists(${.CURDIR}/${TARGET}/mkisoimages-uefi.sh) + sh ${.CURDIR}/${TARGET}/mkisoimages-uefi.sh -b FreeBSD_Install ${.TARGET} release +.endif + +uefi-bootonly.iso: bootonly +.if exists(${.CURDIR}/${TARGET}/mkisoimages-uefi.sh) + sh ${.CURDIR}/${TARGET}/mkisoimages-uefi.sh -b FreeBSD_Install ${.TARGET} bootonly +.endif + dvd1.iso: dvd pkg-stage sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} dvd +uefi-dvd1.iso: dvd pkg-stage +.if exists(${.CURDIR}/${TARGET}/mkisoimages-uefi.sh) + sh ${.CURDIR}/${TARGET}/mkisoimages-uefi.sh -b FreeBSD_Install ${.TARGET} dvd +.endif + bootonly.iso: bootonly sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} bootonly