[Asterisk-code-review] Update stage directory to include optional subdir (repotools[master])

Scott Griepentrog asteriskteam at digium.com
Tue Aug 9 13:06:46 CDT 2016


Scott Griepentrog has uploaded a new change for review.

  https://gerrit.asterisk.org/3444

Change subject: Update stage directory to include optional subdir
......................................................................

Update stage directory to include optional subdir

Change-Id: I7e990508323409552ee74c69c8e1c098a9318e1c
---
M build_tools/Makefile.product_rules
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.asterisk.org:29418/repotools refs/changes/44/3444/1

diff --git a/build_tools/Makefile.product_rules b/build_tools/Makefile.product_rules
index d67a91a..60755d8 100644
--- a/build_tools/Makefile.product_rules
+++ b/build_tools/Makefile.product_rules
@@ -167,7 +167,11 @@
 everything: superclean tarballs_64 tarballs_32
 
 VALID_TAG=$(shell echo $(PRODUCT_VERSION) | sed -n -r -e "s/^([0-9]+\.[0-9]+)_[0-9]+\.[0-9]+\.[0-9]+$$/\1/gp")
-STAGEDIR=$(REPO)/$(MODULE_NAME)/asterisk-$(VALID_TAG)/$(subst _,-,$(ARCH))
+ifeq ($(STAGE_SUBDIR),)
+	STAGEDIR=$(REPO)/$(MODULE_NAME)/asterisk-$(VALID_TAG)/$(subst _,-,$(ARCH))
+else
+	STAGEDIR=$(REPO)/$(MODULE_NAME)/$(STAGE_SUBDIR)/asterisk-$(VALID_TAG)/$(subst _,-,$(ARCH))
+fi
 GIT_STATUS=$(shell git status --porcelain)
 
 checkstage:

-- 
To view, visit https://gerrit.asterisk.org/3444
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e990508323409552ee74c69c8e1c098a9318e1c
Gerrit-PatchSet: 1
Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-Owner: Scott Griepentrog <sgriepentrog at digium.com>



More information about the asterisk-code-review mailing list