From 6f158d27fc4389b790a78e78cee7566ce40f59e7 Mon Sep 17 00:00:00 2001
From: George Joseph <gjoseph@digium.com>
Date: Tue, 12 Mar 2019 12:25:33 -0600
Subject: [PATCH] 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
---
Makefile.moddir_rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index c9f94f979f..795b32c716 100644
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -114,7 +114,7 @@ ifneq ($(findstring :,$(XMLSTARLET)$(BASH)),:)
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
--
GitLab