Hello community,
here is the log from the commit of package yast2-vm
checked in at Sat Oct 25 11:19:17 CEST 2008.
--------
--- arch/i386/yast2-vm/yast2-vm.changes 2008-10-09 21:13:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-vm/yast2-vm.changes 2008-10-24 22:28:02.745500000 +0200
@@ -1,0 +2,6 @@
+Wed Oct 22 16:34:20 MDT 2008 - carnold@novell.com
+
+- bnc#436987 - yast2-vm: Cannot create VMs if XEN installation
+ happens via the yast2-vm module
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-vm-2.16.6.tar.bz2
New:
----
yast2-vm-2.16.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.Z14674/_old 2008-10-25 11:18:33.000000000 +0200
+++ /var/tmp/diff_new_pack.Z14674/_new 2008-10-25 11:18:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-vm (Version 2.16.6)
+# spec file for package yast2-vm (Version 2.16.7)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-vm
-Version: 2.16.6
+Version: 2.16.7
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-vm-2.16.6.tar.bz2
+Source0: yast2-vm-2.16.7.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2
@@ -41,7 +41,7 @@
Michael G. Fritch
%prep
-%setup -n yast2-vm-2.16.6
+%setup -n yast2-vm-2.16.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,9 @@
%{prefix}/share/applications/YaST2/xen.desktop
%doc %{prefix}/share/doc/packages/yast2-vm
%changelog
+* Wed Oct 22 2008 carnold@novell.com
+- bnc#436987 - yast2-vm: Cannot create VMs if XEN installation
+ happens via the yast2-vm module
* Thu Oct 09 2008 carnold@novell.com
- Install virt-viewer as one of the GUI packages needed by xen.
* Fri May 16 2008 jsrain@suse.cz
++++++ yast2-vm-2.16.6.tar.bz2 -> yast2-vm-2.16.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.16.6/configure new/yast2-vm-2.16.7/configure
--- old/yast2-vm-2.16.6/configure 2008-09-22 23:46:57.000000000 +0200
+++ new/yast2-vm-2.16.7/configure 2008-10-24 22:28:48.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-vm 2.16.5.
+# Generated by GNU Autoconf 2.59 for yast2-vm 2.16.7.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,13 +269,13 @@
# Identity of this package.
PACKAGE_NAME='yast2-vm'
PACKAGE_TARNAME='yast2-vm'
-PACKAGE_VERSION='2.16.5'
-PACKAGE_STRING='yast2-vm 2.16.5'
+PACKAGE_VERSION='2.16.7'
+PACKAGE_STRING='yast2-vm 2.16.7'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
ac_default_prefix=/usr
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YCPDOC YCPMAKEDEP YCPC LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT Y2DEVTOOLS_PREFIX CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YCPDOC YCPMAKEDEP YCPC LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -728,7 +728,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.16.5 to adapt to many kinds of systems.
+\`configure' configures yast2-vm 2.16.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-vm 2.16.5:";;
+ short | recursive ) echo "Configuration of yast2-vm 2.16.7:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-vm configure 2.16.5
+yast2-vm configure 2.16.7
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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.16.5, which was
+It was created by yast2-vm $as_me 2.16.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-vm'
- VERSION='2.16.5'
+ VERSION='2.16.7'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.16.5"
+VERSION="2.16.7"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak "
@@ -2107,6 +2107,8 @@
{ (exit 1); exit 1; }; }
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -2282,6 +2284,33 @@
echo "$as_me: error: ycpc is not installed" >&2;}
{ (exit 1); exit 1; }; }
fi
+as_ac_File=`echo "ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5
+echo $ECHO_N "checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "$devtools_yast2dir/data/testsuite/Makefile.testsuite"; then
+ eval "$as_ac_File=yes"
+else
+ eval "$as_ac_File=no"
+fi
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+ :
+else
+
+ { echo "$as_me:$LINENO: WARNING: yast2-testsuite.rpm is not installed" >&5
+echo "$as_me: WARNING: yast2-testsuite.rpm is not installed" >&2;}
+
+fi
+
( cd control;
@@ -2700,7 +2729,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-vm $as_me 2.16.5, which was
+This file was extended by yast2-vm $as_me 2.16.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2755,7 +2784,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-vm config.status 2.16.5
+yast2-vm config.status 2.16.7
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -3005,6 +3034,7 @@
s,@LN_S@,$LN_S,;t t
s,@PKG_CONFIG_PATH@,$PKG_CONFIG_PATH,;t t
s,@XGETTEXT@,$XGETTEXT,;t t
+s,@Y2DEVTOOLS_PREFIX@,$Y2DEVTOOLS_PREFIX,;t t
s,@CREATE_PKGCONFIG_TRUE@,$CREATE_PKGCONFIG_TRUE,;t t
s,@CREATE_PKGCONFIG_FALSE@,$CREATE_PKGCONFIG_FALSE,;t t
s,@CREATE_PKGCONFIG_NOARCH_TRUE@,$CREATE_PKGCONFIG_NOARCH_TRUE,;t t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.16.6/configure.in new/yast2-vm-2.16.7/configure.in
--- old/yast2-vm-2.16.6/configure.in 2008-09-22 23:46:52.000000000 +0200
+++ new/yast2-vm-2.16.7/configure.in 2008-10-24 22:28:43.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-vm
dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-vm, 2.16.5, http://bugs.opensuse.org/, yast2-vm)
+AC_INIT(yast2-vm, 2.16.7, http://bugs.opensuse.org/, yast2-vm)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.16.5"
+VERSION="2.16.7"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak "
@@ -110,6 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -142,6 +144,9 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
( cd control;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.16.6/doc/autodocs/Makefile.in new/yast2-vm-2.16.7/doc/autodocs/Makefile.in
--- old/yast2-vm-2.16.6/doc/autodocs/Makefile.in 2008-09-22 23:46:58.000000000 +0200
+++ new/yast2-vm-2.16.7/doc/autodocs/Makefile.in 2008-10-24 22:28:49.000000000 +0200
@@ -103,6 +103,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.16.6/doc/Makefile.in new/yast2-vm-2.16.7/doc/Makefile.in
--- old/yast2-vm-2.16.6/doc/Makefile.in 2008-09-22 23:46:58.000000000 +0200
+++ new/yast2-vm-2.16.7/doc/Makefile.in 2008-10-24 22:28:49.000000000 +0200
@@ -115,6 +115,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.16.6/Makefile.am new/yast2-vm-2.16.7/Makefile.am
--- old/yast2-vm-2.16.6/Makefile.am 2008-09-22 23:46:52.000000000 +0200
+++ new/yast2-vm-2.16.7/Makefile.am 2008-10-24 22:28:43.000000000 +0200
@@ -7,8 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -34,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -67,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.16.6/Makefile.am.common new/yast2-vm-2.16.7/Makefile.am.common
--- old/yast2-vm-2.16.6/Makefile.am.common 2008-09-22 23:46:52.000000000 +0200
+++ new/yast2-vm-2.16.7/Makefile.am.common 2008-10-24 22:28:43.000000000 +0200
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.16.6/Makefile.in new/yast2-vm-2.16.7/Makefile.in
--- old/yast2-vm-2.16.6/Makefile.in 2008-09-22 23:46:59.000000000 +0200
+++ new/yast2-vm-2.16.7/Makefile.in 2008-10-24 22:28:49.000000000 +0200
@@ -135,6 +135,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = $(shell cat $(srcdir)/VERSION)
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
@@ -197,15 +198,14 @@
ystartupdir = @ystartupdir@
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS)
ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
@@ -216,7 +216,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
CLEANFILES =
MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec
@@ -705,7 +705,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in
+@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in config.status
@CREATE_PKGCONFIG_TRUE@ ./config.status --file=$@:$<
dist-hook:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.16.6/src/Makefile.in new/yast2-vm-2.16.7/src/Makefile.in
--- old/yast2-vm-2.16.6/src/Makefile.in 2008-09-22 23:46:59.000000000 +0200
+++ new/yast2-vm-2.16.7/src/Makefile.in 2008-10-24 22:28:49.000000000 +0200
@@ -116,6 +116,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
@@ -203,6 +204,7 @@
# where ycpchook contains a symlink to "."
# Otherwise "." keeps being newer than .dep and we loop.
NEWDEP = ${top_builddir}/.dep.new
+CHECK_SYNTAX = true
all: all-am
.SUFFIXES:
@@ -467,9 +469,19 @@
rm ${NEWDEP}
dist-hook: check-syntax
-
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.16.6/src/VM_XEN.ycp new/yast2-vm-2.16.7/src/VM_XEN.ycp
--- old/yast2-vm-2.16.6/src/VM_XEN.ycp 2008-10-09 21:10:34.000000000 +0200
+++ new/yast2-vm-2.16.7/src/VM_XEN.ycp 2008-10-24 22:28:13.000000000 +0200
@@ -24,7 +24,7 @@
* Authors: Ladislav Slezak
* Michael G. Fritch
*
- * $Id: VM_XEN.ycp 52065 2008-10-09 19:10:33Z charlesa $
+ * $Id: VM_XEN.ycp 52543 2008-10-24 20:16:24Z charlesa $
*/
{
@@ -41,8 +41,11 @@
import "Report";
import "SuSEFirewall";
import "Wizard";
+ import "Label";
+ string net_path = "/sys/class/net/";
+
global boolean ConfigureFirewall() {
y2milestone("VM_XEN::ConfigureFirewall() started");
boolean ret = true;
@@ -149,11 +152,14 @@
// progress stage 1/2
_("Verify Installed Packages"),
// progress stage 2/2
- // _("Firewall Configuration")
+ _("Network Bridge Configuration")
];
list progress_descriptions = [];
+ boolean bridge_exists = false;
+ string bridge_path = "";
+
integer progress_length = size(progress_stages);
// Headline for management domain installation
@@ -189,6 +195,8 @@
boolean inst_gui = true;
+ y2milestone("VM_XEN::ConfigureDom0 Checking for packages...");
+
// Assume python gtk is installed. If in text mode we don't care
if (UI::GetDisplayInfo()["TextMode"]:true == true) {
inst_gui = Popup::YesNo (_("Running in text mode. Install graphical components anyway?"));
@@ -215,6 +223,37 @@
}
}
+ // Default Bridge stage
+ Progress::NextStage();
+
+ Progress::Title(_("Configuring Default Network Bridge..."));
+
+ // Check for the existance of /sys/class/net/*/bridge
+ list<string> interfaces = (list<string>)SCR::Read(.target.dir, net_path);
+ // foreach (map i, interfaces, ``{
+ foreach (string i, interfaces, ``{
+ y2milestone("Checking for bridges...");
+ bridge_path = net_path + "/" + i + "/bridge";
+ if (SCR::Read(.target.dir, bridge_path) >= 0) {
+ y2milestone("Dom0 already has a configured bridge.");
+ bridge_exists = true;
+ break;
+ }
+ });
+
+ // Popup yes/no dialog
+ if ( bridge_exists == false ) {
+ if ( Popup::AnyQuestionRichText(_("Xen Network Bridge."),
+ _("<p>For normal network configurations, xen needs a network bridge.</p><p>Configure a default network bridge?</p>"),
+ 45, 5, Label::YesButton(), Label::NoButton(), `focus_yes) ) {
+ y2milestone("Configuring default bridge for Xen...");
+ WFM::call("lan_proposal", ["MakeProposal"]);
+ UI::OpenDialog(`VBox());
+ WFM::call("lan_proposal", ["Write"]);
+ UI::CloseDialog();
+ }
+ }
+
// Firewall stage - modify the firewall setting, add the xen bridge to FW_FORWARD_ALWAYS_INOUT_DEV
// Progress::NextStage();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.16.6/VERSION new/yast2-vm-2.16.7/VERSION
--- old/yast2-vm-2.16.6/VERSION 2008-09-22 23:48:02.000000000 +0200
+++ new/yast2-vm-2.16.7/VERSION 2008-10-24 22:28:14.000000000 +0200
@@ -1 +1 @@
-2.16.6
+2.16.7
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org