Hello community,
here is the log from the commit of package yast2-vm
checked in at Fri Apr 7 12:03:33 CEST 2006.
--------
--- yast2-vm/yast2-vm.changes 2006-04-07 07:08:01.000000000 +0200
+++ yast2-vm/yast2-vm.changes 2006-04-07 08:38:59.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Apr 7 08:37:26 CEST 2006 - lslezak@suse.cz
+
+- don't modify bootloader configuration when confguring domain0,
+ it's modified by kernel-xen package (#163138)
+- 2.13.33
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-2.13.32.tar.bz2
New:
----
yast2-vm-2.13.33.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.HVWMzH/_old 2006-04-07 12:03:23.000000000 +0200
+++ /var/tmp/diff_new_pack.HVWMzH/_new 2006-04-07 12:03:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-vm (Version 2.13.32)
+# spec file for package yast2-vm (Version 2.13.33)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-vm
-Version: 2.13.32
+Version: 2.13.33
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-vm-2.13.32.tar.bz2
+Source0: yast2-vm-2.13.33.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 yast2-installation
@@ -32,7 +32,7 @@
Ladislav Slezak
%prep
-%setup -n yast2-vm-2.13.32
+%setup -n yast2-vm-2.13.33
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,10 @@
%doc %{prefix}/share/doc/packages/yast2-vm
%changelog -n yast2-vm
+* Fri Apr 07 2006 - lslezak@suse.cz
+- don't modify bootloader configuration when confguring domain0,
+ it's modified by kernel-xen package (#163138)
+- 2.13.33
* Thu Apr 06 2006 - mgfritch@novell.com
- Add dialog for managing virtual machines, similar to the
xm commands (xm list, xm create, xm destory, etc.)
++++++ yast2-vm-2.13.32.tar.bz2 -> yast2-vm-2.13.33.tar.bz2 ++++++
++++ 3757 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.32/Makefile.am new/yast2-vm-2.13.33/Makefile.am
--- old/yast2-vm-2.13.32/Makefile.am 2006-04-07 07:08:13.000000000 +0200
+++ new/yast2-vm-2.13.33/Makefile.am 2006-03-28 15:47:28.000000000 +0200
@@ -6,7 +6,8 @@
# (Edit ./SUBDIRS instead)
#
-PREFIX = /usr
+#where devtools are
+PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -30,6 +31,10 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
AUTOMAKE_OPTIONS = foreign dist-bzip2
+# where devtools instal m4 snippets
+# argh, executed literally
+#ACLOCAL_AMFLAGS = -I $(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
cmp -s $< $@ || cp -f $< $@
@@ -57,12 +62,8 @@
# info '(automake)Conditionals'
if CREATE_PKGCONFIG
-# pkg-config
-# if a package does not have its own pc, copy the generic one
-$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in
- test -f $@ || cp -p $< $@
# create the file here instead of by configure
-# because the prerequisite is made here
+# 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
@@ -153,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -198,6 +199,9 @@
false; \
fi
+check-textdomain:
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
@@ -210,4 +214,4 @@
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
-SUBDIRS = agents control doc src
+SUBDIRS = agents control doc src testsuite
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.32/Makefile.am.common new/yast2-vm-2.13.33/Makefile.am.common
--- old/yast2-vm-2.13.32/Makefile.am.common 2006-04-07 07:08:13.000000000 +0200
+++ new/yast2-vm-2.13.33/Makefile.am.common 2006-03-28 15:47:28.000000000 +0200
@@ -9,7 +9,7 @@
# suffix mapping: info '(make)Static Usage'
# apply only to our modules, not external ones
${ybcfiles}: %.ybc: %.ycp $(ycpchook)
- Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $<
+ Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $<
# files to clean
CLEANFILES = ${ybcfiles}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.32/VERSION new/yast2-vm-2.13.33/VERSION
--- old/yast2-vm-2.13.32/VERSION 2006-04-05 00:52:00.000000000 +0200
+++ new/yast2-vm-2.13.33/VERSION 2006-04-07 08:37:14.000000000 +0200
@@ -1 +1 @@
-2.13.32
+2.13.33
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.32/configure.in new/yast2-vm-2.13.33/configure.in
--- old/yast2-vm-2.13.32/configure.in 2006-04-07 07:08:13.000000000 +0200
+++ new/yast2-vm-2.13.33/configure.in 2006-03-28 15:47:27.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-vm, 2.13.32, http://www.suse.de/feedback, yast2-vm)
+AC_INIT(yast2-vm, 2.13.29, http://www.suse.de/feedback, 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.13.32"
+VERSION="2.13.29"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak "
@@ -110,8 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
-devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools`
-devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools`
+devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
+devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
dnl producing pkg-config for others?
AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x)
@@ -138,6 +138,10 @@
if test "$YCPMAKEDEP" = "false"; then
AC_MSG_ERROR([ycpmakedep is not installed])
fi
+AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir)
+if test "$YCPC" = "false"; then
+ AC_MSG_ERROR([ycpc is not installed])
+fi
( cd control;
@@ -151,7 +155,8 @@
control/Makefile
doc/autodocs/Makefile
doc/Makefile
-src/Makefile)
+src/Makefile
+testsuite/Makefile)
AC_OUTPUT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.32/src/dom0_setup.ycp new/yast2-vm-2.13.33/src/dom0_setup.ycp
--- old/yast2-vm-2.13.32/src/dom0_setup.ycp 2006-04-04 20:40:15.000000000 +0200
+++ new/yast2-vm-2.13.33/src/dom0_setup.ycp 2006-04-07 08:39:27.000000000 +0200
@@ -5,18 +5,15 @@
*
* Purpose: Configure domain0 (Xen management domain)
*
- * $Id: dom0_setup.ycp 29658 2006-04-04 13:06:24Z lslezak $
+ * $Id: dom0_setup.ycp 29853 2006-04-07 06:35:57Z lslezak $
*/
{
import "Package";
import "Progress";
import "Report";
- import "Bootloader";
- import "BootCommon";
import "Popup";
import "Wizard";
- import "Label";
textdomain "vm";
@@ -24,8 +21,6 @@
// progress stage
_("Install Packages"),
// progress stage
- _("Configure Boot Loader"),
- // progress stage
_("Firewall Configuration")
];
@@ -93,81 +88,6 @@
return `abort;
}
- // bootloader stage
- Progress::NextStage();
-
- // progressbar title - read bootloader settings
- Progress::Title(_("Reading boot loader configuration..."));
-
- // disable bootloader progress
- Progress::set(false);
- Bootloader::Read();
- Progress::set(true);
-
- // progressbar title - check whether GRUB or LILO is used as bootloader
- Progress::Title(_("Checking boot loader type..."));
-
- string loader_type = BootCommon::getLoaderType(false);
- string bootloader_changes = "";
-
- // false = don't recheck
- if (loader_type != "grub")
- {
- // progressbar title
- Progress::Title(_("Switching to GRUB boot loader..."));
-
- // set type to GRUB
- BootCommon::setLoaderType("grub");
- // summary text - item in the task list
- bootloader_changes = sformat(_("<LI>Switch to GRUB boot loader (current boot loader is '%1')</LI>"), loader_type);
- }
-
- // progressbar title - check if there is a Xen section
- Progress::Title(_("Searching for Xen section..."));
-
- // get all sections
- list sects = Bootloader::getSectionsList(`all);
- y2milestone("boot loader sections: %1", sects);
-
- if (!contains(sects, "xen") && !contains(sects, "XEN"))
- {
- // progressbar title - add missing Xen section to bootloader configuration
- Progress::Title(_("Adding Xen section..."));
- BootCommon::sections = add(BootCommon::sections, BootCommon::CreateLinuxSection("xen"));
- sects = Bootloader::getSectionsList(`all);
- y2milestone("boot loader sections: %1", sects);
- // summary text - item in the task list
- bootloader_changes = bootloader_changes + _("<LI>Add Xen section to the boot loader menu</LI>");
- }
-
- // confirm bootloader installation - dialog header
- if (bootloader_changes != "")
- {
- // progressbar title - write the modified bootloader configuration
- Progress::Title(_("Saving the boot loader configuration..."));
-
- bootloader_changes = bootloader_changes + _("<LI>Activate the new configuration</LI>");
-
- if (Popup::AnyQuestionRichText(_("Update of the Boot Loader Configuration"),
- sformat(_("<P><B>These actions will be performed:</B><UL>%1</UL></P>"), bootloader_changes),
- 60, 10, Label::ContinueButton(), Label::CancelButton(), `yes_focus))
- {
- // progressbar title - write the modified bootloader configuration
- Progress::Title(_("Writing boot loader configuration..."));
-
- Progress::set(false);
- BootCommon::location_changed = true;
- BootCommon::changed = true;
- success = Bootloader::Write();
- Progress::set(true);
-
- if (!success)
- {
- Report::Error(error);
- }
- }
- }
-
// 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 --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.32/testsuite/Makefile.am new/yast2-vm-2.13.33/testsuite/Makefile.am
--- old/yast2-vm-2.13.32/testsuite/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-vm-2.13.33/testsuite/Makefile.am 2005-01-21 18:45:40.000000000 +0100
@@ -0,0 +1,21 @@
+#
+# Makefile.am for .../testsuite
+#
+# Do not edit this file (Makefile.am) as it will be overwritten!
+#
+
+AUTOMAKE_OPTIONS = dejagnu
+EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh)
+
+testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite
+
+all-local: $(testsuite_prepare)
+ make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir)
+
+clean-local: $(testsuite_prepare)
+ make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean
+
+check-local: $(testsuite_prepare)
+ make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check
+
+# EOF
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...