openstack
/
fuel-main
Code Issues Proposed changes

Merge "Use temporary yum cache dir during extra repos sync"

This commit is contained in:
Jenkins 2015-12-30 09:55:22 +00:00 committed by Gerrit Code Review
parent 1ebfdcb3af 80d35d1fef
commit a0d7c15d65
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mirror/centos/extra-repos.mk
View File

@ -1,3 +1,5 @@
extra_centos_empty_installroot:=$(BUILD_DIR)/mirror/centos/dummy_extra_installroot
$(BUILD_DIR)/mirror/centos/extra-repos-download.done: $(BUILD_DIR)/mirror/centos/yum-config.done
$(BUILD_DIR)/mirror/centos/extra-repos-download.done:
mkdir -p $(LOCAL_MIRROR)/extra-repos
@ -18,7 +20,11 @@ $(BUILD_DIR)/mirror/centos/extra-repos.done:
$(ACTION.TOUCH)
define extra_repo_download
set -ex ; reposync --downloadcomps --plugins --delete --arch=$(CENTOS_ARCH) \
mkdir -p "$(extra_centos_empty_installroot)/cache" ;
set -ex ; env TMPDIR="$(extra_centos_empty_installroot)/cache" \
TMP="$(extra_centos_empty_installroot)/cache" \
reposync --downloadcomps --plugins --delete --arch=$(CENTOS_ARCH) \
--cachedir="$(extra_centos_empty_installroot)/cache" \
-c $(BUILD_DIR)/mirror/centos/etc/yum.conf --repoid=$(call get_repo_name,$1) \
-p $(LOCAL_MIRROR)/extra-repos/
endef

1
mirror/centos/mos-repo.mk
View File

@ -7,6 +7,7 @@ $(BUILD_DIR)/mirror/centos/mos-download.done: $(BUILD_DIR)/mirror/centos/yum-con
set -ex ; env TMPDIR="$(mos_centos_empty_installroot)/cache" \
TMP="$(mos_centos_empty_installroot)/cache" \
reposync --norepopath --downloadcomps --plugins --delete --arch=$(CENTOS_ARCH) \
--cachedir="$(mos_centos_empty_installroot)/cache" \
-c $(BUILD_DIR)/mirror/centos/etc/yum.conf --repoid=fuel -p $(LOCAL_MIRROR_MOS_CENTOS)
$(ACTION.TOUCH)