>Number: 173929
>Category: conf
>Synopsis: [patch] [mergemaster] allow relative paths for SRCDIR
>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 Nov 26 07:10: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
[email protected]:/usr/obj/store/freebsd/stable/9/sys/BAYONETTA amd64
>Description:
Due to the cd'ing in mergemaster(8), relative paths aren't allowed via
mergemaster -m. The attached patch enables that support.
>How-To-Repeat:
mergemaster -m .
>Fix:
Patch attached with submission follows:
Index: usr.sbin/mergemaster/mergemaster.sh
===================================================================
--- usr.sbin/mergemaster/mergemaster.sh (revision 242903)
+++ usr.sbin/mergemaster/mergemaster.sh (working copy)
@@ -490,6 +490,7 @@
sleep 3
SOURCEDIR=${SOURCEDIR}/..
fi
+SOURCEDIR=$(realpath "$SOURCEDIR")
# Setup make to use system files from SOURCEDIR
MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk"
>Release-Note:
>Audit-Trail:
>Unformatted:
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "[email protected]"
