Accepting request 535821 from Virtualization

1

OBS-URL: https://build.opensuse.org/request/show/535821
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2017-10-23 14:52:32 +00:00 committed by Git OBS Bridge
parent 4563c48aa2
commit 7c6c677eb1
3 changed files with 66 additions and 0 deletions

View File

@ -0,0 +1,58 @@
From 7d73af5637de41f1e53b8f1ef2ea9baf76842dfb Mon Sep 17 00:00:00 2001
From: Jehiah Czebotar <jehiah@gmail.com>
Date: Fri, 8 Sep 2017 15:00:17 -0400
Subject: [PATCH] Virtualbox 5.2 support
---
plugins/providers/virtualbox/driver/meta.rb | 1 +
plugins/providers/virtualbox/driver/version_5_2.rb | 16 ++++++++++++++++
plugins/providers/virtualbox/plugin.rb | 1 +
3 files changed, 18 insertions(+)
create mode 100644 plugins/providers/virtualbox/driver/version_5_2.rb
diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb
index 0dd186d8c7..ec457a866a 100644
--- a/plugins/providers/virtualbox/driver/meta.rb
+++ b/plugins/providers/virtualbox/driver/meta.rb
@@ -62,6 +62,7 @@ def initialize(uuid=nil)
"4.3" => Version_4_3,
"5.0" => Version_5_0,
"5.1" => Version_5_1,
+ "5.2" => Version_5_2,
}
if @@version.start_with?("4.2.14")
diff --git a/plugins/providers/virtualbox/driver/version_5_2.rb b/plugins/providers/virtualbox/driver/version_5_2.rb
new file mode 100644
index 0000000000..cd6c0b6c5c
--- /dev/null
+++ b/plugins/providers/virtualbox/driver/version_5_2.rb
@@ -0,0 +1,16 @@
+require File.expand_path("../version_5_1", __FILE__)
+
+module VagrantPlugins
+ module ProviderVirtualBox
+ module Driver
+ # Driver for VirtualBox 5.2.x
+ class Version_5_2 < Version_5_1
+ def initialize(uuid)
+ super
+
+ @logger = Log4r::Logger.new("vagrant::provider::virtualbox_5_2")
+ end
+ end
+ end
+ end
+end
diff --git a/plugins/providers/virtualbox/plugin.rb b/plugins/providers/virtualbox/plugin.rb
index 399747a6a2..090bc50616 100644
--- a/plugins/providers/virtualbox/plugin.rb
+++ b/plugins/providers/virtualbox/plugin.rb
@@ -57,6 +57,7 @@ module Driver
autoload :Version_4_3, File.expand_path("../driver/version_4_3", __FILE__)
autoload :Version_5_0, File.expand_path("../driver/version_5_0", __FILE__)
autoload :Version_5_1, File.expand_path("../driver/version_5_1", __FILE__)
+ autoload :Version_5_2, File.expand_path("../driver/version_5_2", __FILE__)
end
module Model

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Oct 22 19:00:05 UTC 2017 - robert.munteanu@gmail.com
- Added upstream patch 0010-virtualbox-5.2-support.patch to allow
running with upcoming Virtualbox 5.2
-------------------------------------------------------------------
Thu Sep 28 13:38:17 UTC 2017 - dimstar@opensuse.org

View File

@ -43,6 +43,7 @@ Patch4: 0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch
Patch6: 0006-Relax-dependency-resolution.patch
Patch8: 0008-Read-data-from-usr-share-vagrant.patch
Patch9: 0009-plugins-don-t-abuse-require_relative.patch
Patch10: 0010-virtualbox-5.2-support.patch
#
#
# try building with ruby2.4
@ -162,6 +163,7 @@ Optional dependency offering bash completion for vagrant
%patch6 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
#
#
#