conf/173929: [patch] [mergemaster] allow relative paths for SRCDIR

Garrett Cooper yanegomi at
Mon Nov 26 07:10:01 UTC 2012

>Number:         173929
>Category:       conf
>Synopsis:       [patch] [mergemaster] allow relative paths for SRCDIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 26 07:10:00 UTC 2012
>Originator:     Garrett Cooper
>Release:        9-STABLE
EMC Isilon
FreeBSD bayonetta.local 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r240836M: Sat Sep 22 12:30:11 PDT 2012     gcooper at bayonetta.local:/usr/obj/store/freebsd/stable/9/sys/BAYONETTA  amd64
Due to the cd'ing in mergemaster(8), relative paths aren't allowed via mergemaster -m. The attached patch enables that support.
mergemaster -m .

Patch attached with submission follows:

Index: usr.sbin/mergemaster/
--- usr.sbin/mergemaster/	(revision 242903)
+++ usr.sbin/mergemaster/	(working copy)
@@ -490,6 +490,7 @@
   sleep 3
 # Setup make to use system files from SOURCEDIR
 MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk"


More information about the freebsd-bugs mailing list