Merge "deploy/reap.py: Dump extra interfaces information."

[fuel.git] / build / f_isoroot / f_kvm-pluginbuild / Makefile

diff --git a/build/f_isoroot/f_kvm-pluginbuild/Makefile b/build/f_isoroot/f_kvm-pluginbuild/Makefile
index ba2fd0b..81309ef 100644 (file)
--- 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)
@@ -70,6 +68,7 @@ release:.kvmbuild
        fi
        @sha1sum Makefile | awk {'print $$1'} >> .cachedata
        @sha1sum config.mk | awk {'print $$1'} >> .cachedata
+       @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
        @cat .cachedata | $(CACHETOOL) getid > .cacheid
 
 # Clean local data related to caching - called prior to ordinary build