Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Wed Jul 29 17:58:21 CEST 2009. -------- --- yast2/yast2.changes 2009-07-16 14:19:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2009-07-29 14:51:34.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 29 14:44:48 CEST 2009 - jsrain@suse.cz + +- select kernel-desktop by default if exists +- 2.18.22 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.18.21.tar.bz2 New: ---- yast2-2.18.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.6BeBpB/_old 2009-07-29 17:57:24.000000000 +0200 +++ /var/tmp/diff_new_pack.6BeBpB/_new 2009-07-29 17:57:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.18.21) +# spec file for package yast2 (Version 2.18.22) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2 -Version: 2.18.21 +Version: 2.18.22 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.18.21.tar.bz2 +Source0: yast2-2.18.22.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -109,7 +109,7 @@ installation with YaST2. %prep -%setup -n yast2-2.18.21 +%setup -n yast2-2.18.22 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.18.21.tar.bz2 -> yast2-2.18.22.tar.bz2 ++++++ ++++ 5842 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.18.21/VERSION new/yast2-2.18.22/VERSION --- old/yast2-2.18.21/VERSION 2009-07-16 14:17:12.000000000 +0200 +++ new/yast2-2.18.22/VERSION 2009-07-29 14:44:45.000000000 +0200 @@ -1 +1 @@ -2.18.21 +2.18.22 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.18.21/configure.in new/yast2-2.18.22/configure.in --- old/yast2-2.18.21/configure.in 2009-07-16 14:17:27.000000000 +0200 +++ new/yast2-2.18.22/configure.in 2009-07-29 14:45:53.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.18.21, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.18.22, http://bugs.opensuse.org/, yast2) 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.18.21" +VERSION="2.18.22" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" 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.18.21/library/modules/Version.ycp new/yast2-2.18.22/library/modules/Version.ycp --- old/yast2-2.18.21/library/modules/Version.ycp 2009-07-16 14:17:36.000000000 +0200 +++ new/yast2-2.18.22/library/modules/Version.ycp 2009-07-29 14:46:09.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.18.21"; +global string yast2 = "2.18.22"; /* 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.18.21/library/system/src/Kernel.ycp new/yast2-2.18.22/library/system/src/Kernel.ycp --- old/yast2-2.18.21/library/system/src/Kernel.ycp 2009-06-01 12:30:03.000000000 +0200 +++ new/yast2-2.18.22/library/system/src/Kernel.ycp 2009-07-29 14:45:37.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Klaus Kaempf <kkaempf@suse.de> * Arvin Schnell <arvin@suse.de> * - * $Id: Kernel.ycp 57325 2009-05-26 17:03:58Z juhliarik $ + * $Id: Kernel.ycp 58202 2009-07-29 12:45:13Z jsrain $ * * <ul> * <li>determine kernel rpm</li> @@ -91,6 +91,7 @@ */ map<string, string> fallbacks = $[ "kernel-pae" : "kernel-default", + "kernel-desktop" : "kernel-default", // fallback for PPC (#302246) "kernel-iseries64" : "kernel-ppc64" ]; @@ -352,6 +353,11 @@ */ global define void ProbeKernel () { + boolean kernel_desktop_exists = + ((Mode::normal () || Mode::repair()) && Pkg::PkgInstalled("kernel-desktop")) || + Pkg::PkgAvailable("kernel-desktop"); + y2milestone ("Desktop kernel available: %1", kernel_desktop_exists); + kernel_packages = ["kernel-default"]; // add Xen paravirtualized drivers to a full virtualized host @@ -400,13 +406,26 @@ if ((memsize >= fourGB || contains (cpuflags, "nx")) && contains (cpuflags, "pae")) { y2milestone ("Kernel switch: PAE detected"); - kernel_packages = ["kernel-pae"]; + if (kernel_desktop_exists && true) { // FIXME: check whether it is really desktop + kernel_packages = ["kernel-desktop"]; - // add PV drivers - if (xen) + // add PV drivers + if (xen) + { + y2milestone("Adding Xen PV drivers: xen-kmp-desktop"); + kernel_packages = add(kernel_packages, "xen-kmp-desktop"); + } + } + else { - y2milestone("Adding Xen PV drivers: xen-kmp-pae"); - kernel_packages = add(kernel_packages, "xen-kmp-pae"); + kernel_packages = ["kernel-pae"]; + + // add PV drivers + if (xen) + { + y2milestone("Adding Xen PV drivers: xen-kmp-pae"); + kernel_packages = add(kernel_packages, "xen-kmp-pae"); + } } } else @@ -421,10 +440,21 @@ } else if (Arch::x86_64()) { - if (xen) + if (kernel_desktop_exists && true) { // FIXME: detect desktop + kernel_packages = ["kernel-desktop"]; + if (xen) + { + y2milestone("Adding Xen PV drivers: xen-kmp-desktop"); + kernel_packages = add(kernel_packages, "xen-kmp-desktop"); + } + } + else { - y2milestone("Adding Xen PV drivers: xen-kmp-default"); - kernel_packages = add(kernel_packages, "xen-kmp-default"); + if (xen) + { + y2milestone("Adding Xen PV drivers: xen-kmp-default"); + kernel_packages = add(kernel_packages, "xen-kmp-default"); + } } } else if (Arch::ppc ()) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org