From 3f1a79c93c7f6f2dd3cc879e18de05db1a846a98 Mon Sep 17 00:00:00 2001 From: Michal Skalski Date: Wed, 3 Feb 2016 02:29:09 +0100 Subject: Properly handling ubuntu directory as a non top of repository Change-Id: Ie7d921b3728df937dc719cd638fa7ae035fc9307 Signed-off-by: Michal Skalski (cherry picked from commit 0f5bba36cb0be642f8069e8708b5ea80a5adbe4d) --- build/f_isoroot/f_repobuild/Makefile | 5 +++-- 1 file 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) -- cgit 1.2.3-korg