Hello community,
here is the log from the commit of package yast2-vm for openSUSE:Factory
checked in at 2013-04-03 13:10:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-vm (Old)
and /work/SRC/openSUSE:Factory/.yast2-vm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-vm", Maintainer is "lsle...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-vm/yast2-vm.changes 2013-02-10
15:24:59.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-vm.new/yast2-vm.changes 2013-04-03
13:10:40.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Mar 22 15:55:57 MDT 2013 - carn...@suse.com
+
+- bnc#810535 - YaST2 is lacking hypervisor installation support on
+ s390x
+- 2.22.5
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-2.22.4.tar.bz2
New:
----
yast2-vm-2.22.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.Xkk8kN/_old 2013-04-03 13:10:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Xkk8kN/_new 2013-04-03 13:10:41.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-vm
-Version: 2.22.4
+Version: 2.22.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -63,7 +63,7 @@
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
-%ifarch %ix86 s390x
+%ifarch %ix86
rm -f $RPM_BUILD_ROOT/usr/share/applications/YaST2/xen.desktop
rm -f $RPM_BUILD_ROOT/usr/share/applications/YaST2/relocation-server.desktop
%endif
@@ -83,7 +83,7 @@
/usr/share/YaST2/include/*
/usr/share/YaST2/scrconf/*
%{_prefix}/share/applications/YaST2/groups/virtualization.desktop
-%ifarch x86_64
+%ifnarch %ix86
%{_prefix}/share/applications/YaST2/relocation-server.desktop
%{_prefix}/share/applications/YaST2/xen.desktop
%endif
++++++ yast2-vm-2.22.4.tar.bz2 -> yast2-vm-2.22.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-vm-2.22.4/VERSION new/yast2-vm-2.22.5/VERSION
--- old/yast2-vm-2.22.4/VERSION 2013-02-08 23:01:36.000000000 +0100
+++ new/yast2-vm-2.22.5/VERSION 2013-03-22 22:56:34.000000000 +0100
@@ -1 +1 @@
-2.22.4
+2.22.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-vm-2.22.4/configure
new/yast2-vm-2.22.5/configure
--- old/yast2-vm-2.22.4/configure 2013-02-08 23:01:47.000000000 +0100
+++ new/yast2-vm-2.22.5/configure 2013-03-26 18:00:13.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-vm 2.22.4.
+# Generated by GNU Autoconf 2.69 for yast2-vm 2.22.5.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-vm'
PACKAGE_TARNAME='yast2-vm'
-PACKAGE_VERSION='2.22.4'
-PACKAGE_STRING='yast2-vm 2.22.4'
+PACKAGE_VERSION='2.22.5'
+PACKAGE_STRING='yast2-vm 2.22.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1247,7 +1247,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-vm 2.22.4 to adapt to many kinds of systems.
+\`configure' configures yast2-vm 2.22.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1318,7 +1318,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-vm 2.22.4:";;
+ short | recursive ) echo "Configuration of yast2-vm 2.22.5:";;
esac
cat <<\_ACEOF
@@ -1398,7 +1398,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-vm configure 2.22.4
+yast2-vm configure 2.22.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1415,7 +1415,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-vm $as_me 2.22.4, which was
+It was created by yast2-vm $as_me 2.22.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2354,7 +2354,7 @@
# Define the identity of the package.
PACKAGE='yast2-vm'
- VERSION='2.22.4'
+ VERSION='2.22.5'
cat >>confdefs.h <<_ACEOF
@@ -2477,7 +2477,7 @@
-VERSION="2.22.4"
+VERSION="2.22.5"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
@@ -3410,7 +3410,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-vm $as_me 2.22.4, which was
+This file was extended by yast2-vm $as_me 2.22.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3463,7 +3463,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-vm config.status 2.22.4
+yast2-vm config.status 2.22.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-vm-2.22.4/configure.in
new/yast2-vm-2.22.5/configure.in
--- old/yast2-vm-2.22.4/configure.in 2013-02-08 23:01:42.000000000 +0100
+++ new/yast2-vm-2.22.5/configure.in 2013-03-26 18:00:09.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-vm, 2.22.4, http://bugs.opensuse.org/, yast2-vm)
+AC_INIT(yast2-vm, 2.22.5, http://bugs.opensuse.org/, yast2-vm)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.22.4"
+VERSION="2.22.5"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-vm-2.22.4/src/VM_XEN.ycp
new/yast2-vm-2.22.5/src/VM_XEN.ycp
--- old/yast2-vm-2.22.4/src/VM_XEN.ycp 2013-02-08 23:01:36.000000000 +0100
+++ new/yast2-vm-2.22.5/src/VM_XEN.ycp 2013-03-22 22:56:34.000000000 +0100
@@ -141,7 +141,7 @@
}
- global boolean ConfigureDom0() {
+ global boolean ConfigureDom0(boolean is_s390) {
list <string> progress_stages = [
// progress stage 1/2
@@ -177,17 +177,32 @@
string abortmsg = _("The installation will be aborted.");
// Generate a pop dialog to allow user selection of Xen or KVM
- UI::OpenDialog(
- `VBox(
- `Label(_("Select the virtualization platform to install.")),
- `Left(`CheckBox(`id(`xen), "Xen")),
- `Left(`CheckBox(`id(`kvm), "KVM")),
- `ButtonBox(
- `PushButton(`id(`accept), Label::AcceptButton() ),
- `PushButton(`id(`cancel), Label::CancelButton() )
+ if ( is_s390 == true ) {
+ UI::OpenDialog(
+ `VBox(
+ `Label(_("Select the virtualization platform to install.")),
+ `Left(`CheckBox(`id(`xen), `opt(`disabled), "Xen")),
+ `Left(`CheckBox(`id(`kvm), "KVM")),
+ `ButtonBox(
+ `PushButton(`id(`accept), Label::AcceptButton() ),
+ `PushButton(`id(`cancel), Label::CancelButton() )
+ )
)
- )
- );
+ );
+ }
+ else {
+ UI::OpenDialog(
+ `VBox(
+ `Label(_("Select the virtualization platform to install.")),
+ `Left(`CheckBox(`id(`xen), "Xen")),
+ `Left(`CheckBox(`id(`kvm), "KVM")),
+ `ButtonBox(
+ `PushButton(`id(`accept), Label::AcceptButton() ),
+ `PushButton(`id(`cancel), Label::CancelButton() )
+ )
+ )
+ );
+ }
widget_id = UI::UserInput();
if ( widget_id == `accept ) {
@@ -304,7 +319,7 @@
}
// Enable the libvirtd daemon if openSUSE
- if ( isOpenSuse() == true ) {
+ if ( isOpenSuse() == true ) {
string cmd = "systemctl enable libvirtd.service";
y2milestone("Executing: %1", cmd);
SCR::Execute(.target.bash, cmd);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-vm-2.22.4/src/relocation-server.ycp
new/yast2-vm-2.22.5/src/relocation-server.ycp
--- old/yast2-vm-2.22.4/src/relocation-server.ycp 2013-01-22
12:19:53.000000000 +0100
+++ new/yast2-vm-2.22.5/src/relocation-server.ycp 2013-03-22
22:56:34.000000000 +0100
@@ -61,7 +61,7 @@
y2milestone("Checking for Xen installation");
// check the dom0 configuration...
- ret = ret && VM_XEN::ConfigureDom0();
+ ret = ret && VM_XEN::ConfigureDom0(Arch::s390_64());
if (ret == false) return false;
y2milestone("CheckConfiguration returned: %1", ret);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-vm-2.22.4/src/xen.ycp
new/yast2-vm-2.22.5/src/xen.ycp
--- old/yast2-vm-2.22.4/src/xen.ycp 2013-01-22 12:19:53.000000000 +0100
+++ new/yast2-vm-2.22.5/src/xen.ycp 2013-03-22 22:56:34.000000000 +0100
@@ -53,17 +53,23 @@
boolean CheckConfiguration() {
boolean ret = true;
+ boolean is_s390 = false;
// check whether VM can be started (cannot start a vm using UML)
if ( VM_XEN::isUML() ) return false;
- // we now only support 64 bit hosts
- if ( VM_XEN::isX86_64() == false ) return false;
+ // s390 is technical preview and we only fully support x86_64
+ if ( Arch::s390_64() == true ) {
+ is_s390 = true;
+ }
+ else if ( VM_XEN::isX86_64() == false ) {
+ return false;
+ }
y2milestone("Checking for Xen installation");
// check the dom0 configuration...
- ret = ret && VM_XEN::ConfigureDom0();
+ ret = ret && VM_XEN::ConfigureDom0(is_s390);
if (ret == false) return false;
y2milestone("CheckConfiguration returned: %1", ret);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
