Date: Mon, 10 Jun 2013 22:06:38 GMT From: Garrett Cooper <yaneurabeya@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: conf/179466: [PATCH] Quote LOCAL_MTREE so submakes don't interpret expanded value of LOCAL_MTREE as targets Message-ID: <201306102206.r5AM6cGe041531@oldred.freebsd.org> Resent-Message-ID: <201306102210.r5AMA2Gv029434@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179466
>Category: conf
>Synopsis: [PATCH] Quote LOCAL_MTREE so submakes don't interpret expanded value of LOCAL_MTREE as targets
>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 Jun 10 22:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Garrett Cooper
>Release: 10-CURRENT
>Organization:
EMC Isilon
>Environment:
FreeBSD gran-tourismo.west.isilon.com 10.0-CURRENT FreeBSD 10.0-CURRENT #2 r+ba9afe9: Fri Apr 19 20:29:10 PDT 2013 gcooper@gran-tourismo.west.isilon.com:/usr/obj/usr/src/sys/GRAN-TOURISMO amd64
>Description:
We're using src.conf at work for specifying LOCAL_MTREE and unfortunately it's broken with multiple values to LOCAL_MTREE it seems. This is the error message we run into:
cd /build/mnt/src/etc; make LOCAL_MTREE=etc/mtree/ISILON.include.dist etc/mtree/ISILON.root.dist etc/mtree/ISILON.usr.dist etc/mtree/ISILON.var.dist distrib-dirs
The solution is to quote the value of LOCAL_MTREE so it gets passed through submake invocations properly.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
>From 1a3874ce7e95784649a276a6b6c842149fc74be6 Mon Sep 17 00:00:00 2001
From: Garrett Cooper <yanegomi@gmail.com>
Date: Mon, 10 Jun 2013 12:59:21 -0700
Subject: [PATCH 2/2] Quote LOCAL_MTREE so it gets passed between make
invocations properly
Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
---
Makefile.inc1 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index f88dd9f..87b7a45 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -268,7 +268,7 @@ WMAKEENV= ${CROSSENV} \
PATH=${TMPPATH}
# make hierarchy
-HMAKE= ${MAKE} LOCAL_MTREE=${LOCAL_MTREE}
+HMAKE= ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q}
.if defined(NO_ROOT)
HMAKE+= METALOG=${METALOG} -DNO_ROOT
.endif
@@ -811,7 +811,7 @@ distributeworld installworld: installcheck installcheck_UGID
cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \
DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
- LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs
+ LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
.endif
${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
${IMAKEENV} rm -rf ${INSTALLTMP}
@@ -857,7 +857,7 @@ reinstall:
@echo ">>> Making hierarchy"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
- LOCAL_MTREE=${LOCAL_MTREE} hierarchy
+ LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy
@echo
@echo "--------------------------------------------------------------"
@echo ">>> Installing everything"
--
1.8.2.3
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306102206.r5AM6cGe041531>