openstack
/
fuel-main
Code Issues Proposed changes

Add building of python-tasklib deb package during ISO build 

Partially implements blueprint packages-for-fuel-tacklib

Change-Id: Ia7fe9406d1180e19954791769df120c03bc067c5
This commit is contained in:
Vitaly Parakhin 2014-10-20 15:31:35 +03:00
parent 0e606011c9
commit 6af07615fa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/deb/module.mk
View File

@ -28,9 +28,9 @@ $(BUILD_DIR)/packages/deb/$1.done: $(BUILD_DIR)/repos/repos.done
sudo sh -c "$$$${SANDBOX_UBUNTU_UP}"
sudo chroot $$(SANDBOX_UBUNTU) /bin/bash -c "apt-get update"
sudo mkdir -p $$(SANDBOX_UBUNTU)/tmp/$1
ifeq ($1,nailgun-net-check)
tar zxf $(BUILD_DIR)/packages/sources/$1/$1*.tar.gz -C $(BUILD_DIR)/packages/deb/sources
sudo cp -r $(BUILD_DIR)/packages/deb/sources/$1*/* $$(SANDBOX_UBUNTU)/tmp/$1/
ifeq ($1,$(filter $1,nailgun-net-check python-tasklib))
tar zxf $(BUILD_DIR)/packages/sources/$1/$(subst python-,,$1)*.tar.gz -C $(BUILD_DIR)/packages/deb/sources
sudo cp -r $(BUILD_DIR)/packages/deb/sources/$(subst python-,,$1)*/* $$(SANDBOX_UBUNTU)/tmp/$1/
endif
sudo cp -r $(BUILD_DIR)/packages/sources/$1/* $$(SANDBOX_UBUNTU)/tmp/$1/
sudo cp -r $(SOURCE_DIR)/packages/deb/specs/$1/* $$(SANDBOX_UBUNTU)/tmp/$1/
@ -51,6 +51,7 @@ $(eval $(call build_deb,fencing-agent))
$(eval $(call build_deb,nailgun-mcagents))
$(eval $(call build_deb,nailgun-net-check))
$(eval $(call build_deb,nailgun-agent))
$(eval $(call build_deb,python-tasklib))
$(BUILD_DIR)/packages/deb/repo.done:
sudo find $(BUILD_DIR)/packages/deb/packages -name '*.deb' -exec cp -u {} $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/pool/main \;