summaryrefslogtreecommitdiffstats
path: root/build/f_isoroot
diff options
context:
space:
mode:
Diffstat (limited to 'build/f_isoroot')
-rw-r--r--build/f_isoroot/f_kvm-pluginbuild/Makefile6
-rw-r--r--build/f_isoroot/f_kvm-pluginbuild/config.mk2
2 files changed, 3 insertions, 5 deletions
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)
diff --git a/build/f_isoroot/f_kvm-pluginbuild/config.mk b/build/f_isoroot/f_kvm-pluginbuild/config.mk
index 1bd40256c..9fb2f9283 100644
--- a/build/f_isoroot/f_kvm-pluginbuild/config.mk
+++ b/build/f_isoroot/f_kvm-pluginbuild/config.mk
@@ -7,6 +7,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-KVMFORNFV_BRANCH=2aa991a490387f3910a7e1bf02de83a7efb28014
+KVMFORNFV_BRANCH=b1c117f1c8414bddbe4370414590f5f0b62ae4d1
KVMFORNFV_REPO=https://gerrit.opnfv.org/gerrit/kvmfornfv
KVMFORNFV_CHANGE=