Skip to content

Commit f26929b

Browse files
committed
add kvm into rpm
1 parent f57f96f commit f26929b

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

build/build-cloud-plugins.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@
194194

195195
<!-- ===================== Hypervisors ========================= -->
196196

197-
<target name="compile-hypervisors" depends="compile-ovm, compile-xen" description="Compile all hypervisors"/>
198-
<target name="build-hypervisors" depends="build-ovm, build-xen " description="Builds all hypervisors"/>
197+
<target name="compile-hypervisors" depends="compile-kvm, compile-ovm, compile-xen" description="Compile all hypervisors"/>
198+
<target name="build-hypervisors" depends="build-kvm, build-ovm, build-xen " description="Builds all hypervisors"/>
199199

200200
<target name="compile-kvm" depends="-init, compile-core, compile-agent" description="Compile KVM">
201201
<ant antfile="${base.dir}/plugins/hypervisors/kvm/build.xml" target="build"/>

cloud.spec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,8 @@ fi
538538
%files agent-libs
539539
%defattr(0644,root,root,0755)
540540
%{_javadir}/%{name}-agent.jar
541+
%{_javadir}/%{name}-plugin-hypervisor-kvm.jar
542+
%{_javadir}/libvirt-0.4.8.jar
541543

542544
%files agent
543545
%defattr(0644,root,root,0755)

wscript_build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def build_dependences ():
162162

163163
start_path = bld.path.find_dir ("deps")
164164

165-
bld.install_files('${JAVADIR}',start_path.ant_glob(["commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar",
165+
bld.install_files('${JAVADIR}',start_path.ant_glob(["libvirt-0.4.8.jar", "commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar",
166166
"netscaler-1.0.jar", "netscaler-sdx-1.0.jar", "backport-util-concurrent-3.1.jar", "ehcache-1.5.0.jar", "httpcore-4.0.jar", "log4j-1.2.16.jar", "trilead-ssh2-build213-svnkit-1.3-patch.jar", "cglib-2.2.jar", "xmlrpc-common-3.*.jar",
167167
"xmlrpc-client-3.*.jar", "axis-1.4.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.46.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "commons-lang-2.6.jar", "mail-1.4.jar", "activation-1.1.jar", "mysql-connector-java-5.1.21.jar", "hibernate-jpa-2.0-api-1.0.0.Final.jar", "hibernate-entitymanager-3.5.1-Final.jar", "hibernate-core-3.5.1-Final.jar", "hibernate-commons-annotations-3.2.0.Final.jar", "hibernate-annotations-3.5.1-Final.jar", "asm-3.1.jar", "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path)
168168

0 commit comments

Comments
 (0)