Mercurial > oi > oi-build
changeset 446:95cf742749e6
1454 oi-build package-install target sometimes fails due to bad escaping in ips.mk
Reviewed by: Alasdair Lumsden <alasdairrr@gmail.com>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Approved by: Alasdair Lumsden <alasdairrr@gmail.com>
| author | Alasdair Lumsden <alasdairrr@gmail.com> |
|---|---|
| date | Tue, 04 Oct 2011 22:41:06 +0100 |
| parents | 2b9d1a6a8053 |
| children | c96cb5f7d0db |
| files | make-rules/ips.mk |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make-rules/ips.mk Mon Aug 08 22:20:31 2011 +0100 +++ b/make-rules/ips.mk Tue Oct 04 22:41:06 2011 +0100 @@ -170,7 +170,7 @@ $(MANIFEST_BASE)-%.installed: $(MANIFEST_BASE)-%.published @echo "Installing package from manifest: $<" - @export PACKAGEFMRI=`cat $< | $(GSED) ':a;N;$!ba;s/\\\n/ /g' | \ + @export PACKAGEFMRI=`cat $< | $(GSED) ':a;N;$$!ba;s/\\\\\\n/ /g' | \ grep '^set name=pkg.fmri' | $(GSED) 's/.*value=//g'` && \ echo "Installing package $$PACKAGEFMRI" && \ $(PRIV_CMD) pkg install -v $$PACKAGEFMRI ; exit=$$? ; \