diff options
| author |   Michal Skalski <mskalski@mirantis.com> | 2016-02-03 12:27:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-02-03 12:27:05 +0000 |
| commit | 20d1081fdc9be7b7fee30fb871e8b844c49cf1fd (patch) | |
| tree | b473174748e7ece5d6ab3078e62730fb6eff11b9 /build | |
| parent | 0364d95e36c8b7096b62df66c515b0f0d9f060af (diff) | |
| parent | 3f1a79c93c7f6f2dd3cc879e18de05db1a846a98 (diff) | |
Merge "Properly handling ubuntu directory as a non top of repository" into stable/brahmaputra
Diffstat (limited to 'build')
| -rw-r--r-- | build/f_isoroot/f_repobuild/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile index 966da3634..105efa3ce 100644 --- a/build/f_isoroot/f_repobuild/Makefile +++ b/build/f_isoroot/f_repobuild/Makefile @@ -11,6 +11,7 @@ SHELL := /bin/bash TOP := $(shell pwd) UBUNTU_DIR := $(shell dirname $(MIRROR_UBUNTU_ROOT)) +TMP_ROOT_DIR := $(shell echo "$(UBUNTU_DIR)" | cut -d "/" -f2) include ../../config.mk @@ -35,8 +36,8 @@ nailgun: mv nailgun/mirrors$(MIRROR_MOS_UBUNTU_ROOT) nailgun/mirrors/mos-repos/ubuntu/$(MOS_VERSION) rmdir nailgun/mirrors/mos-repos/ubuntu/snapshots if [ "$(UBUNTU_DIR)" != "/" ]; then \ - mv nailgun/mirrors$(UBUNTU_DIR)/ubuntu naligun/mirros/ubuntu;\ - rm -rf nailgun/mirrors$(UBUNTU_DIR);\ + mv nailgun/mirrors$(UBUNTU_DIR)/ubuntu nailgun/mirrors/ubuntu;\ + rm -rf nailgun/mirrors/$(TMP_ROOT_DIR);\ fi # Store artifact in cache straight away if caching is enabled # (no .cacheid will be present unless this is a cached build) |