From patchwork Sun Jun 26 20:04:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 919582 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5QK7b1p025364 for ; Sun, 26 Jun 2011 20:08:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754958Ab1FZUFZ (ORCPT ); Sun, 26 Jun 2011 16:05:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35948 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754837Ab1FZUEt (ORCPT ); Sun, 26 Jun 2011 16:04:49 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5QK4moL003144 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 26 Jun 2011 16:04:48 -0400 Received: from bow.redhat.com (vpn-10-228.rdu.redhat.com [10.11.10.228]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p5QK4fKK024319; Sun, 26 Jun 2011 16:04:47 -0400 From: Alon Levy To: autotest@test.kernel.org Cc: kvm@vger.kernel.org Subject: [PATCH] kvm_installer: build spice from git Date: Sun, 26 Jun 2011 22:04:37 +0200 Message-Id: <1309118678-8327-4-git-send-email-alevy@redhat.com> In-Reply-To: <1309118678-8327-1-git-send-email-alevy@redhat.com> References: <1309118678-8327-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sun, 26 Jun 2011 20:08:15 +0000 (UTC) --- client/virt/kvm_installer.py | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/client/virt/kvm_installer.py b/client/virt/kvm_installer.py index df47fc0..b7f6291 100644 --- a/client/virt/kvm_installer.py +++ b/client/virt/kvm_installer.py @@ -654,6 +654,20 @@ class GitInstaller(SourceDirInstaller): 'make sync LINUX=%s' % self.kernel.srcdir, 'make'] + self.spice_protocol = GitRepo(installer=self, prefix='spice_protocol', + srcdir='spice-protocol', + build_steps= ['./autogen.sh', + './configure --prefix=%s' % self.prefix, + 'make clean', + 'make -j %s' % (make_jobs), + 'make install']) + + self.spice = GitRepo(installer=self, prefix='spice', srcdir='spice', + build_steps= ['PKG_CONFIG_PATH="%s/lib/pkgconfig:%s/share/pkgconfig" CXXFLAGS=-Wl,--add-needed ./autogen.sh --prefix=%s' % (self.prefix, self.prefix, self.prefix), + 'make clean', + 'make -j %s' % (make_jobs), + 'make install']) + self.userspace = GitRepo(installer=self, prefix='user', repo_param='user_git_repo', srcdir='kvm_userspace') @@ -673,7 +687,7 @@ class GitInstaller(SourceDirInstaller): logging.error(message) raise error.TestError(message) - for repo in [self.userspace, self.kernel, self.kmod]: + for repo in [self.userspace, self.kernel, self.kmod, self.spice_protocol, self.spice]: if not repo.repo: continue repo.fetch_and_patch() @@ -686,6 +700,13 @@ class GitInstaller(SourceDirInstaller): logging.info('Building KVM modules') self.kernel.build() + if self.spice_protocol.repo: + logging.info('Building Spice-protocol') + self.spice_protocol.build() + + if self.spice.repo: + logging.info('Building Spice') + self.spice.build() logging.info('Building KVM userspace code') self.userspace.build()