From 4579c7534ac903956ef86cbb95ddb8bbb538c23b Mon Sep 17 00:00:00 2001 From: Dino Simeon Madarang Date: Wed, 29 Jul 2015 11:00:29 +0100 Subject: src: Add QEMU makefile QEMU v2.2.0+ is recommended for vhost-user. We are adding QEMU 2.2.1 to the makefile because the EPEL repo for CentOS7 only supports QEMU 2.0.0. JIRA: VSPERF-56 Change-Id: I1c65ad6030888802586659d044f069f7fe57c0ea Signed-off-by: Timo Puha Signed-off-by: Madarang, Dino Simeon Reviewed-by: Billy O Mahony Reviewed-by: Maryam Tahhan Reviewed-by: Eugene Snider Reviewed-by: Gurpreet Singh Reviewed-by: Tv Rao --- src/Makefile | 1 + src/package-list.mk | 4 +++ src/qemu/Makefile | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100755 src/qemu/Makefile (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 3b7104ad..496b717b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -26,6 +26,7 @@ SUBDIRS = SUBDIRS += l2fwd SUBDIRS += dpdk SUBDIRS += ovs +SUBDIRS += qemu # specify package dependency here if needed ovs: dpdk diff --git a/src/package-list.mk b/src/package-list.mk index d1015a65..cb45f9d5 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -11,3 +11,7 @@ DPDK_TAG ?= d307f7957c9da6dee264ab7c9b349871c5a4c5fc # OVS section OVS_URL ?= https://github.com/openvswitch/ovs OVS_TAG ?= 943f394ea332837d8e5285986c5182e9746c6c62 + +# QEMU section +QEMU_URL ?= https://github.com/qemu/qemu.git +QEMU_TAG ?= v2.2.1 diff --git a/src/qemu/Makefile b/src/qemu/Makefile new file mode 100755 index 00000000..1a736a29 --- /dev/null +++ b/src/qemu/Makefile @@ -0,0 +1,81 @@ +# makefile to manage qemu package +# + +# Copyright (c) 2015 OPNFV and Intel Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# Contributors: +# Aihua Li, Huawei Technologies. + +include ../mk/master.mk +include ../package-list.mk + +WORK_DIR = qemu +TAG_DONE_FLAG = $(WORK_DIR)/.$(QEMU_TAG).done +CONFIG_CMD = +CONFIG_CMD += ./configure +CONFIG_CMD += --target-list="x86_64-softmmu" + + +all: force_make + +.PHONY: install force_install config force_make + +# install depends on make +force_install: force_make + @echo "Finished making $(WORK_DIR) " + +config $(WORK_DIR)/Makefile: $(WORK_DIR)/configure + $(AT)cd $(WORK_DIR); $(CONFIG_CMD) + @echo "Configure done" + +INSTALL_TARGET = force_install force_make + +force_make: $(WORK_DIR)/Makefile + $(AT)$(MAKE) -C $(WORK_DIR) $(MORE_MAKE_FLAGS) + @echo "Make done" + +force_install: + $(AT)sudo $(MAKE) -C $(WORK_DIR) install + +install: $(INSTALL_TARGET) + +# hard way to clean and clobber +clean: +clobber: + $(AT)rm -rf $(WORK_DIR) + +# cleanse is for developer who would like to keep the +# clone git repo, saving time to fetch again from url +cleanse: + $(AT)cd $(WORK_DIR) && git clean -xfd && git checkout -f + +test: + @echo "Make test in $(WORK_DIR) (stub) " + +sanity: + @echo "Make sanity in $(WORK_DIR) (stub) " + +$(WORK_DIR)/configure: $(TAG_DONE_FLAG) + +$(WORK_DIR): + $(AT)git clone $(QEMU_URL) + +$(TAG_DONE_FLAG): $(WORK_DIR) + $(AT)cd $(WORK_DIR); git checkout $(QEMU_TAG) +ifneq ($(PATCH_FILE),) + $(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE) +endif + $(AT)touch $@ -- cgit 1.2.3-korg