[Asterisk-code-review] Makefile.moddir_rules: Pass PJPROJECT_BUNDLED to download_externals (...asterisk[master])
Joshua C. Colp
asteriskteam at digium.com
Wed Mar 13 06:30:03 CDT 2019
Joshua C. Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/c/asterisk/+/11137 )
Change subject: Makefile.moddir_rules: Pass PJPROJECT_BUNDLED to download_externals
......................................................................
Makefile.moddir_rules: Pass PJPROJECT_BUNDLED to download_externals
The download_externals script wasn't getting the PJPROJECT_BUNDLED
environment variable passed down to it so it wasn't downloading
the appropriate variant of res_digium_phone. This could cause
crashes in the DPMA.
Change-Id: I5daa9369c7af1fd556d892e89a85f279a2533425
---
M Makefile.moddir_rules
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Sean Bright: Looks good to me, but someone else must approve
Joshua C. Colp: Looks good to me, approved; Approved for Submit
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index c9f94f9..795b32c 100644
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -114,7 +114,7 @@
EXTERNAL_MODS=$$($(XMLSTARLET) sel -t -m "/category/member[support_level = 'external']" -v "@name" -n .moduleinfo) ;\
for x in $${EXTERNAL_MODS} ; do \
if [ -z "$${DISABLED_MODS[$${x}]}" ] ; then \
- $(ASTTOPDIR)/build_tools/download_externals $${x} ;\
+ PJPROJECT_BUNDLED=${PJPROJECT_BUNDLED} $(ASTTOPDIR)/build_tools/download_externals $${x} ;\
fi ;\
done ;\
fi
--
To view, visit https://gerrit.asterisk.org/c/asterisk/+/11137
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: I5daa9369c7af1fd556d892e89a85f279a2533425
Gerrit-Change-Number: 11137
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: Joshua C. Colp <jcolp at digium.com>
Gerrit-Reviewer: Sean Bright <sean.bright at gmail.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20190313/70a27a08/attachment.html>
More information about the asterisk-code-review
mailing list