summaryrefslogtreecommitdiffstats
path: root/build/f_isoroot/f_qemupluginbuild
diff options
context:
space:
mode:
authordavidjchou <david.j.chou@intel.com>2016-06-24 03:42:47 -0700
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-06-28 11:45:01 +0000
commite8928f93b50df3ecb11942ab754bae848c082c6a (patch)
tree9dfd960a60c3d6fa1489649dddeef429b203c086 /build/f_isoroot/f_qemupluginbuild
parent105fa8c0d40e241c206e37755f13aebb2e137ebd (diff)
Add fuel-plugin-kvm to install kvmfornfv
1. The installer function for kvmfornfv was in fuel-plug-qemu in Brahmaputra release, it will be in this new fuel-plugin-kvm for Colorado release for clarity 2. Deleted f_qemupluginbuild sub-directory 3. Two "# fix me" for "@sudo rm -rf kvmfornfv" instead of "@rm -rf kvmfornfv" in Makefiel are the temp workgrounds for some files generated during kvmfornfv building are owned by "root", will remove these workarounds after resolving this issue in fuel-plugin-kvm build process Change-Id: I8a1e2dfaff692dc9813afb5d3bf038170871cade Signed-off-by: davidjchou <david.j.chou@intel.com>
Diffstat (limited to 'build/f_isoroot/f_qemupluginbuild')
-rw-r--r--build/f_isoroot/f_qemupluginbuild/Makefile92
-rw-r--r--build/f_isoroot/f_qemupluginbuild/config.mk12
2 files changed, 0 insertions, 104 deletions
diff --git a/build/f_isoroot/f_qemupluginbuild/Makefile b/build/f_isoroot/f_qemupluginbuild/Makefile
deleted file mode 100644
index 2e3a34f7b..000000000
--- a/build/f_isoroot/f_qemupluginbuild/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-TOP := $(shell pwd)
-
-############################################################################
-# BEGIN of Include definitions
-#
-include config.mk
-#
-# END Include definitions
-#############################################################################
-
-.PHONY: all
-all: .qemubuild
-
-.PHONY: clean
-clean:
- @rm -f .qemubuild ../release/opnfv/fuel-plugin-qemu*.rpm fuel-plugin-qemu*.rpm
- @rm -f $(BUILD_BASE)/gitinfo_qemu-plugin.txt gitinfo_qemu-plugin.txt
-
-.PHONY: release
-release:.qemubuild
- @rm -f ../release/opnfv/fuel-plugin-qemu*.rpm
- @mkdir -p ../release/opnfv
- @cp fuel-plugin-qemu*.rpm ../release/opnfv/
- cp gitinfo_qemu-plugin.txt $(BUILD_BASE)
-
-.qemubuild:
- @rm -rf fuel-plugin-qemu
- sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
- sudo pip install fuel-plugin-builder
- ../../docker/ubuntu-builder/install_docker.sh
- git clone $(QEMU_REPO)
- cd fuel-plugin-qemu; \
- git checkout $(QEMU_BRANCH); \
- if [ ! -z $(QEMU_CHANGE) ]; then \
- git fetch $(QEMU_REPO) $(QEMU_CHANGE); \
- git checkout FETCH_HEAD; \
- fi
- INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-qemu/
- @mv fuel-plugin-qemu/fuel-plugin-qemu*.rpm .
- $(REPOINFO) -r . > gitinfo_qemu-plugin.txt
- @rm -rf fuel-plugin-qemu
- @touch .qemubuild
- # Store artifact in cache straight away if caching is enabled
- # (no .cacheid will be present unless this is a cached build)
- test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0
-
-#############################################################################
-# Cache operations - only used when building through ci/build.sh
-#############################################################################
-
-
-# Create a unique hash to be used for getting and putting cache, based on:
-# - The SHA1 hash of the HEAD on the plugin repo's $(QEMU_BRANCH)
-# - The contents of this Makefile
-.cacheid:
- @if [ ! -z $(QEMU_CHANGE) ]; then \
- $(CACHETOOL) getcommitid $(QEMU_REPO) $(QEMU_CHANGE) > .cachedata; \
- else \
- $(CACHETOOL) getcommitid $(QEMU_REPO) $(QEMU_BRANCH) > .cachedata; \
- fi
- @sha1sum Makefile | awk {'print $$1'} >> .cachedata
- @sha1sum config.mk | awk {'print $$1'} >> .cachedata
- @cat .cachedata | $(CACHETOOL) getid > .cacheid
-
-# Clean local data related to caching - called prior to ordinary build
-.PHONY: clean-cache
-clean-cache: clean
- @rm -f .cachedata .cacheid
-
-# Try to download cache - called prior to ordinary build
-.PHONY: get-cache
-get-cache: .cacheid
- @if $(CACHETOOL) check $(shell cat .cacheid); then \
- $(CACHETOOL) get $(shell cat .cacheid) | tar xf -;\
- else \
- echo "No cache item found for $(shell cat .cacheid)" ;\
- exit 0;\
- fi
-
-# Store cache if not already stored - called after ordinary build
-.PHONY: put-cache
-put-cache: .cacheid
- @tar cf - .qemubuild fuel-plugin-qemu*.rpm gitinfo_qemu-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_qemupluginbuild/config.mk b/build/f_isoroot/f_qemupluginbuild/config.mk
deleted file mode 100644
index 0b846547e..000000000
--- a/build/f_isoroot/f_qemupluginbuild/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-QEMU_BRANCH=c35ce3377bcf382a4e36f1df49758100cd2910b1
-QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu
-QEMU_CHANGE=