From: davidjchou <david.j.chou@intel.com>
Date: Thu, 18 Aug 2016 20:59:24 +0000 (-0700)
Subject: Claenup
X-Git-Tag: colorado.1.rc1~21^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F19017%2F1;p=fuel.git

Claenup

Remove the workaround marked by "# fix me" mentioned in commit id:
e8928f93b50df3ecb11942ab754bae848c082c6a, since the issue (some files
generated during kvmfornfv building are owned by "root") already
resolved in fuel-plugin-kvm build process.

Change-Id: I5efb60173b9974f6fba25f04da1f4b1f53207b1a
Signed-off-by: davidjchou <david.j.chou@intel.com>
---

diff --git a/build/f_isoroot/f_kvm-pluginbuild/Makefile b/build/f_isoroot/f_kvm-pluginbuild/Makefile
index ba2fd0be0..7268699c3 100644
--- a/build/f_isoroot/f_kvm-pluginbuild/Makefile
+++ b/build/f_isoroot/f_kvm-pluginbuild/Makefile
@@ -33,8 +33,7 @@ release:.kvmbuild
 	cp gitinfo_kvm-plugin.txt $(BUILD_BASE)
 
 .kvmbuild:
-	# fix me
-	@sudo rm -rf kvmfornfv
+	@rm -rf kvmfornfv
 	../../docker/ubuntu-builder/install_docker.sh
 	git clone $(KVMFORNFV_REPO)
 	cd kvmfornfv; \
@@ -47,8 +46,7 @@ release:.kvmbuild
 	INCLUDE_DEPENDENCIES=true fpb --debug --build ./
 	@mv kvmfornfv/fuel-plugin/fuel-plugin-kvm*.rpm .
 	$(REPOINFO) -r . > gitinfo_kvm-plugin.txt
-	# fix me
-	@sudo rm -rf kvmfornfv
+	@rm -rf kvmfornfv
 	@touch .kvmbuild
 	# Store artifact in cache straight away if caching is enabled
 	# (no .cacheid will be present unless this is a cached build)