openstack
/
fuel-main
Code Issues Proposed changes

Merge "Add fuel-docker-images package to packages-late target"

This commit is contained in:
Jenkins 2015-06-26 14:17:34 +00:00 committed by Gerrit Code Review
parent 32f40f23a6 49e9e6b930
commit 4f2dff3bdc
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/module.mk
View File

@ -62,8 +62,7 @@ $(BUILD_DIR)/docker/base-images.done: \
$(BUILD_DIR)/docker/fuel-centos.done: \
$(BUILD_DIR)/docker/base-images.done \
$(BUILD_DIR)/mirror/centos/build.done \
$(BUILD_DIR)/packages/rpm/build.done \
$(BUILD_DIR)/docker/base-images.done
$(BUILD_DIR)/packages/rpm/build.done
rm -rf $(BUILD_DIR)/docker/fuel-centos-build && \
cp -a $(SOURCE_DIR)/docker/fuel-centos-build $(BUILD_DIR)/docker/fuel-centos-build && \
sudo docker build -t fuel/fuel-centos-build $(BUILD_DIR)/docker/fuel-centos-build && \

3
iso/module.mk
View File

@ -64,8 +64,7 @@ $(BUILD_DIR)/iso/isoroot-centos.done: \
$(BUILD_DIR)/packages/build.done \
$(BUILD_DIR)/packages/build-late.done \
$(BUILD_DIR)/openstack/build.done \
$(BUILD_DIR)/iso/isoroot-dotfiles.done \
$(BUILD_DIR)/packages/rpm/fuel-docker-images.done
$(BUILD_DIR)/iso/isoroot-dotfiles.done
mkdir -p $(ISOROOT)
rsync -rp $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/ $(ISOROOT)
rsync -rp $(LOCAL_MIRROR)/centos-packages.changelog $(ISOROOT)

3
packages/module.mk
View File

@ -136,7 +136,8 @@ $(eval $(call prepare_file_source,fuel-target-centos-images,fuel-target-centos-i
ifneq ($(BUILD_PACKAGES),0)
$(BUILD_DIR)/packages/build-late.done: \
$(BUILD_DIR)/packages/rpm/build-late.done
$(BUILD_DIR)/packages/rpm/build-late.done \
$(BUILD_DIR)/packages/rpm/fuel-docker-images.done
endif
$(BUILD_DIR)/packages/build-late.done:

3
packages/rpm/module.mk
View File

@ -99,6 +99,7 @@ $(BUILD_DIR)/packages/rpm/fuel-docker-images.done: export SANDBOX_DOWN:=$(SANDBO
$(BUILD_DIR)/packages/rpm/fuel-docker-images.done: \
$(BUILD_DIR)/repos/repos.done \
$(BUILD_DIR)/packages/rpm/buildd.tar.gz \
$(BUILD_DIR)/packages/rpm/repo-late.done \
$(BUILD_DIR)/docker/build.done
mkdir -p $(BUILD_DIR)/packages/rpm/RPMS/x86_64
mkdir -p $(SANDBOX) && \
@ -117,8 +118,6 @@ $(BUILD_DIR)/packages/rpm/fuel-docker-images.done: \
$(BUILD_DIR)/packages/rpm/build.done: $(BUILD_DIR)/packages/rpm/repo.done
$(ACTION.TOUCH)
$(BUILD_DIR)/docker/build.done: $(BUILD_DIR)/packages/rpm/repo-late.done
#######################################
# This section is for building container
# packages that depend on other packages.