From owner-freebsd-bugs@FreeBSD.ORG Mon Dec 3 00:50:00 2012 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C0786A93 for ; Mon, 3 Dec 2012 00:50:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 925B98FC12 for ; Mon, 3 Dec 2012 00:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qB30o0bw090357 for ; Mon, 3 Dec 2012 00:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qB30o0Qo090356; Mon, 3 Dec 2012 00:50:00 GMT (envelope-from gnats) Resent-Date: Mon, 3 Dec 2012 00:50:00 GMT Resent-Message-Id: <201212030050.qB30o0Qo090356@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Garrett Cooper Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 34D9AA7C for ; Mon, 3 Dec 2012 00:47:31 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 19D4D8FC0C for ; Mon, 3 Dec 2012 00:47:31 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qB30lUrG080824 for ; Mon, 3 Dec 2012 00:47:30 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id qB30lU34080823; Mon, 3 Dec 2012 00:47:30 GMT (envelope-from nobody) Message-Id: <201212030047.qB30lU34080823@red.freebsd.org> Date: Mon, 3 Dec 2012 00:47:30 GMT From: Garrett Cooper To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: conf/174070: [patch] Allow RELEASE_TARGETS to be user defined and cd before running make X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2012 00:50:00 -0000 >Number: 174070 >Category: conf >Synopsis: [patch] Allow RELEASE_TARGETS to be user defined and cd before running make >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Dec 03 00:50:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Garrett Cooper >Release: 9-STABLE >Organization: EMC Isilon >Environment: FreeBSD bayonetta.local 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r240836M: Sat Sep 22 12:30:11 PDT 2012 gcooper@bayonetta.local:/usr/obj/store/freebsd/stable/9/sys/BAYONETTA amd64 >Description: The attached patch allows users to specify RELEASE_TARGETS (if say, they didn't want to build just the cdrom, ftp, or memstick targets). It also cd's before running make release so the value for ${.CURDIR} / $PWD is set properly. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: release/Makefile =================================================================== --- release/Makefile (revision 243557) +++ release/Makefile (working copy) @@ -52,6 +52,7 @@ EXTRA_PACKAGES+= reldoc .endif +.if !defined(RELEASE_TARGETS) RELEASE_TARGETS= ftp .if exists(${.CURDIR}/${TARGET}/mkisoimages.sh) RELEASE_TARGETS+= cdrom @@ -59,6 +60,7 @@ .if exists(${.CURDIR}/${TARGET}/make-memstick.sh) RELEASE_TARGETS+= memstick .endif +.endif .include @@ -167,8 +169,8 @@ cp *.txz MANIFEST ftp release: - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS} + cd ${.CURDIR}; ${MAKE} ${.MAKEFLAGS} obj + cd ${.CURDIR}; ${MAKE} ${.MAKEFLAGS} ${RELEASE_TARGETS} clean: chflags -R noschg ${.OBJDIR} >Release-Note: >Audit-Trail: >Unformatted: