Date: Mon, 3 Dec 2012 00:47:30 GMT From: Garrett Cooper <yanegomi@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: conf/174070: [patch] Allow RELEASE_TARGETS to be user defined and cd before running make Message-ID: <201212030047.qB30lU34080823@red.freebsd.org> Resent-Message-ID: <201212030050.qB30o0Qo090356@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.obj.mk>
@@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212030047.qB30lU34080823>