summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-02-03 02:29:09 +0100
committerStefan Berg <stefan.k.berg@ericsson.com>2016-02-03 10:03:02 +0000
commit3f1a79c93c7f6f2dd3cc879e18de05db1a846a98 (patch)
treed4a04f40eae02679be05d3212c82c9c9fe1000f6 /build
parent9d4ccc9198321c7cf372b09806f2f1ab00998b82 (diff)
Properly handling ubuntu directory as a non top of repository
Change-Id: Ie7d921b3728df937dc719cd638fa7ae035fc9307 Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit 0f5bba36cb0be642f8069e8708b5ea80a5adbe4d)
Diffstat (limited to 'build')
-rw-r--r--build/f_isoroot/f_repobuild/Makefile5
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)