NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix misc build problems due to new drivers

Browse Source 
* autobuild.sh: Disable esx/phyp build on mingw32
* configure.in: Fix handling of --without-phyp so it actually works
* libvirt.spec.in: Add missing interface.rng
* mingw32-libvirt.spec.in: Disable phyp/esx drivers
* src/phyp/phyp_driver.c: Fix missing i18n of error messages
This commit is contained in:
Daniel P. Berrange 2009-07-24 17:20:50 +01:00
parent 41e097e91a
commit 484640eaf6
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autobuild.sh
View File

@ -77,6 +77,8 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then
--without-vbox \ --without-vbox \
--without-openvz \ --without-openvz \
--without-one \ --without-one \
--without-phyp \
--without-esx \
--without-libvirtd --without-libvirtd
make make

2
configure.in
View File

@ -190,7 +190,7 @@ AC_ARG_WITH([openvz],
AC_ARG_WITH([libssh], AC_ARG_WITH([libssh],
[ --with-libssh=[PFX] libssh location],[],[with_libssh=yes]) [ --with-libssh=[PFX] libssh location],[],[with_libssh=yes])
AC_ARG_WITH([phyp], AC_ARG_WITH([phyp],
[ --with-phyp=[PFX] add PHYP support (on)],[with_phyp=yes],[with_phyp=check]) [ --with-phyp=[PFX] add PHYP support (on)],[],[with_phyp=check])
AC_ARG_WITH([vbox], AC_ARG_WITH([vbox],
[ --with-vbox add VirtualBox support (on)],[],[with_vbox=yes]) [ --with-vbox add VirtualBox support (on)],[],[with_vbox=yes])
AC_ARG_WITH([lxc], AC_ARG_WITH([lxc],

1
libvirt.spec.in
View File

@ -528,6 +528,7 @@ fi
%{_datadir}/libvirt/schemas/storagevol.rng %{_datadir}/libvirt/schemas/storagevol.rng
%{_datadir}/libvirt/schemas/nodedev.rng %{_datadir}/libvirt/schemas/nodedev.rng
%{_datadir}/libvirt/schemas/capability.rng %{_datadir}/libvirt/schemas/capability.rng
%{_datadir}/libvirt/schemas/interface.rng
%if %{with_sasl} %if %{with_sasl}
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf

2
mingw32-libvirt.spec.in
View File

@ -53,6 +53,8 @@ MinGW Windows libvirt virtualization library.
--without-vbox \ --without-vbox \
--without-openvz \ --without-openvz \
--without-one \ --without-one \
--without-phyp \
--without-esx \
--without-libvirtd --without-libvirtd
make make

8
src/phyp/phyp_driver.c
View File

@ -221,8 +221,8 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth)
password = creds[0].result; password = creds[0].result;
else { else {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s : %s", VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
"Unable to get password certificate.", _("Unable to get password certificate: %s"),
ssh_get_error(session)); ssh_get_error(session));
ssh_disconnect(session); ssh_disconnect(session);
goto err; goto err;
@ -235,8 +235,8 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth)
if (auth_check != SSH_AUTH_SUCCESS) { if (auth_check != SSH_AUTH_SUCCESS) {
virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP, virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP,
VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s : %s", VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
"Authentication failed.", _("Authentication failed: %s"),
ssh_get_error(session)); ssh_get_error(session));
ssh_disconnect(session); ssh_disconnect(session);
goto err; goto err;