openstack
/
fuel-main
Code Issues Proposed changes

Fix sources preparation for the fuel-library package 

Include upstream_modules.tar.gz to the source tar.gz
in case we are building the fuel-library package,
and USE_PREDEFINED_FUEL_LIB_PUPPET_MODULES is defined.

Closes-Bug: #1570331
Change-Id: I998d68e9a9cc900b3e0faf85d573fe36b8e39526
This commit is contained in:
Vitaly Parakhin 2016-04-15 12:35:52 +03:00
parent 12e20dc398
commit b7bba01291
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/module.mk
View File

@ -40,6 +40,9 @@ $(BUILD_DIR)/packages/sources/$1/$2:
echo DEBEMAIL=`git -C $3 log -1 --pretty=format:%ae` >> $$(VERSIONFILE)
echo DEBMSG=`git -C $3 rev-parse --short HEAD` `git -C $3 log -1 --pretty=%s` >> $$(VERSIONFILE)
cd $(BUILD_DIR)/packages/sources/$1 && tar -rf $1.tar version
ifneq ($(USE_PREDEFINED_FUEL_LIB_PUPPET_MODULES),)
if [ "$1" = "fuel-library$(FUEL_LIBRARY_VERSION)" ]; then cd $(BUILD_DIR)/packages/sources/$1 && tar -rf $1.tar upstream_modules.tar.gz; fi
endif
cd $(BUILD_DIR)/packages/sources/$1 && gzip -9 $1.tar && mv $1.tar.gz $2
endef