diff options
| author |   Avi Kivity <avi@qumranet.com> | 2006-11-09 14:55:10 +0000 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2006-11-09 14:55:10 +0000 |
| commit | 0b24b5f9cae209e24ff5912d9c07cba64600c26f (patch) | |
| tree | d73d3ce9663eff63a0bde106787fd7f962df41e4 | |
| parent | c4ef5de5c90a20e9774a641d556221453e8a115b (diff) | |
kvm: moved kvm-configure into top-level configure
| -rwxr-xr-x | kvm-configure | 6 | ||||
| -rw-r--r-- | kvm/Makefile | 8 | ||||
| -rwxr-xr-x | kvm/configure | 15 |
3 files changed, 21 insertions, 8 deletions
diff --git a/kvm-configure b/kvm-configure deleted file mode 100755 index a877738f4..000000000 --- a/kvm-configure +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -CC=$(ls /usr/bin/gcc3* | tail -n1) -./configure --target-list=$(uname -i)-softmmu --cc=$CC --disable-kqemu \ - --extra-cflags="-I $PWD/../user" --extra-ldflags="-L $PWD/../user" \ - --enable-kvm --kernel-path=$PWD/../kernel diff --git a/kvm/Makefile b/kvm/Makefile index 0cf7f9a9c..32cc9af7f 100644 --- a/kvm/Makefile +++ b/kvm/Makefile @@ -1,17 +1,23 @@ include config.mak +DESTDIR= + rpmrelease = devel .PHONY: kernel user qemu -all: $(if $(want_module), kernel) user qemu +all: $(if $(WANT_MODULE), kernel) user qemu qemu kernel user: $(MAKE) -C $@ qemu: user +install: + make -C user DESTDIR="$(DESTDIR)" install + make -C qemu DESTDIR="$(DESTDIR)" install + tmpspec = .tmp.kvm.spec rpm: user qemu diff --git a/kvm/configure b/kvm/configure index c0e25b2f5..9e983a6b2 100755 --- a/kvm/configure +++ b/kvm/configure @@ -3,6 +3,7 @@ prefix=/usr/local kerneldir=/lib/modules/$(uname -r)/build want_module=1 +qemu_cc=$(ls /usr/bin/gcc3* | tail -n1) usage() { cat <<-EOF @@ -13,6 +14,7 @@ usage() { --prefix=PREFIX where to install things ($prefix) --with-patched-kernel don't use external module --kerneldir=DIR kernel build directory ($kerneldir) + --qemu-cc="$qemu_cc" compiler for qemu (needs gcc3.x) ($qemu_cc) EOF exit 1 } @@ -32,7 +34,10 @@ while [[ "$1" = -* ]]; do kerneldir="$arg" ;; --with-patched-kernel) - want_module=0 + want_module= + ;; + --qemu-cc) + qemu_cc="$arg" ;; --help) usage @@ -49,6 +54,14 @@ if (( want_module )); then fi (cd user; ./configure --prefix="$prefix" --kerneldir="$libkvm_kerneldir") +(cd qemu; ./configure --target-list=$(uname -i)-softmmu --cc="$qemu_cc" \ + --disable-kqemu --extra-cflags="-I $PWD/../user" \ + --extra-ldflags="-L $PWD/../user" \ + --enable-kvm --kernel-path="$libkvm_kerneldir" \ + --prefix="$prefix" +) + + cat <<EOF > config.mak PREFIX=$prefix |