Changes - j0ke.net Open Build Service

Changes of Revision 4

[-] [+]	Changed	opennebula-driver-vmware.changes
@@ -1,7 +1,9 @@ ------------------------------------------------------------------- Fri Jul 8 22:18:02 UTC 2011 - cs@linux-administrator.com -- added vmwarelib patch to fix tty_expect path +- added vmware-vmwarelib.patch to fix tty_expect path +- added vmware-imRemotesVmwareRCfix.patch +- added vmware-vmwarerc.patch ------------------------------------------------------------------- Mon Jun 27 18:51:49 UTC 2011 - cs@linux-administrator.com
[-] [+]	Changed	opennebula-driver-vmware.spec ^
@@ -10,6 +10,8 @@ Source1: README-AFTER-SETUP Patch0: %{pkgname}-install.patch Patch1: %{pkgname}-vmwarelib.patch +Patch2: %{pkgname}-imRemotesVmwareRCfix.patch +Patch3: %{pkgname}-vmwarerc.patch BuildRequires: opennebula >= 2.2.0 Requires: opennebula >= 2.2.0 Requires: libvirt >= 0.8.3 @@ -22,6 +24,8 @@ %setup -n %{pkgname}-%{version} %patch0 %patch1 +%patch2 +%patch3 %build @@ -32,8 +36,12 @@ mkdir -p %{buildroot}%{_sysconfdir}/one mkdir -p %{buildroot}%{_datadir}/one/hooks mkdir -p %{buildroot}%{_prefix}/lib/one/tm_commands/vmware +mkdir -p %{buildroot}/var/lib/one/remotes/im +mkdir -p %{buildroot}/var/lib/one/remotes/vmm export DESTDIR=%{buildroot} install.sh +cp -aR %{_prefix}/lib/one/remotes/im/vmware.d %{buildroot}/var/lib/one/remotes/im/ +cp -aR %{_prefix}/lib/one/remotes/vmm/vmware %{buildroot}/var/lib/one/remotes/vmm/ %clean rm -rf %{buildroot} @@ -53,6 +61,8 @@ %dir %{_prefix}/lib/one/remotes/im/vmware.d %dir %{_prefix}/lib/one/remotes/vmm %dir %{_prefix}/lib/one/remotes/vmm/vmware +%dir /var/lib/one/remotes/im/vmware.d +%dir /var/lib/one/remotes/vmm/vmware %{_prefix}/lib/one/remotes/im/vmware.d/vmware.rb %{_prefix}/lib/one/remotes/vmm/vmware/cancel %{_prefix}/lib/one/remotes/vmm/vmware/checkpoint @@ -64,6 +74,15 @@ %{_prefix}/lib/one/remotes/vmm/vmware/shutdown %{_prefix}/lib/one/ruby/OpenNebula/ImageRepositoryVMware.rb %{_prefix}/lib/one/ruby/vmwarelib.rb +/var/lib/one/remotes/im/vmware.d/vmware.rb +/var/lib/one/remotes/vmm/vmware/cancel +/var/lib/one/remotes/vmm/vmware/checkpoint +/var/lib/one/remotes/vmm/vmware/deploy +/var/lib/one/remotes/vmm/vmware/migrate +/var/lib/one/remotes/vmm/vmware/poll +/var/lib/one/remotes/vmm/vmware/restore +/var/lib/one/remotes/vmm/vmware/save +/var/lib/one/remotes/vmm/vmware/shutdown %dir %{_prefix}/lib/one/tm_commands/vmware %{_prefix}/lib/one/tm_commands/vmware/tm_ln.sh %{_prefix}/lib/one/tm_commands/vmware/tm_mv.sh
[-] [+]	Added	vmware-imRemotesVmwareRCfix.patch ^
@@ -0,0 +1,22 @@ +--- im/remotes/vmware.rb.orig 2011-07-09 01:32:12.855567990 +0200 ++++ im/remotes/vmware.rb 2011-07-09 01:32:59.886148818 +0200 +@@ -4,8 +4,10 @@ + + if !ONE_LOCATION + RUBY_LIB_LOCATION="/usr/lib/one/ruby" ++ VMWARERC_LOCATION="/etc/one/vmwarerc" + else + RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby" ++ VMWARERC_LOCATION=ONE_LOCATION+"/etc/vmwarerc" + end + + $: << RUBY_LIB_LOCATION +@@ -58,7 +60,7 @@ + exit -1 + end + +-load ENV['ONE_LOCATION'] + "/etc/vmwarerc" ++load VMWARERC_LOCATION + + data = perform_action("virsh -c #{LIBVIRT_URI} --readonly nodeinfo") +
[-] [+]	Changed	vmware-vmwarelib.patch ^
@@ -1,12 +1,20 @@ --- lib/vmwarelib.rb.orig 2011-07-09 00:14:27.337368199 +0200 -+++ lib/vmwarelib.rb 2011-07-09 00:16:54.651760445 +0200 -@@ -28,9 +28,11 @@ ++++ lib/vmwarelib.rb 2011-07-09 01:55:45.499981783 +0200 +@@ -23,14 +23,16 @@ + # Set up the environment for the driver # + # ---------------------------------------------------------------------------- # + +-ONE_LOCATION = ENV["ONE_LOCATION"] ++#ONE_LOCATION = ENV["ONE_LOCATION"] + if !ONE_LOCATION - RUBY_LIB_LOCATION = "/usr/lib/one/ruby" +- RUBY_LIB_LOCATION = "/usr/lib/one/ruby" ++# RUBY_LIB_LOCATION = "/usr/lib/one/ruby" ETC_LOCATION = "/etc/one/" + BIN_LOCATION = "/usr/bin" else - RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby" +- RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby" ++# RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby" ETC_LOCATION = ONE_LOCATION + "/etc/" + BIN_LOCATION = ONE_LOCATION + "/bin" end
[-] [+]	Added	vmware-vmwarerc.patch ^
@@ -0,0 +1,19 @@ +--- share/vmwarerc.orig 2011-04-14 16:20:37.000000000 +0200 ++++ share/vmwarerc 2011-07-09 01:47:43.101155069 +0200 +@@ -30,7 +30,15 @@ + + # Loading the vmware library for mads + # Please leave this uncommented +-load ENV['ONE_LOCATION'] + "/lib/ruby/vmwarelib.rb" ++ONE_LOCATION=ENV["ONE_LOCATION"] ++ ++if !ONE_LOCATION ++ VMWARELIB = "/usr/lib/one/ruby/vmwarelib.rb" ++else ++ VMWARELIB = ONE_LOCATION + "/lib/ruby/vmwarelib.rb" ++end ++ ++load VMWARELIB + + ENV['LANG']='C' +