Hello community,
here is the log from the commit of package yast2
checked in at Thu May 11 10:10:01 CEST 2006.
--------
--- yast2/yast2.changes 2006-05-04 14:22:01.000000000 +0200
+++ STABLE/yast2/yast2.changes 2006-05-11 09:45:58.000000000 +0200
@@ -1,0 +2,12 @@
+Thu May 11 09:23:29 CEST 2006 - lslezak@suse.cz
+
+- select kernel-xenpae package if Xen PAE kernel is running
+ (#172978)
+- 2.13.57
+
+-------------------------------------------------------------------
+Wed May 10 16:30:02 CEST 2006 - locilka@suse.cz
+
+- Added more logging into the Service.ycp module (for bug #173418)
+
+-------------------------------------------------------------------
Old:
----
yast2-2.13.56.tar.bz2
New:
----
yast2-2.13.57.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.jfGx2n/_old 2006-05-11 10:09:56.000000000 +0200
+++ /var/tmp/diff_new_pack.jfGx2n/_new 2006-05-11 10:09:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.13.56)
+# spec file for package yast2 (Version 2.13.57)
#
# 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
-Version: 2.13.56
+Version: 2.13.57
Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.13.56.tar.bz2
+Source0: yast2-2.13.57.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# Need the new file popups
@@ -93,7 +93,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.13.56
+%setup -n yast2-2.13.57
%build
%{prefix}/bin/y2tool y2autoconf
@@ -192,6 +192,12 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog -n yast2
+* Thu May 11 2006 - lslezak@suse.cz
+- select kernel-xenpae package if Xen PAE kernel is running
+ (#172978)
+- 2.13.57
+* Wed May 10 2006 - locilka@suse.cz
+- Added more logging into the Service.ycp module (for bug #173418)
* Thu May 04 2006 - jsrain@suse.cz
- read texts from control file (#170881)
- 2.13.56
++++++ yast2-2.13.56.tar.bz2 -> yast2-2.13.57.tar.bz2 ++++++
++++ 3112 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-2.13.56/Makefile.am new/yast2-2.13.57/Makefile.am
--- old/yast2-2.13.56/Makefile.am 2006-05-04 14:18:54.000000000 +0200
+++ new/yast2-2.13.57/Makefile.am 2006-02-27 14:11:19.000000000 +0100
@@ -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
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-2.13.56/Makefile.am.common new/yast2-2.13.57/Makefile.am.common
--- old/yast2-2.13.56/Makefile.am.common 2006-05-04 14:18:54.000000000 +0200
+++ new/yast2-2.13.57/Makefile.am.common 2006-02-27 14:11:19.000000000 +0100
@@ -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-2.13.56/VERSION new/yast2-2.13.57/VERSION
--- old/yast2-2.13.56/VERSION 2006-05-04 14:16:09.000000000 +0200
+++ new/yast2-2.13.57/VERSION 2006-05-11 09:23:11.000000000 +0200
@@ -1 +1 @@
-2.13.56
+2.13.57
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-2.13.56/configure.in new/yast2-2.13.57/configure.in
--- old/yast2-2.13.56/configure.in 2006-05-04 14:18:54.000000000 +0200
+++ new/yast2-2.13.57/configure.in 2006-02-27 14:11:18.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.13.56, http://www.suse.de/feedback, yast2)
+AC_INIT(yast2, 2.13.33, http://www.suse.de/feedback, yast2)
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.56"
+VERSION="2.13.33"
RPMNAME="yast2"
MAINTAINER="Stanislav Visnovsky "
@@ -120,8 +120,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)
@@ -148,6 +148,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
dnl Check packages expect and dejagnu
AC_PATH_PROG(MYEXPECT, expect, false)
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-2.13.56/library/modules/Version.ycp new/yast2-2.13.57/library/modules/Version.ycp
--- old/yast2-2.13.56/library/modules/Version.ycp 2006-05-04 14:19:23.000000000 +0200
+++ new/yast2-2.13.57/library/modules/Version.ycp 2006-05-11 09:30:30.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.13.56";
+global string yast2 = "2.13.57";
/* EOF */
}
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-2.13.56/library/runlevel/src/Service.ycp new/yast2-2.13.57/library/runlevel/src/Service.ycp
--- old/yast2-2.13.56/library/runlevel/src/Service.ycp 2006-05-03 11:03:51.000000000 +0200
+++ new/yast2-2.13.57/library/runlevel/src/Service.ycp 2006-05-11 09:20:49.000000000 +0200
@@ -6,7 +6,7 @@
* Petr Blahos
* Michal Svec
*
- * $Id: Service.ycp 29400 2006-03-27 08:26:00Z locilka $
+ * $Id: Service.ycp 30827 2006-05-10 14:31:35Z locilka $
*
* Functions for service (init script) handling used by other modules.
*/
@@ -321,13 +321,14 @@
time_spent = time_spent + sleep_step;
sleep(sleep_step);
}
- y2milestone("Time spent: %1 msec", time_spent);
// fetching the return code if not timed-out
if (cont_loop) {
return_code = (integer) SCR::Read(.background.status);
}
+ y2milestone("Time spent: %1 msecs, retcode: %2", time_spent, return_code);
+
// killing the process (if it still runs)
SCR::Execute(.background.kill, "");
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-2.13.56/library/system/src/Kernel.ycp new/yast2-2.13.57/library/system/src/Kernel.ycp
--- old/yast2-2.13.56/library/system/src/Kernel.ycp 2006-05-03 11:03:49.000000000 +0200
+++ new/yast2-2.13.57/library/system/src/Kernel.ycp 2006-05-11 09:30:03.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf
* Arvin Schnell
*
- * $Id: Kernel.ycp 29007 2006-03-15 15:15:40Z jsrain $
+ * $Id: Kernel.ycp 30844 2006-05-11 07:29:57Z lslezak $
*
* <ul>
* <li>determine kernel rpm</li>
@@ -361,7 +361,18 @@
else if (Arch::is_xen ())
{
y2milestone ("ProbeKernel: XEN");
- kernel_packages = ["kernel-xen"];
+
+ // use xenpae kernel package if xenpae kernel is currently running
+ boolean xenpae = false;
+
+ map output = (map)SCR::Execute(.target.bash_output, "uname -r");
+ if (output["exit"]:-1 == 0 && issubstring(output["stdout"]:"", "xenpae"))
+ {
+ xenpae = true;
+ y2milestone("Running Xen PAE kernel detected");
+ }
+
+ kernel_packages = (xenpae) ? ["kernel-xenpae"] : ["kernel-xen"];
}
else if (Arch::i386 ())
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...