- openSUSE Commits

commit dbench
by root＠Hilbert.suse.de 16 Oct '08

16 Oct '08

Hello community, here is the log from the commit of package dbench checked in at Thu Oct 16 17:03:09 CEST 2008. -------- --- dbench/dbench.changes 2008-04-08 15:16:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/dbench/dbench.changes 2008-10-16 15:42:46.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Oct 16 15:41:44 CEST 2008 - vmarsik(a)suse.cz + +- added dependency on kernel-nfs-server for the ctcs2-glue subpackage + +------------------------------------------------------------------- +Fri Sep 26 18:11:34 CEST 2008 - vmarsik(a)suse.cz + +- added TCF for running on local NFS mount +- reverted Yi's renaming + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbench.spec ++++++ --- /var/tmp/diff_new_pack.w15869/_old 2008-10-16 17:03:04.000000000 +0200 +++ /var/tmp/diff_new_pack.w15869/_new 2008-10-16 17:03:04.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package dbench (Version 3.04) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -16,7 +23,7 @@ Group: System/Benchmark AutoReqProv: on Version: 3.04 -Release: 112 +Release: 146 Summary: File System Benchmark Similar to Netbench Url: http://samba.org/ftp/tridge/dbench/ Source0: %{name}-%{version}.tar.bz2 @@ -40,7 +47,7 @@ License: GPL v2 or later Summary: File System Benchmark similar to Netbench Group: System/Benchmark -Requires: ctcs2 >= 0.1.1 +Requires: ctcs2 >= 0.1.1 dbench nfs-kernel-server #BuildArchitectures: noarch %description ctcs2-glue @@ -74,16 +81,17 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/ctcs2/tools # install ctcs2 related files in the ctcs2-glue sub packages install -m 744 ctcstools/do_dbench $RPM_BUILD_ROOT/usr/share/qa/dbench/ -install -m 644 ctcstools/dbench-default.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf -ln -s ../../../../usr/share/qa/dbench/tcf/dbench-default.tcf $RPM_BUILD_ROOT/usr/share/qa/tcf -install -m 644 ctcstools/dbench-default-v.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf -ln -s ../../../../usr/share/qa/dbench/tcf/dbench-default-v.tcf $RPM_BUILD_ROOT/usr/share/qa/tcf -install -m 644 ctcstools/dbench-syncIO.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf -ln -s ../../../../usr/share/qa/dbench/tcf/dbench-syncIO.tcf $RPM_BUILD_ROOT/usr/share/qa/tcf -install -m 644 ctcstools/dbench-syncIO-v.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf -ln -s ../../../../usr/share/qa/dbench/tcf/dbench-syncIO-v.tcf $RPM_BUILD_ROOT/usr/share/qa/tcf +install -m 744 ctcstools/do_dbench_nfs $RPM_BUILD_ROOT/usr/share/qa/dbench/ +install -m 644 ctcstools/dbench-*.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf/ +for A in ctcstools/dbench-*.tcf +do + B=`basename $A` + ln -s ../../../../usr/share/qa/dbench/tcf/$B $RPM_BUILD_ROOT/usr/share/qa/tcf/ +done install -m 744 ctcstools/dbench-run $RPM_BUILD_ROOT/usr/lib/ctcs2/tools -install -m 744 ctcstools/dbench-run-v $RPM_BUILD_ROOT/usr/lib/ctcs2/tools +install -m 744 ctcstools/dbench-run-old $RPM_BUILD_ROOT/usr/lib/ctcs2/tools +install -m 744 ctcstools/dbench-nfs-run $RPM_BUILD_ROOT/usr/lib/ctcs2/tools +install -m 744 ctcstools/dbench-nfs4-run $RPM_BUILD_ROOT/usr/lib/ctcs2/tools find $RPM_BUILD_ROOT/usr/share/dbench -name "*.txt" -type f -print0 | xargs -r -0 chmod a-x %clean @@ -106,6 +114,11 @@ /usr/lib/ctcs2 %changelog +* Thu Oct 16 2008 vmarsik(a)suse.cz +- added dependency on kernel-nfs-server for the ctcs2-glue subpackage +* Fri Sep 26 2008 vmarsik(a)suse.cz +- added TCF for running on local NFS mount +- reverted Yi's renaming * Tue Apr 08 2008 yxu(a)suse.de - renamed all filed done by vmarsik, with a -v suffix - return to old file name schema to keep integrity and continuity of dbench tables in QADB ++++++ dbench-ctcstools.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-default-old.tcf new/ctcstools/dbench-default-old.tcf --- old/ctcstools/dbench-default-old.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-default-old.tcf 2005-12-05 16:19:45.000000000 +0100 @@ -0,0 +1,6 @@ +# run the default dbench test for 1 hour with 500 clients, including +# pre-check of feasibility of workdir and +# final tidy-up +# +fg 1 dbench_dflt /usr/share/qa/dbench/do_dbench -n 500 -t 3600 -D /abuild/dbench_dflt +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-default.tcf new/ctcstools/dbench-default.tcf --- old/ctcstools/dbench-default.tcf 2005-12-05 16:19:45.000000000 +0100 +++ new/ctcstools/dbench-default.tcf 2008-06-03 18:27:52.000000000 +0200 @@ -2,5 +2,85 @@ # pre-check of feasibility of workdir and # final tidy-up # -fg 1 dbench_dflt /usr/share/qa/dbench/do_dbench -n 500 -t 3600 -D /abuild/dbench_dflt + +# original version: +#fg 1 dbench_dflt /usr/share/qa/dbench/do_dbench -n 32 -t 3600 -D /abuild/dbench_dflt +#wait + +timer 1h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 1 wait + +timer 1h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 2 +wait + +timer 1h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 4 +wait + +timer 1h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 8 +wait + +timer 2h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 12 +wait + +timer 2h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 16 +wait + +timer 2h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 20 +wait + +timer 2h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 24 +wait + +timer 4h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 32 +wait + +timer 4h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 40 +wait + +timer 4h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 48 +wait + +timer 4h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 56 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 64 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 96 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 128 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 192 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 256 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 384 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 500 +wait + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-default-v.tcf new/ctcstools/dbench-default-v.tcf --- old/ctcstools/dbench-default-v.tcf 2008-03-19 16:23:54.000000000 +0100 +++ new/ctcstools/dbench-default-v.tcf 1970-01-01 01:00:00.000000000 +0100 @@ -1,86 +0,0 @@ -# run the default dbench test for 1 hour with 500 clients, including -# pre-check of feasibility of workdir and -# final tidy-up -# - -# original version: -#fg 1 dbench_dflt /usr/share/qa/dbench/do_dbench -n 32 -t 3600 -D /abuild/dbench_dflt -#wait - -timer 1h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 1 -wait - -timer 1h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 2 -wait - -timer 1h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 4 -wait - -timer 1h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 8 -wait - -timer 2h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 12 -wait - -timer 2h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 16 -wait - -timer 2h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 20 -wait - -timer 2h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 24 -wait - -timer 4h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 32 -wait - -timer 4h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 40 -wait - -timer 4h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 48 -wait - -timer 4h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 56 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 64 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 96 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 128 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 192 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 256 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 384 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 500 -wait - - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-nfs4-default.tcf new/ctcstools/dbench-nfs4-default.tcf --- old/ctcstools/dbench-nfs4-default.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-nfs4-default.tcf 2008-09-30 13:24:28.000000000 +0200 @@ -0,0 +1,36 @@ +# run the dbench test on mounted nfs directory + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,no_subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,no_subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,no_subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,no_subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "async" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "async" 8 +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-nfs4-run new/ctcstools/dbench-nfs4-run --- old/ctcstools/dbench-nfs4-run 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-nfs4-run 2008-09-30 13:17:38.000000000 +0200 @@ -0,0 +1,6 @@ +#!/bin/bash + +CTCS2_DIR=/usr/lib/ctcs2 +TCF_DIR=/usr/share/qa/tcf + +$CTCS2_DIR/tools/run $TCF_DIR/dbench-nfs4-default.tcf diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-nfs4-syncIO.tcf new/ctcstools/dbench-nfs4-syncIO.tcf --- old/ctcstools/dbench-nfs4-syncIO.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-nfs4-syncIO.tcf 2008-09-30 13:24:42.000000000 +0200 @@ -0,0 +1,36 @@ +# run the dbench test on mounted nfs directory + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,no_subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,no_subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,no_subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,no_subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "async" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "async" -o "-s" 8 +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-nfs-default.tcf new/ctcstools/dbench-nfs-default.tcf --- old/ctcstools/dbench-nfs-default.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-nfs-default.tcf 2008-09-30 13:23:57.000000000 +0200 @@ -0,0 +1,36 @@ +# run the dbench test on mounted nfs directory + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,no_subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,no_subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,no_subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,no_subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "async" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "async" 8 +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-nfs-run new/ctcstools/dbench-nfs-run --- old/ctcstools/dbench-nfs-run 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-nfs-run 2008-09-30 13:16:58.000000000 +0200 @@ -0,0 +1,6 @@ +#!/bin/bash + +CTCS2_DIR=/usr/lib/ctcs2 +TCF_DIR=/usr/share/qa/tcf + +$CTCS2_DIR/tools/run $TCF_DIR/dbench-nfs-default.tcf diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-nfs-syncIO.tcf new/ctcstools/dbench-nfs-syncIO.tcf --- old/ctcstools/dbench-nfs-syncIO.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-nfs-syncIO.tcf 2008-09-30 13:24:15.000000000 +0200 @@ -0,0 +1,36 @@ +# run the dbench test on mounted nfs directory + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,no_subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,no_subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,no_subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,no_subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "async" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "async" -o "-s" 8 +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-run new/ctcstools/dbench-run --- old/ctcstools/dbench-run 2008-04-08 13:57:13.000000000 +0200 +++ new/ctcstools/dbench-run 2008-04-17 20:23:28.000000000 +0200 @@ -3,6 +3,8 @@ ctcsdir="/usr/lib/ctcs2" basedir="/usr/share/qa/dbench" +/etc/init.d/cron stop + $ctcsdir/tools/run $basedir/tcf/dbench-default.tcf sleep 120 $ctcsdir/tools/run $basedir/tcf/dbench-syncIO.tcf diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-run-old new/ctcstools/dbench-run-old --- old/ctcstools/dbench-run-old 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-run-old 2008-03-03 18:03:54.000000000 +0100 @@ -0,0 +1,9 @@ +#!/bin/sh + +ctcsdir="/usr/lib/ctcs2" +basedir="/usr/share/qa/dbench" + +$ctcsdir/tools/run $basedir/tcf/dbench-default-old.tcf +sleep 120 +$ctcsdir/tools/run $basedir/tcf/dbench-syncIO-old.tcf + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-run-v new/ctcstools/dbench-run-v --- old/ctcstools/dbench-run-v 2008-04-08 13:57:25.000000000 +0200 +++ new/ctcstools/dbench-run-v 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -#!/bin/sh - -ctcsdir="/usr/lib/ctcs2" -basedir="/usr/share/qa/dbench" - -$ctcsdir/tools/run $basedir/tcf/dbench-default-v.tcf -sleep 120 -$ctcsdir/tools/run $basedir/tcf/dbench-syncIO-v.tcf - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-syncIO-old.tcf new/ctcstools/dbench-syncIO-old.tcf --- old/ctcstools/dbench-syncIO-old.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-syncIO-old.tcf 2005-12-05 16:19:45.000000000 +0100 @@ -0,0 +1,6 @@ +# run dbench with synchronous IO for 1 hour with 500 clients, including +# pre-check of feasibility of workdir and +# final tidy-up +# +fg 1 dbench_syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 -t 3600 -D /abuild/dbench_syncIO +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-syncIO.tcf new/ctcstools/dbench-syncIO.tcf --- old/ctcstools/dbench-syncIO.tcf 2005-12-05 16:19:45.000000000 +0100 +++ new/ctcstools/dbench-syncIO.tcf 2008-06-03 18:28:40.000000000 +0200 @@ -2,5 +2,85 @@ # pre-check of feasibility of workdir and # final tidy-up # -fg 1 dbench_syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 -t 3600 -D /abuild/dbench_syncIO + +# original version: +#fg 1 dbench_syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 -t 3600 -D /abuild/dbench_syncIO +#wait + +timer 1h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 1 wait + +timer 1h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 2 +wait + +timer 1h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 4 +wait + +timer 1h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 8 +wait + +timer 2h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 12 +wait + +timer 2h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 16 +wait + +timer 2h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 20 +wait + +timer 2h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 24 +wait + +timer 4h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 32 +wait + +timer 4h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 40 +wait + +timer 4h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 48 +wait + +timer 4h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 56 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 64 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 96 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 128 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 192 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 256 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 384 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 +wait + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-syncIO-v.tcf new/ctcstools/dbench-syncIO-v.tcf --- old/ctcstools/dbench-syncIO-v.tcf 2008-03-19 16:23:04.000000000 +0100 +++ new/ctcstools/dbench-syncIO-v.tcf 1970-01-01 01:00:00.000000000 +0100 @@ -1,86 +0,0 @@ -# run dbench with synchronous IO for 1 hour with 500 clients, including -# pre-check of feasibility of workdir and -# final tidy-up -# - -# original version: -#fg 1 dbench_syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 -t 3600 -D /abuild/dbench_syncIO -#wait - -timer 1h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 1 -wait - -timer 1h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 2 -wait - -timer 1h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 4 -wait - -timer 1h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 8 -wait - -timer 2h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 12 -wait - -timer 2h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 16 -wait - -timer 2h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 20 -wait - -timer 2h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 24 -wait - -timer 4h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 32 -wait - -timer 4h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 40 -wait - -timer 4h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 48 -wait - -timer 4h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 56 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 64 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 96 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 128 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 192 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 256 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 384 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 -wait - - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/do_dbench new/ctcstools/do_dbench --- old/ctcstools/do_dbench 2008-03-12 13:36:59.000000000 +0100 +++ new/ctcstools/do_dbench 2008-03-03 18:58:57.000000000 +0100 @@ -139,7 +139,7 @@ exit "$exitcode" } else - mkdir -p "$workdir" || { + "$MKDIR" -p "$workdir" || { echo "Could not create working directory $workdir. Aborting..." kill $$ # invokes tidy_up } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/do_dbench_nfs new/ctcstools/do_dbench_nfs --- old/ctcstools/do_dbench_nfs 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/do_dbench_nfs 2008-09-30 14:54:05.000000000 +0200 @@ -0,0 +1,72 @@ +#!/bin/bash + +# Usage: do_nfs_dbench <nfs | nfs4> "<nfs params without rw>" <dbench params without -D> + +LOCALDIR=/tmp/nfs_bench +MOUNTDIR=/mnt/nfs_bench +NFSVER=$1 +EXPORTFS_PARAMS=$2 + +shift 2 + +if [ "$NFSVER" != "nfs4" -a "$NFSVER" != "nfs" ]; then + echo "I will use \"$NFSVER\" as type of mount, are you sure? Usual are nfs and nfs4." +fi + +#source libqainternal.lib.sh +PASSED=0 +FAILED=1 +set -u +trap "cleanup; exit $FAILED" TERM INT + +function usage() { + echo "usage: $0 <nfs | nfs4> \"<nfs params without rw>\" <dbench params without -D>" + echo "example: $0 nfs \"sync, no_wdelay\" 4 -t 60" + exit $FAILED +} + +function init() { + mkdir -p "$LOCALDIR" + mkdir -p "$MOUNTDIR" + chmod 777 "$LOCALDIR" + if [ "$NFSVER" = "nfs4" ]; then + cp /etc/exports /etc/exports.nfs_dbench_$$ + echo "/ localhost(rw,no_subtree_check,fsid=0)" > /etc/exports + /etc/init.d/nfsserver stop > /dev/null 2>&1 + fi + /etc/init.d/nfsserver start > /dev/null 2>&1 + if ! exportfs -o "rw,$EXPORTFS_PARAMS" "localhost:$LOCALDIR" + then + echo "Cannot export '$EXPORTFS_PARAMS' to 'localhost:$LOCALDIR'" + exit $FAILED + fi + if ! mount -t $NFSVER "localhost:$LOCALDIR" "$MOUNTDIR" + then + echo "Cannot mount NFS directory" + exit $FAILED + fi +} + +function cleanup() { + umount "localhost:$LOCALDIR" + exportfs -u "localhost:$LOCALDIR" + /etc/init.d/nfsserver stop > /dev/null + rm -rf "$LOCALDIR" + rm -rf "$MOUNTDIR" + if [ "$NFSVER" = "nfs4" ]; then + mv /etc/exports.nfs_dbench_$$ /etc/exports + fi +} + +if [ $# -lt 1 ]; then + usage +fi + +init +echo "Starting dbench on nfs filesystem mounted with params:" +echo "NFS params: $EXPORTFS_PARAMS" +echo "NFS version: $NFSVER" +dbench -D "$MOUNTDIR" $@ +cleanup + +exit $PASSED diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/do_dbench,v new/ctcstools/do_dbench,v --- old/ctcstools/do_dbench,v 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/do_dbench,v 2008-02-18 13:51:11.000000000 +0100 @@ -0,0 +1,284 @@ +head 1.7; +access; +symbols; +locks + vmarsik:1.7; strict; +comment @# @; + + +1.7 +date 2008.02.18.12.51.11; author vmarsik; state Exp; +branches; +next 1.5; + +1.5 +date 2008.02.18.12.51.11; author vmarsik; state Exp; +branches; +next 1.1; + +1.1 +date 2008.02.18.12.51.10; author vmarsik; state Exp; +branches; +next ; + + +desc +@Original +@ + + +1.7 +log +@dodbench_spare_file +@ +text +@#!/bin/bash +# +# +# Feature request: +# - Check whether a sufficient amount of disk space is available +# (~22 MB/client * 1000 clients) +# + yes: launch dbench test +# + no: exit 2 (= internal error in ctcs2) +# +# +# +# Script is intended to be invoked from within ctcs2 which captures +# stdout in its logfile --> no need for an extra log +# +# +# +# +exitcode=2 # (= internal error in ctcs2) + +# dbench test constants +default_workdir=/abuild/dbench +dbench_pid="" # for the time being +diskspace_per_client=22 # MByte +number_clients=1000 +runtime=3600 # seconds + + + +# ============ START aux functions ============== +# + +function usage() { + echo " +Usage: $0 [-h] [-D workdir] [-n nprocs] [-o dbench_options] + [-t #secs] [-v] + + to run the \"dbench\" Benchmark on this host + and to create a nice log. + +Options: + -D Specify the working directory (and thus, implicitly, + the device) for dbench (default: $default_workdir) + -h Print this help text and exit successfully + -n Number of processes dbench should start + (must be >=10 to avoid bad input; default: $number_clients) + -o Specify a string of options to pass through to dbench + Default: -s (do synchronous file IO only) + -t specify dbench runtime of #secs (default: $runtime) seconds. + -v be verbose (currently a no-op) +" + return 0 +} + + +invoked_tidy_up="" +function tidy_up() { + + if [ -z "$invoked_tidy_up" ] + then + # Guard against re-entrancy -- yes, it may cause a race + invoked_tidy_up="yes" + echo "$(date): Caught signal; waiting 15s for dbench childs..." + sleep 15 + echo " Overall runtime: $SECONDS seconds." + # This should be unnecessary: dbench itself will + # remove $workdir upon termination... + # + # echo "Backgrounding removal of $workdir and terminating..." + # rm -rf "$workdir" & + popd >/dev/null 2>&1 + exit "$exitcode" + fi # $invoked_tidy_up +} +# +# ============ END aux functions ============== + +# Runtime measurement +SECONDS=0 + +trap tidy_up 1 2 3 15 + +timestamp="$(date '+%y%m%d.%H%M%S')" +basename=dbench-"${timestamp}" +workdir="$default_workdir" +dbench_opts="" +# usage: dbench [OPTIONS] nprocs +# options: +# -v show version +# -t timelimit run time in seconds (default 600) +# -D directory base directory to run in +# -c loadfile set location of the loadfile +# -s synchronous file IO +# -S synchronous directories (mkdir, unlink...) +# -x enable EA support +# -T options set socket options for tbench + +# ===== Evaluate and check the commandline ========= +# # +while getopts hD:n:o:t:v optchar ; do + + case "$optchar" in + + h) usage + exit 0 ;; + D) workdir=$OPTARG ;; + n) [ "$OPTARG" -ge 10 ] && \ + number_clients="$OPTARG" ;; + o) dbench_opts="$dbench_opts $OPTARG" ;; + t) runtime=$OPTARG ;; + v) verbose=yes ;; + + *) usage + exit "$exitcode" ;; + esac +done +shift $((OPTIND - 1)) +# # +# ==== END: Evaluate and check the commandline ====== + + +# ==== Preparation: Create the working directory ===== +# +# Make the path absolute +[ "$workdir" = "${workdir#/}" ] && workdir="${PWD}"/"$workdir" +if [ -e "$workdir" ] +then + [ -d "$workdir" ] || { + echo "\$workdir: ${workdir} is not a directory. Aborting..." + exit "$exitcode" + } +else + mkdir -p "$workdir" || { + echo "Could not create working directory $workdir. Aborting..." + kill $$ # invokes tidy_up + } +fi + +[ -r "$workdir" -a -w "$workdir" -a -x "$workdir" ] || { + echo "\ +prepare_workdir: Working directory $workdir: +Needed access rights rwx not all set. Aborting..." + kill $$ # invokes tidy_up + } + +wtestfile="${workdir}/prepare_workdir.$$.$$" +echo "$wtestfile" > "$wtestfile" ; rm "$wtestfile" || { + echo "\ +Working directory $workdir: +Cannot create or remove files there (maybe filesystem full or read-only?) +Aborting..." + kill $$ # invokes tidy_up + } + +# ==== Preparation: Check disk space below $workdir, = +# abort in case of shortage +# +minfree="$((diskspace_per_client * number_clients))" # MByte +freespace="$(df -m "$workdir" | awk '/^\//{ print $4 }')" +# if empty, need to consult next line. +[ -n "$freespace" ] || freespace="$(df "$workdir" |\ + awk '/^\/dev/{ getline ; print $3 }')" +if [ "$?" -ne 0 -o -z "$freespace" ] +then + echo "\ +Unable to determine free space (needed: $minfree MByte) +available under $workdir . Non-local filesystem, maybe? +Aborting..." + kill $$ # invokes tidy_up +fi +if [ "$freespace" -lt "$minfree" ] +then + echo "\ +\"df\" shows less than the needed $minfree MByte +available under $workdir . Aborting..." + kill $$ # invokes tidy_up +fi +# +# ==== END Preparation =============================== + + +# Now DO IT. +# Script will be terminated by signal, as I don't know +# about how/whether dbench will terminate by itself. +# +exitcode=0 +echo "$(date): Launching command: +dbench $dbench_opts -t $runtime -D $workdir $number_clients +Working directory and device: +$(df $workdir) +" +dbench $dbench_opts -t "$runtime" -D "$workdir" "$number_clients" +# This code is reached only if dbench runs to termination rather +# than gets signalled +exitcode="$?" +echo "dbench run completed; SIGTERMing myself for tidyup..." +kill $$ + + +@ + + +1.5 +log +(a)fix-suse_cert-dependency.patch +@ +text +@d158 1 +a158 1 +freespace="$(df -m "$workdir" | awk '/^\/dev/{ print $4 }')" +@ + + +1.1 +log +@Initial revision +@ +text +@a18 1 +CERTLIB=/usr/lib/cert_tests.lib +a26 7 +# Collection of functions from time-honoured hardware certification +if [ -f "$CERTLIB" ] ; then + . "$CERTLIB" +else + >&2 echo -e "\a$0: Not found: needed $CERTLIB. Aborting..." + exit "$exitcode" +fi +d63 1 +a63 1 + "$SLEEP" 15 +d82 1 +a82 1 +timestamp="$(get_timestamp)" +d132 1 +a132 1 + "$MKDIR" -p "$workdir" || { +d146 1 +a146 1 +echo "$wtestfile" > "$wtestfile" ; "$RM" "$wtestfile" || { +d158 1 +a158 1 +freespace="$("$DF" -m "$workdir" | "$AWK" '/^\/dev/{ print $4 }')" +d160 2 +a161 2 +[ -n "$freespace" ] || freespace="$("$DF" "$workdir" |\ + "$AWK" '/^\/dev/{ getline ; print $3 }')" +d173 1 +a173 1 +$DF shows less than the needed $minfree MByte +@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bundle-lang-common
by root＠Hilbert.suse.de 16 Oct '08

16 Oct '08

Hello community, here is the log from the commit of package bundle-lang-common checked in at Thu Oct 16 17:02:16 CEST 2008. -------- --- bundle-lang-common/bundle-lang-common.changes 2008-10-16 12:46:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/bundle-lang-common/bundle-lang-common.changes 2008-10-16 16:06:08.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Oct 16 15:46:01 CEST 2008 - stbinner(a)suse.de + +- update package lists for KDE4 Live-CD: + * add kde4-amarok and kde4-konqueror-plugins + * remove amarok, kdebluetooth, kdetv and kpowersave + * make gnome only: gnome-keyring, libbonobo[ui], libgnome, gnome- + canvas, gnomecups, gnomeprint, gnomesu, gnomeui and gfvs + +------------------------------------------------------------------- bundle-lang-gnome.changes: same change bundle-lang-kde.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-common.spec ++++++ ++++ 757 lines (skipped) ++++ between bundle-lang-common/bundle-lang-common.spec ++++ and /mounts/work_src_done/STABLE/bundle-lang-common/bundle-lang-common.spec bundle-lang-gnome.spec: same change bundle-lang-kde.spec: same change ++++++ bundle-lang-other.spec ++++++ --- /var/tmp/diff_new_pack.T26184/_old 2008-10-16 17:01:43.000000000 +0200 +++ /var/tmp/diff_new_pack.T26184/_new 2008-10-16 17:01:43.000000000 +0200 @@ -22,7 +22,7 @@ License: X11/MIT Group: System/GUI/KDE Version: 11.0 -Release: 91 +Release: 92 Summary: Translations for languages not covered by one of the bundle-lang-*-* packages BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ packages.txt ++++++ --- bundle-lang-common/packages.txt 2008-09-25 23:57:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/bundle-lang-common/packages.txt 2008-10-16 16:06:18.000000000 +0200 @@ -1,4 +1,3 @@ -amarok-lang kde atk-lang common at-spi-lang gnome avahi-lang common @@ -33,7 +32,7 @@ gnome-cups-manager-lang gnome gnome-desktop-lang gnome gnome-games-lang gnome -gnome-keyring-lang common +gnome-keyring-lang gnome gnome-mag-lang gnome gnome-main-menu-lang gnome gnome-media-lang gnome @@ -64,30 +63,29 @@ gtksourceview-lang gnome gtkspell-lang gnome gucharmap-lang gnome -gvfs-lang common +gvfs-lang gnome k3b-lang kde kaffeine-lang kde +kde4-amarok-lang kde +kde4-konqueror-plugins-lang kde kdebase4-openSUSE-lang kde -kdebluetooth-lang kde -kdetv-lang kde kipi-plugins-lang kde konversation-lang kde -kpowersave-lang kde ktorrent-lang kde -libbonobo-lang common -libbonoboui-lang common +libbonobo-lang gnome +libbonoboui-lang gnome libbtctl-lang gnome libgalago-gtk-lang gnome libgalago-lang gnome libgda-lang gnome -libgnomecanvas-lang common -libgnomecups-lang common +libgnomecanvas-lang gnome +libgnomecups-lang gnome libgnomekbd-lang gnome -libgnome-lang common -libgnomeprint-lang common -libgnomeprintui-lang common -libgnomesu-lang common -libgnomeui-lang common +libgnome-lang gnome +libgnomeprint-lang gnome +libgnomeprintui-lang gnome +libgnomesu-lang gnome +libgnomeui-lang gnome libgphoto2-lang common libgtop-lang gnome libgweather-lang gnome ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-source
by root＠Hilbert.suse.de 16 Oct '08

16 Oct '08

Hello community, here is the log from the commit of package kernel-source checked in at Thu Oct 16 14:49:39 CEST 2008. -------- --- kernel-source/kernel-debug.changes 2008-10-14 16:03:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2008-10-16 14:00:13.000000000 +0200 @@ -1,0 +2,76 @@ +Thu Oct 16 12:48:17 CEST 2008 - agruen(a)suse.de + +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. + +------------------------------------------------------------------- +Thu Oct 16 05:03:49 CEST 2008 - tonyj(a)suse.de + +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 + +------------------------------------------------------------------- +Thu Oct 16 01:48:04 CEST 2008 - gregkh(a)suse.de + +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. + +------------------------------------------------------------------- +Wed Oct 15 16:29:57 CEST 2008 - olh(a)suse.de + +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) + +------------------------------------------------------------------- +Wed Oct 15 15:59:23 CEST 2008 - mmarek(a)suse.cz + +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) + + +------------------------------------------------------------------- +Wed Oct 15 11:25:19 CEST 2008 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround + +------------------------------------------------------------------- +Wed Oct 15 08:58:57 CEST 2008 - olh(a)suse.de + +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore + +------------------------------------------------------------------- +Wed Oct 15 07:46:16 CEST 2008 - nfbrown(a)suse.de + +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). + +------------------------------------------------------------------- +Wed Oct 15 03:36:22 CEST 2008 - tonyj(a)suse.de + +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT + +------------------------------------------------------------------- +Tue Oct 14 17:29:36 CEST 2008 - jkosina(a)suse.de + +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). + +------------------------------------------------------------------- +Tue Oct 14 16:33:12 CEST 2008 - oneukum(a)suse.de + +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. + +------------------------------------------------------------------- kernel-default.changes: same change kernel-dummy.changes: same change kernel-kdump.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-rt.changes: same change kernel-rt_debug.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-source-rt.changes: same change kernel-syms.changes: same change kernel-syms-rt.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:04.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-debug (Version 2.6.27) +# spec file for package kernel-debug (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -57,8 +57,8 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 2.6.27 -Release: 19 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -80,9 +80,6 @@ Requires(post): perl-Bootloader Requires(post): mkinitrd Recommends: kerneloops -%if ! %sles_version && %split_packages -Recommends: kernel-debug-extra -%endif #!BuildIgnore: perl-Bootloader mkinitrd %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy @@ -100,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27 -Obsoletes: kernel-xenpae <= 2.6.27 +Provides: kernel-xenpae = 2.6.27.1 +Obsoletes: kernel-xenpae <= 2.6.27.1 %endif #!BuildIgnore: xen %endif @@ -127,7 +124,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.27-%source_rel +Provides: kernel = 2.6.27.1-%source_rel %endif %endif %ifarch %ix86 @@ -219,12 +216,13 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-debug-2.6.27.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.src.rpm." + echo "The kernel-debug-2.6.27.1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -303,7 +301,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27-$RELEASE-debug +KERNELRELEASE=2.6.27.1-$RELEASE-debug EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -698,7 +696,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun base -f preun-base.sh @@ -724,6 +723,8 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd +Supplements: packageand(product(SUSE_SLED):kernel-debug) +Supplements: packageand(product(openSUSE):kernel-debug) %description -n kernel-debug-extra This kernel has several debug facilities enabled that hurt performance. @@ -733,7 +734,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun extra -f preun-extra.sh @@ -747,7 +749,50 @@ %files -n kernel-debug-extra -f kernel-extra.files %defattr(-, root, root) %endif + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:04.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-default (Version 2.6.27) +# spec file for package kernel-default (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -57,8 +57,8 @@ Name: kernel-default Summary: The Standard Kernel -Version: 2.6.27 -Release: 19 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -80,9 +80,6 @@ Requires(post): perl-Bootloader Requires(post): mkinitrd Recommends: kerneloops -%if ! %sles_version && %split_packages -Recommends: kernel-default-extra -%endif #!BuildIgnore: perl-Bootloader mkinitrd %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy @@ -100,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27 -Obsoletes: kernel-xenpae <= 2.6.27 +Provides: kernel-xenpae = 2.6.27.1 +Obsoletes: kernel-xenpae <= 2.6.27.1 %endif #!BuildIgnore: xen %endif @@ -127,7 +124,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.27-%source_rel +Provides: kernel = 2.6.27.1-%source_rel %endif %endif %ifarch %ix86 @@ -237,12 +234,13 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-default-2.6.27.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.src.rpm." + echo "The kernel-default-2.6.27.1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -321,7 +319,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27-$RELEASE-default +KERNELRELEASE=2.6.27.1-$RELEASE-default EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -715,7 +713,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun base -f preun-base.sh @@ -741,6 +740,8 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd +Supplements: packageand(product(SUSE_SLED):kernel-default) +Supplements: packageand(product(openSUSE):kernel-default) %description -n kernel-default-extra The standard kernel for both uniprocessor and multiprocessor systems. @@ -749,7 +750,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun extra -f preun-extra.sh @@ -763,7 +765,50 @@ %files -n kernel-default-extra -f kernel-extra.files %defattr(-, root, root) %endif + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:05.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-dummy (Version 2.6.27) +# spec file for package kernel-dummy (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ Name: kernel-dummy Summary: Internal dummy package for synchronizing release numbers -Version: 2.6.27 -Release: 19 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: System/Kernel AutoReqProv: off @@ -36,7 +36,8 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %install rm -rf %buildroot @@ -46,7 +47,50 @@ %files %defattr(-, root, root) /etc/dummy + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:05.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-kdump (Version 2.6.27) +# spec file for package kernel-kdump (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -57,8 +57,8 @@ Name: kernel-kdump Summary: kernel for kdump -Version: 2.6.27 -Release: 19 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -80,9 +80,6 @@ Requires(post): perl-Bootloader Requires(post): mkinitrd Recommends: kerneloops -%if ! %sles_version && %split_packages -Recommends: kernel-kdump-extra -%endif #!BuildIgnore: perl-Bootloader mkinitrd %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy @@ -100,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27 -Obsoletes: kernel-xenpae <= 2.6.27 +Provides: kernel-xenpae = 2.6.27.1 +Obsoletes: kernel-xenpae <= 2.6.27.1 %endif #!BuildIgnore: xen %endif @@ -127,7 +124,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.27-%source_rel +Provides: kernel = 2.6.27.1-%source_rel %endif %endif %ifarch ppc @@ -218,12 +215,13 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-kdump-2.6.27.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.src.rpm." + echo "The kernel-kdump-2.6.27.1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -302,7 +300,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27-$RELEASE-kdump +KERNELRELEASE=2.6.27.1-$RELEASE-kdump EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -699,7 +697,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun base -f preun-base.sh @@ -725,6 +724,8 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd +Supplements: packageand(product(SUSE_SLED):kernel-kdump) +Supplements: packageand(product(openSUSE):kernel-kdump) %description -n kernel-kdump-extra This kernel is intended for kdump. It can not be booted with a normal @@ -736,7 +737,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun extra -f preun-extra.sh @@ -750,7 +752,50 @@ %files -n kernel-kdump-extra -f kernel-extra.files %defattr(-, root, root) %endif + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:05.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-pae (Version 2.6.27) +# spec file for package kernel-pae (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -57,8 +57,8 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 2.6.27 -Release: 19 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -80,9 +80,6 @@ Requires(post): perl-Bootloader Requires(post): mkinitrd Recommends: kerneloops -%if ! %sles_version && %split_packages -Recommends: kernel-pae-extra -%endif #!BuildIgnore: perl-Bootloader mkinitrd %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy @@ -100,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27 -Obsoletes: kernel-xenpae <= 2.6.27 +Provides: kernel-xenpae = 2.6.27.1 +Obsoletes: kernel-xenpae <= 2.6.27.1 %endif #!BuildIgnore: xen %endif @@ -127,7 +124,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.27-%source_rel +Provides: kernel = 2.6.27.1-%source_rel %endif %endif Provides: k_smp4G kernel-bigsmp @@ -219,12 +216,13 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-pae-2.6.27.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.src.rpm." + echo "The kernel-pae-2.6.27.1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -303,7 +301,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27-$RELEASE-pae +KERNELRELEASE=2.6.27.1-$RELEASE-pae EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -704,7 +702,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun base -f preun-base.sh @@ -730,6 +729,8 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd +Supplements: packageand(product(SUSE_SLED):kernel-pae) +Supplements: packageand(product(openSUSE):kernel-pae) %description -n kernel-pae-extra This kernel supports up to 64GB of main memory. It requires Physical @@ -745,7 +746,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun extra -f preun-extra.sh @@ -759,7 +761,50 @@ %files -n kernel-pae-extra -f kernel-extra.files %defattr(-, root, root) %endif + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:05.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ppc64 (Version 2.6.27) +# spec file for package kernel-ppc64 (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -57,8 +57,8 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems -Version: 2.6.27 -Release: 19 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -80,9 +80,6 @@ Requires(post): perl-Bootloader Requires(post): mkinitrd Recommends: kerneloops -%if ! %sles_version && %split_packages -Recommends: kernel-ppc64-extra -%endif #!BuildIgnore: perl-Bootloader mkinitrd %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy @@ -100,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27 -Obsoletes: kernel-xenpae <= 2.6.27 +Provides: kernel-xenpae = 2.6.27.1 +Obsoletes: kernel-xenpae <= 2.6.27.1 %endif #!BuildIgnore: xen %endif @@ -127,7 +124,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.27-%source_rel +Provides: kernel = 2.6.27.1-%source_rel %endif %endif %ifarch ppc @@ -231,12 +228,13 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-ppc64-2.6.27.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.src.rpm." + echo "The kernel-ppc64-2.6.27.1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -315,7 +313,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27-$RELEASE-ppc64 +KERNELRELEASE=2.6.27.1-$RELEASE-ppc64 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -723,7 +721,8 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun base -f preun-base.sh @@ -749,6 +748,8 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd +Supplements: packageand(product(SUSE_SLED):kernel-ppc64) +Supplements: packageand(product(openSUSE):kernel-ppc64) %description -n kernel-ppc64-extra This package contains the kernel for: @@ -771,7 +772,8 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun extra -f preun-extra.sh @@ -785,7 +787,50 @@ %files -n kernel-ppc64-extra -f kernel-extra.files %defattr(-, root, root) %endif + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-ps3.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:06.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ps3 (Version 2.6.27) +# spec file for package kernel-ps3 (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -57,8 +57,8 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader -Version: 2.6.27 -Release: 19 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -80,9 +80,6 @@ Requires(post): perl-Bootloader Requires(post): mkinitrd Recommends: kerneloops -%if ! %sles_version && %split_packages -Recommends: kernel-ps3-extra -%endif #!BuildIgnore: perl-Bootloader mkinitrd %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy @@ -100,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27 -Obsoletes: kernel-xenpae <= 2.6.27 +Provides: kernel-xenpae = 2.6.27.1 +Obsoletes: kernel-xenpae <= 2.6.27.1 %endif #!BuildIgnore: xen %endif @@ -127,7 +124,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.27-%source_rel +Provides: kernel = 2.6.27.1-%source_rel %endif %endif %ifarch ppc @@ -217,12 +214,13 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-ps3-2.6.27.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.src.rpm." + echo "The kernel-ps3-2.6.27.1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -301,7 +299,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27-$RELEASE-ps3 +KERNELRELEASE=2.6.27.1-$RELEASE-ps3 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -695,7 +693,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun base -f preun-base.sh @@ -721,6 +720,8 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd +Supplements: packageand(product(SUSE_SLED):kernel-ps3) +Supplements: packageand(product(openSUSE):kernel-ps3) %description -n kernel-ps3-extra This package contains the kernel for the ps3 bootloader only. PS3 @@ -729,7 +730,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun extra -f preun-extra.sh @@ -743,7 +745,50 @@ %files -n kernel-ps3-extra -f kernel-extra.files %defattr(-, root, root) %endif + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-rt_debug.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:06.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-rt_debug (Version 2.6.27) +# spec file for package kernel-rt_debug (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -57,8 +57,8 @@ Name: kernel-rt_debug Summary: A Debug Version of the Kernel -Version: 2.6.27 -Release: 5 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -80,9 +80,6 @@ Requires(post): perl-Bootloader Requires(post): mkinitrd Recommends: kerneloops -%if ! %sles_version && %split_packages -Recommends: kernel-rt_debug-extra -%endif #!BuildIgnore: perl-Bootloader mkinitrd %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy @@ -100,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27 -Obsoletes: kernel-xenpae <= 2.6.27 +Provides: kernel-xenpae = 2.6.27.1 +Obsoletes: kernel-xenpae <= 2.6.27.1 %endif #!BuildIgnore: xen %endif @@ -127,7 +124,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.27-%source_rel +Provides: kernel = 2.6.27.1-%source_rel %endif %endif %ifarch %ix86 @@ -216,12 +213,13 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-rt_debug-2.6.27.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.src.rpm." + echo "The kernel-rt_debug-2.6.27.1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -300,7 +298,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27-$RELEASE-rt_debug +KERNELRELEASE=2.6.27.1-$RELEASE-rt_debug EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -695,7 +693,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun base -f preun-base.sh @@ -721,6 +720,8 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd +Supplements: packageand(product(SUSE_SLED):kernel-rt_debug) +Supplements: packageand(product(openSUSE):kernel-rt_debug) %description -n kernel-rt_debug-extra This kernel has several debug facilities enabled that hurt performance. @@ -730,7 +731,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun extra -f preun-extra.sh @@ -744,7 +746,50 @@ %files -n kernel-rt_debug-extra -f kernel-extra.files %defattr(-, root, root) %endif + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-rt.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:06.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-rt (Version 2.6.27) +# spec file for package kernel-rt (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -57,8 +57,8 @@ Name: kernel-rt Summary: The Realtime Linux Kernel -Version: 2.6.27 -Release: 6 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -80,9 +80,6 @@ Requires(post): perl-Bootloader Requires(post): mkinitrd Recommends: kerneloops -%if ! %sles_version && %split_packages -Recommends: kernel-rt-extra -%endif #!BuildIgnore: perl-Bootloader mkinitrd %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy @@ -100,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27 -Obsoletes: kernel-xenpae <= 2.6.27 +Provides: kernel-xenpae = 2.6.27.1 +Obsoletes: kernel-xenpae <= 2.6.27.1 %endif #!BuildIgnore: xen %endif @@ -127,7 +124,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.27-%source_rel +Provides: kernel = 2.6.27.1-%source_rel %endif %endif %ifarch %ix86 @@ -221,12 +218,13 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-rt-2.6.27.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.src.rpm." + echo "The kernel-rt-2.6.27.1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -305,7 +303,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27-$RELEASE-rt +KERNELRELEASE=2.6.27.1-$RELEASE-rt EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -705,7 +703,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun base -f preun-base.sh @@ -731,6 +730,8 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd +Supplements: packageand(product(SUSE_SLED):kernel-rt) +Supplements: packageand(product(openSUSE):kernel-rt) %description -n kernel-rt-extra This kernel is compiled for realtime applications. @@ -745,7 +746,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun extra -f preun-extra.sh @@ -759,7 +761,50 @@ %files -n kernel-rt-extra -f kernel-extra.files %defattr(-, root, root) %endif + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:06.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-s390 (Version 2.6.27) +# spec file for package kernel-s390 (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -57,8 +57,8 @@ Name: kernel-s390 Summary: The Standard Kernel -Version: 2.6.27 -Release: 19 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -80,9 +80,6 @@ Requires(post): perl-Bootloader Requires(post): mkinitrd Recommends: kerneloops -%if ! %sles_version && %split_packages -Recommends: kernel-s390-extra -%endif #!BuildIgnore: perl-Bootloader mkinitrd %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy @@ -100,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27 -Obsoletes: kernel-xenpae <= 2.6.27 +Provides: kernel-xenpae = 2.6.27.1 +Obsoletes: kernel-xenpae <= 2.6.27.1 %endif #!BuildIgnore: xen %endif @@ -127,7 +124,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.27-%source_rel +Provides: kernel = 2.6.27.1-%source_rel %endif %endif Provides: kernel-32bit k_deflt @@ -212,12 +209,13 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-s390-2.6.27.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.src.rpm." + echo "The kernel-s390-2.6.27.1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -296,7 +294,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27-$RELEASE-s390 +KERNELRELEASE=2.6.27.1-$RELEASE-s390 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -690,7 +688,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun base -f preun-base.sh @@ -716,6 +715,8 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd +Supplements: packageand(product(SUSE_SLED):kernel-s390) +Supplements: packageand(product(openSUSE):kernel-s390) %description -n kernel-s390-extra The standard kernel. @@ -724,7 +725,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun extra -f preun-extra.sh @@ -738,7 +740,50 @@ %files -n kernel-s390-extra -f kernel-extra.files %defattr(-, root, root) %endif + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-source-rt.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:07.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source-rt (Version 2.6.27) +# spec file for package kernel-source-rt (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,8 +29,8 @@ Name: kernel-source-rt Summary: The Linux Kernel Sources, including the real-time patches -Version: 2.6.27 -Release: 12 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -42,7 +42,7 @@ %endif ExclusiveArch: %ix86 x86_64 Provides: linux -Provides: kernel-source-rt = 2.6.27-%source_rel +Provides: kernel-source-rt = 2.6.27.1-%source_rel %if "kernel-source-rt" == "kernel-source" Provides: linux lx_suse lx_sus22 lx_sus24 Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24 @@ -120,7 +120,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then @@ -137,7 +138,7 @@ while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do RELEASE=${RELEASE#[^0-9]*.} done -KERNELRELEASE=2.6.27-$RELEASE +KERNELRELEASE=2.6.27.1-$RELEASE case kernel-source-rt in (*-rt) variant=-rt @@ -164,7 +165,7 @@ > .patches for patch in $(< .patches); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch \ - -i %_builddir/kernel-source-rt-2.6.27/$patch; then + -i %_builddir/kernel-source-rt-2.6.27.1/$patch; then echo "*** Patch $patch failed ***" exit 1 fi @@ -283,7 +284,50 @@ %post -f kernel-source-rt-post.sh %files -f kernel-source-rt.files + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:07.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 2.6.27) +# spec file for package kernel-source (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,8 +29,8 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 2.6.27 -Release: 19 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -42,7 +42,7 @@ %endif ExclusiveArch: %ix86 ppc ppc64 s390 s390x ia64 x86_64 Provides: linux -Provides: kernel-source = 2.6.27-%source_rel +Provides: kernel-source = 2.6.27.1-%source_rel %if "kernel-source" == "kernel-source" Provides: linux lx_suse lx_sus22 lx_sus24 Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24 @@ -120,7 +120,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then @@ -137,7 +138,7 @@ while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do RELEASE=${RELEASE#[^0-9]*.} done -KERNELRELEASE=2.6.27-$RELEASE +KERNELRELEASE=2.6.27.1-$RELEASE case kernel-source in (*-rt) variant=-rt @@ -164,7 +165,7 @@ > .patches for patch in $(< .patches); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch \ - -i %_builddir/kernel-source-2.6.27/$patch; then + -i %_builddir/kernel-source-2.6.27.1/$patch; then echo "*** Patch $patch failed ***" exit 1 fi @@ -283,7 +284,50 @@ %post -f kernel-source-post.sh %files -f kernel-source.files + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-syms-rt.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:07.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms-rt (Version 2.6.27) +# spec file for package kernel-syms-rt (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Name: kernel-syms-rt Summary: Kernel Symbol Versions (modversions) For Real-Time Kernels -Version: 2.6.27 -Release: 6 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -49,7 +49,7 @@ #!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd Requires: linux -Requires: kernel-source = 2.6.27-%source_rel +Requires: kernel-source = 2.6.27.1-%source_rel Source11: arch-symbols Source12: guards Source21: config.conf @@ -74,7 +74,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep echo "Architecture symbol(s):" %symbols @@ -129,7 +130,50 @@ /usr/src/linux-*-obj /boot/symsets-*-*.tar.gz /lib/modules/*/build + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:08.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms (Version 2.6.27) +# spec file for package kernel-syms (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 2.6.27 -Release: 19 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -69,7 +69,7 @@ #!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd Requires: linux -Requires: kernel-source = 2.6.27-%source_rel +Requires: kernel-source = 2.6.27.1-%source_rel Source11: arch-symbols Source12: guards Source21: config.conf @@ -94,7 +94,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep echo "Architecture symbol(s):" %symbols @@ -149,7 +150,50 @@ /usr/src/linux-*-obj /boot/symsets-*-*.tar.gz /lib/modules/*/build + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:08.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-trace (Version 2.6.27) +# spec file for package kernel-trace (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -57,8 +57,8 @@ Name: kernel-trace Summary: The Realtime Linux Kernel -Version: 2.6.27 -Release: 12 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -80,9 +80,6 @@ Requires(post): perl-Bootloader Requires(post): mkinitrd Recommends: kerneloops -%if ! %sles_version && %split_packages -Recommends: kernel-trace-extra -%endif #!BuildIgnore: perl-Bootloader mkinitrd %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy @@ -100,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27 -Obsoletes: kernel-xenpae <= 2.6.27 +Provides: kernel-xenpae = 2.6.27.1 +Obsoletes: kernel-xenpae <= 2.6.27.1 %endif #!BuildIgnore: xen %endif @@ -127,7 +124,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.27-%source_rel +Provides: kernel = 2.6.27.1-%source_rel %endif %endif %ifarch %ix86 @@ -224,12 +221,13 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-trace-2.6.27.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.src.rpm." + echo "The kernel-trace-2.6.27.1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -308,7 +306,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27-$RELEASE-trace +KERNELRELEASE=2.6.27.1-$RELEASE-trace EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -706,7 +704,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun base -f preun-base.sh @@ -732,6 +731,8 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd +Supplements: packageand(product(SUSE_SLED):kernel-trace) +Supplements: packageand(product(openSUSE):kernel-trace) %description -n kernel-trace-extra This kernel is compiled for realtime applications. @@ -744,7 +745,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun extra -f preun-extra.sh @@ -758,7 +760,50 @@ %files -n kernel-trace-extra -f kernel-extra.files %defattr(-, root, root) %endif + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:08.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-vanilla (Version 2.6.27) +# spec file for package kernel-vanilla (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -57,8 +57,8 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches -Version: 2.6.27 -Release: 19 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -80,9 +80,6 @@ Requires(post): perl-Bootloader Requires(post): mkinitrd Recommends: kerneloops -%if ! %sles_version && %split_packages -Recommends: kernel-vanilla-extra -%endif #!BuildIgnore: perl-Bootloader mkinitrd %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy @@ -100,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27 -Obsoletes: kernel-xenpae <= 2.6.27 +Provides: kernel-xenpae = 2.6.27.1 +Obsoletes: kernel-xenpae <= 2.6.27.1 %endif #!BuildIgnore: xen %endif @@ -127,7 +124,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.27-%source_rel +Provides: kernel = 2.6.27.1-%source_rel %endif %endif %ifarch %ix86 @@ -234,12 +231,13 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-vanilla-2.6.27.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.src.rpm." + echo "The kernel-vanilla-2.6.27.1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -318,7 +316,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27-$RELEASE-vanilla +KERNELRELEASE=2.6.27.1-$RELEASE-vanilla EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -710,7 +708,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun base -f preun-base.sh @@ -736,13 +735,16 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd +Supplements: packageand(product(SUSE_SLED):kernel-vanilla) +Supplements: packageand(product(openSUSE):kernel-vanilla) %description -n kernel-vanilla-extra The standard kernel - without any SUSE patches -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun extra -f preun-extra.sh @@ -756,7 +758,50 @@ %files -n kernel-vanilla-extra -f kernel-extra.files %defattr(-, root, root) %endif + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.K13987/_old 2008-10-16 14:44:08.000000000 +0200 +++ /var/tmp/diff_new_pack.K13987/_new 2008-10-16 14:44:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-xen (Version 2.6.27) +# spec file for package kernel-xen (Version 2.6.27.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -57,8 +57,8 @@ Name: kernel-xen Summary: The Xen Kernel -Version: 2.6.27 -Release: 17 +Version: 2.6.27.1 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -80,9 +80,6 @@ Requires(post): perl-Bootloader Requires(post): mkinitrd Recommends: kerneloops -%if ! %sles_version && %split_packages -Recommends: kernel-xen-extra -%endif #!BuildIgnore: perl-Bootloader mkinitrd %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy @@ -100,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27 -Obsoletes: kernel-xenpae <= 2.6.27 +Provides: kernel-xenpae = 2.6.27.1 +Obsoletes: kernel-xenpae <= 2.6.27.1 %endif #!BuildIgnore: xen %endif @@ -127,7 +124,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.27-%source_rel +Provides: kernel = 2.6.27.1-%source_rel %endif %endif %ifarch %ix86 @@ -218,12 +215,13 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-xen-2.6.27.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.src.rpm." + echo "The kernel-xen-2.6.27.1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -302,7 +300,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27-$RELEASE-xen +KERNELRELEASE=2.6.27.1-$RELEASE-xen EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -699,7 +697,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun base -f preun-base.sh @@ -725,6 +724,8 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd +Supplements: packageand(product(SUSE_SLED):kernel-xen) +Supplements: packageand(product(openSUSE):kernel-xen) %description -n kernel-xen-extra The Linux kernel for Xen paravirtualization. @@ -736,7 +737,8 @@ -Source Timestamp: 2008-10-14 16:02:55 +0200 +Source Timestamp: 2008-10-16 12:51:33 +0200 +CVS Tag: HEAD %preun extra -f preun-extra.sh @@ -750,7 +752,50 @@ %files -n kernel-xen-extra -f kernel-extra.files %defattr(-, root, root) %endif + %changelog +* Thu Oct 16 2008 agruen(a)suse.de +- rpm/kernel-binary.spec.in: Make the kernel-$flavor-extra packages + supplement kernel-$flavor on openSUSE and SLED so that those + packages will get installed by default, using the product(...) + dependencies provided by the *-release packages. +* Thu Oct 16 2008 tonyj(a)suse.de +- Previous checkin was totally broken wrt rt config files. + Revert to previous versions and incorporate any changes from + run_oldconfig. Sole changes to previous versions is to remove + CONFIG_DYNAMIC_FTRACE from rt_debug configs which is consistent + with change in 2.6.27.1 +* Thu Oct 16 2008 gregkh(a)suse.de +- Update to 2.6.27.1 + - disables a problem config option, only affected the vanilla, + debug, and rt kernel variants. +* Wed Oct 15 2008 olh(a)suse.de +- add patches.arch/ppc-pseries_pfn-mem-rm.patch + fix hotplug memory remove (bnc#435181 - LTC48640) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/post.sh, rpm/postun.sh: run weak-modules, depmod and mkinitrd + on older distros (bnc#435246) + Fixed fix for bnc#435104 ("/boot/" was missing in some places) +* Wed Oct 15 2008 mmarek(a)suse.cz +- rpm/kernel-binary.spec.in: don't recommend the -extra subpackage + (fate#303631) +- rpm/postun.sh, rpm/post.sh: remove the temporary workaround +* Wed Oct 15 2008 olh(a)suse.de +- drop patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + not needed anymore +* Wed Oct 15 2008 nfbrown(a)suse.de +- patches.fixes/nfs-file-cred-context-null: nfs_file_cred should + cope if 'file' hasn't been opened properly (bnc#431785). +* Wed Oct 15 2008 tonyj(a)suse.de +- Update RT patches to latest .27 Windriver version (all patches) +- Disable patches.rt/swap-spinlock-fix.patch +- Guard filp-slab-rcu for RT +* Tue Oct 14 2008 jkosina(a)suse.de +- patches.fixes/input-add-acer-aspire-5710-to-nomux.patch: Input: + Add Acer Aspire 5710 to nomux blacklist (bnc#404881). +* Tue Oct 14 2008 oneukum(a)suse.de +- patches.fixes/ehci_sched.diff: Delete. + in mainline now. done to the right tree. * Tue Oct 14 2008 mmarek(a)suse.cz - rpm/postun.sh, rpm/post.sh: temporarily ignore errors from weak-modules2 --{add,remove}-kernel-modules until ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2008-10-14 16:03:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2008-10-16 14:00:11.000000000 +0200 @@ -1 +1,2 @@ -2008-10-14 16:02:55 +0200 +2008-10-16 12:51:33 +0200 +CVS Tag: HEAD ++++++ config.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2008-10-14 15:54:47.000000000 +0200 +++ new/config/i386/debug 2008-10-16 13:58:26.000000000 +0200 @@ -4114,7 +4114,6 @@ # CONFIG_SYSPROF_TRACER is not set CONFIG_SCHED_TRACER=y CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_DYNAMIC_FTRACE=y CONFIG_FTRACE_SELFTEST=y CONFIG_FTRACE_STARTUP_TEST=y CONFIG_PROVIDE_OHCI1394_DMA_INIT=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/rt_debug new/config/i386/rt_debug --- old/config/i386/rt_debug 2008-10-14 15:54:48.000000000 +0200 +++ new/config/i386/rt_debug 2008-10-16 05:06:39.000000000 +0200 @@ -4109,7 +4109,6 @@ CONFIG_SCHED_TRACER=y # CONFIG_EVENT_TRACER is not set CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_DYNAMIC_FTRACE=y CONFIG_FTRACE_SELFTEST=y CONFIG_FTRACE_STARTUP_TEST=y # CONFIG_WAKEUP_LATENCY_HIST is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/vanilla new/config/i386/vanilla --- old/config/i386/vanilla 2008-10-13 16:49:01.000000000 +0200 +++ new/config/i386/vanilla 2008-10-16 01:52:11.000000000 +0200 @@ -4046,7 +4046,6 @@ CONFIG_SYSPROF_TRACER=y # CONFIG_SCHED_TRACER is not set CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_DYNAMIC_FTRACE=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_PROVIDE_OHCI1394_DMA_INIT=y # CONFIG_SAMPLES is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2008-10-14 15:54:48.000000000 +0200 +++ new/config/x86_64/debug 2008-10-16 13:58:27.000000000 +0200 @@ -3836,7 +3836,6 @@ # CONFIG_SYSPROF_TRACER is not set # CONFIG_SCHED_TRACER is not set CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_DYNAMIC_FTRACE=y CONFIG_FTRACE_SELFTEST=y CONFIG_FTRACE_STARTUP_TEST=y CONFIG_PROVIDE_OHCI1394_DMA_INIT=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/rt_debug new/config/x86_64/rt_debug --- old/config/x86_64/rt_debug 2008-10-14 15:54:49.000000000 +0200 +++ new/config/x86_64/rt_debug 2008-10-16 05:06:39.000000000 +0200 @@ -3833,7 +3833,6 @@ # CONFIG_SCHED_TRACER is not set # CONFIG_EVENT_TRACER is not set CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_DYNAMIC_FTRACE=y CONFIG_FTRACE_SELFTEST=y CONFIG_FTRACE_STARTUP_TEST=y # CONFIG_WAKEUP_LATENCY_HIST is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/vanilla new/config/x86_64/vanilla --- old/config/x86_64/vanilla 2008-10-13 16:49:02.000000000 +0200 +++ new/config/x86_64/vanilla 2008-10-16 01:52:11.000000000 +0200 @@ -3763,7 +3763,6 @@ CONFIG_SYSPROF_TRACER=y # CONFIG_SCHED_TRACER is not set CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_DYNAMIC_FTRACE=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_PROVIDE_OHCI1394_DMA_INIT=y # CONFIG_SAMPLES is not set ++++++ kabi.tar.bz2 ++++++ ++++++ minmem ++++++ --- kernel-source/minmem 2008-10-14 18:15:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/minmem 2008-10-16 14:00:24.000000000 +0200 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- kernel-source/needed_space_in_mb 2008-10-14 18:15:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/needed_space_in_mb 2008-10-16 14:00:24.000000000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ patches.addon.tar.bz2 ++++++ ++++++ patches.apparmor.tar.bz2 ++++++ ++++++ patches.arch.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch new/patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch --- old/patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch 2008-03-05 19:19:43.000000000 +0100 +++ new/patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -From: Olaf Hering <olh(a)suse.de> -Subject: remove AVAILABLE_VETH= from /proc/iSeries/config - -All vio devices on legacy iseries are now available via sysfs. -According to google, nothing beside hwinfo uses AVAILABLE_VETH= -So it is safe to remove the line from /proc/iSeries/config and -let everyone use sysfs to discover the configured virtual network interfaces. - - -Signed-off-by: Olaf Hering <olh(a)suse.de> - ---- - arch/powerpc/platforms/iseries/viopath.c | 3 --- - 1 file changed, 3 deletions(-) - ---- a/arch/powerpc/platforms/iseries/viopath.c -+++ b/arch/powerpc/platforms/iseries/viopath.c -@@ -113,7 +113,6 @@ static vio_event_handler_t *vio_handler[ - static int proc_viopath_show(struct seq_file *m, void *v) - { - char *buf; -- u16 vlanMap; - dma_addr_t handle; - HvLpEvent_Rc hvrc; - DECLARE_COMPLETION(done); -@@ -140,7 +139,6 @@ static int proc_viopath_show(struct seq_ - - wait_for_completion(&done); - -- vlanMap = HvLpConfig_getVirtualLanIndexMap(); - - buf[HW_PAGE_SIZE-1] = '\0'; - seq_printf(m, "%s", buf); -@@ -148,7 +146,6 @@ static int proc_viopath_show(struct seq_ - iseries_hv_unmap(handle, HW_PAGE_SIZE, DMA_FROM_DEVICE); - kfree(buf); - -- seq_printf(m, "AVAILABLE_VETH=%x\n", vlanMap); - - node = of_find_node_by_path("/"); - sysid = NULL; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-pseries_pfn-mem-rm.patch new/patches.arch/ppc-pseries_pfn-mem-rm.patch --- old/patches.arch/ppc-pseries_pfn-mem-rm.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/ppc-pseries_pfn-mem-rm.patch 2008-10-15 16:31:01.000000000 +0200 @@ -0,0 +1,46 @@ +Subject: Bug 435181 - DMEM add caused kernel opps after ehca rejected request +From: olh(a)suse.de +References: 435181 + +--- + arch/powerpc/platforms/pseries/hotplug-memory.c | 12 ++++++++++++ + mm/memory_hotplug.c | 4 ++-- + 2 files changed, 14 insertions(+), 2 deletions(-) + +--- a/arch/powerpc/platforms/pseries/hotplug-memory.c ++++ b/arch/powerpc/platforms/pseries/hotplug-memory.c +@@ -22,6 +22,18 @@ static int pseries_remove_lmb(unsigned l + int ret; + + start_pfn = base >> PAGE_SHIFT; ++ ++ if (!pfn_valid(start_pfn)) { ++ /* ++ * Failing hotplug memory add will end up calling ++ * remove device node to clean up. Since its already ++ * added to lmbs, we need to remove it and pretend ++ * success. ++ */ ++ lmb_remove(base, lmb_size); ++ return 0; ++ } ++ + zone = page_zone(pfn_to_page(start_pfn)); + + /* +--- a/mm/memory_hotplug.c ++++ b/mm/memory_hotplug.c +@@ -323,11 +323,11 @@ int __remove_pages(struct zone *zone, un + BUG_ON(phys_start_pfn & ~PAGE_SECTION_MASK); + BUG_ON(nr_pages % PAGES_PER_SECTION); + +- release_mem_region(phys_start_pfn << PAGE_SHIFT, nr_pages * PAGE_SIZE); +- + sections_to_remove = nr_pages / PAGES_PER_SECTION; + for (i = 0; i < sections_to_remove; i++) { + unsigned long pfn = phys_start_pfn + i*PAGES_PER_SECTION; ++ release_mem_region(pfn << PAGE_SHIFT, ++ PAGES_PER_SECTION << PAGE_SHIFT); + ret = __remove_section(zone, __pfn_to_section(pfn)); + if (ret) + break; ++++++ patches.drivers.tar.bz2 ++++++ ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ehci_sched.diff new/patches.fixes/ehci_sched.diff --- old/patches.fixes/ehci_sched.diff 2008-10-07 16:47:49.000000000 +0200 +++ new/patches.fixes/ehci_sched.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -From: David Brownell <david-b(a)pacbell.net> -Subject: fix hang in disable_periodic -References: bnc#403346 -Mainline: unclear -Signed-off-by: Oliver Neukum <oneukum(a)suse.de> - -The grand solution David proposed hasn't arrived. So we -use this to prevent usb_kill_urb() from causing a hang -in disable_periodic() under some circumstances. - ---- linux-2.6.26/drivers/usb/host/ehci-sched.c.alt 2008-10-07 16:37:02.000000000 +0200 -+++ linux-2.6.26/drivers/usb/host/ehci-sched.c 2008-10-07 16:47:03.000000000 +0200 -@@ -467,6 +467,13 @@ static int disable_periodic (struct ehci - if (--ehci->periodic_sched) - return 0; - -+ /* ehci->periodic_sched isn't an exact shadow of CMD_PSE; -+ * make sure it wasn't already cleared. -+ */ -+ cmd = ehci_readl(ehci, &ehci->regs->command); -+ if (!(cmd & CMD_PSE)) -+ return 0; -+ - /* did setting PSE not take effect yet? - * takes effect only at frame boundaries... - */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/input-add-acer-aspire-5710-to-nomux.patch new/patches.fixes/input-add-acer-aspire-5710-to-nomux.patch --- old/patches.fixes/input-add-acer-aspire-5710-to-nomux.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/input-add-acer-aspire-5710-to-nomux.patch 2008-10-14 17:29:45.000000000 +0200 @@ -0,0 +1,28 @@ +From: Jiri Kosina <jkosina(a)suse.cz> +Subject: Input: Add Acer Aspire 5710 to nomux blacklist +References: bnc#404881 +Patch-mainline: submitted + +Acer Aspire needs to be added to nomux blacklist, otherwise the touchpad +misbehaves. + +Signed-off-by: Jiri Kosina <jkosina(a)suse.cz> + +Index: linux-2.6.27/drivers/input/serio/i8042-x86ia64io.h +=================================================================== +--- linux-2.6.27.orig/drivers/input/serio/i8042-x86ia64io.h ++++ linux-2.6.27/drivers/input/serio/i8042-x86ia64io.h +@@ -316,6 +316,13 @@ static struct dmi_system_id __initdata i + }, + }, + { ++ .ident = "Acer Aspire 5710", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Acer"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5710"), ++ }, ++ }, ++ { + .ident = "Gericom Bellagio", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Gericom"), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/nfs-file-cred-context-null new/patches.fixes/nfs-file-cred-context-null --- old/patches.fixes/nfs-file-cred-context-null 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/nfs-file-cred-context-null 2008-10-15 07:46:20.000000000 +0200 @@ -0,0 +1,33 @@ +From: NeilBrown <neilb(a)suse.de> +Subject: nfs_file_cred should cope if 'file' hasn't been opened properly +Patch-mainline: Not relevant +References: bnc#431785 + + +.. and so doesn't have a 'context'. This can happen when e.g. +a chmod on a device-special-file happens. The object isn't opened over +NFS so there is no open context, but we currently look for one when +doing a setattr. + +Signed-off-by: Neil Brown <neilb(a)suse.de> + +--- + include/linux/nfs_fs.h | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- linux-2.6.27-neilb.orig/include/linux/nfs_fs.h ++++ linux-2.6.27-neilb/include/linux/nfs_fs.h +@@ -372,8 +372,11 @@ static inline struct nfs_open_context *n + + static inline struct rpc_cred *nfs_file_cred(struct file *file) + { +- if (file != NULL) +- return nfs_file_open_context(file)->cred; ++ if (file != NULL) { ++ struct nfs_open_context *ctx = nfs_file_open_context(file); ++ if (ctx) ++ return ctx->cred; ++ } + return NULL; + } + ++++++ patches.kernel.org.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.kernel.org/patch-2.6.27.1 new/patches.kernel.org/patch-2.6.27.1 --- old/patches.kernel.org/patch-2.6.27.1 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.kernel.org/patch-2.6.27.1 2008-10-16 01:52:12.000000000 +0200 @@ -0,0 +1,34 @@ +From: Greg Kroah-Hartman <gregkh(a)suse.de> +Subject: Linux 2.6.27.1 + +Upstream 2.6.27.1 release from kernel.org + +Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> + +diff --git a/Makefile b/Makefile +index 16e3fbb..65ab041 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + VERSION = 2 + PATCHLEVEL = 6 + SUBLEVEL = 27 +-EXTRAVERSION = ++EXTRAVERSION = .1 + NAME = Rotary Wombat + + # *DOCUMENTATION* +diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig +index 263e9e6..aa53fdd 100644 +--- a/kernel/trace/Kconfig ++++ b/kernel/trace/Kconfig +@@ -103,7 +103,8 @@ config CONTEXT_SWITCH_TRACER + all switching of tasks. + + config DYNAMIC_FTRACE +- bool "enable/disable ftrace tracepoints dynamically" ++ bool "enable/disable ftrace tracepoints dynamically (BROKEN)" ++ depends on BROKEN + depends on FTRACE + depends on HAVE_DYNAMIC_FTRACE + default y ++++++ patches.rpmify.tar.bz2 ++++++ ++++++ patches.rt.tar.bz2 ++++++ ++++ 27892 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ ++++++ patches.trace.tar.bz2 ++++++ ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ ++++++ post.sh ++++++ --- kernel-source/post.sh 2008-10-14 16:03:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/post.sh 2008-10-16 14:00:17.000000000 +0200 @@ -3,7 +3,7 @@ # On powerpc, the different kernels are for different board/firmware types # They are not compatible. wrong_boardtype() { - echo "This kernel-@FLAVOR@ is for $1, it will not boot on your system." + echo "This kernel-@FLAVOR@ is for $1, it will not boot on this system." echo "The /boot/vmlinux symlink will not be created or updated." exit 0 } @@ -46,13 +46,33 @@ fi # Add symlinks of compatible modules to /lib/modules/$krel/weak-updates/, # run depmod and mkinitrd +wm=/usr/lib/module-init-tools/weak-modules wm2=/usr/lib/module-init-tools/weak-modules2 if [ -x $wm2 ]; then if [ @BASE_PACKAGE@ = 1 ]; then - $wm2 --add-kernel @KERNELRELEASE@ + $wm2 --add-kernel @KERNELRELEASE@ else - nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@ - rpm -ql $nvr | $wm2 --add-kernel-modules @KERNELRELEASE@ || : + nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@ + rpm -ql $nvr | $wm2 --add-kernel-modules @KERNELRELEASE@ + fi +elif [ -x $wm ]; then + # pre CODE11 compatibility + $wm --add-kernel @KERNELRELEASE@ + /sbin/depmod -a -F /boot/System.map-@KERNELRELEASE@ @KERNELRELEASE@ + if [ -f /etc/fstab -a ! -e /.buildenv -a -x /sbin/mkinitrd ] ; then + /sbin/mkinitrd -k /boot/@IMAGE@-@KERNELRELEASE@ \ + -i /boot/initrd-@KERNELRELEASE@ + if [ $? -ne 0 ]; then + echo "/sbin/mkinitrd failed" >&2 + case @SUBPACKAGE@ in + *-base) + echo "Ignoring this for the base subpackage" >&2 + ;; + *) + exit 1 + ;; + esac + fi fi fi @@ -78,9 +98,9 @@ # only run the bootloader if the usual bootloader configuration # files are there -- this is different on every architecture initrd=initrd-@KERNELRELEASE@ - if [ -e $initrd -o ! -e /lib/modules/@KERNELRELEASE@ ] && \ + if [ -e /boot/$initrd -o ! -e /lib/modules/@KERNELRELEASE@ ] && \ run_bootloader ; then - [ -e $initrd ] || initrd= + [ -e /boot/$initrd ] || initrd= # handle 10.2 and SLES10 SP1 or later if [ -x /usr/lib/bootloader/bootloader_entry ]; then /usr/lib/bootloader/bootloader_entry \ ++++++ postun.sh ++++++ --- kernel-source/postun.sh 2008-10-14 16:03:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/postun.sh 2008-10-16 14:00:17.000000000 +0200 @@ -1,8 +1,9 @@ +wm=/usr/lib/module-init-tools/weak-modules wm2=/usr/lib/module-init-tools/weak-modules2 if [ @BASE_PACKAGE@ = 0 ]; then if [ -x $wm2 ]; then nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@ - $wm2 --remove-kernel-modules @KERNELRELEASE@ < /var/run/rpm-$nvr-modules || : + $wm2 --remove-kernel-modules @KERNELRELEASE@ < /var/run/rpm-$nvr-modules fi rm -f /var/run/rpm-$nvr-modules exit 0 @@ -10,6 +11,9 @@ # Remove symlinks from /lib/modules/$krel/weak-updates/. if [ -x $wm2 ]; then $wm2 --remove-kernel @KERNELRELEASE@ +elif [ -x $wm2 ]; then + # pre CODE11 compatibility + $wm --remove-kernel @KERNELRELEASE@ fi # remove /boot/@IMAGE@.previous entry on a 10.1 and SLES10 GA system ++++++ series.conf ++++++ --- kernel-source/series.conf 2008-10-14 16:03:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2008-10-16 14:00:04.000000000 +0200 @@ -27,6 +27,7 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## + patches.kernel.org/patch-2.6.27.1 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -185,6 +186,7 @@ # powerpc/generic ######################################################## patches.arch/ppc-pseries_remove_lmb-PAGE_SHIFTT.patch + patches.arch/ppc-pseries_pfn-mem-rm.patch patches.suse/ppc-no-LDFLAGS_MODULE.patch patches.arch/ppc-vio-modalias.patch patches.arch/ppc-efika-mpc52xx-ac97.patch @@ -202,7 +204,6 @@ patches.drivers/ppc64-adb patches.suse/suse-ppc64-branding patches.arch/ppc64-xmon-dmesg-printing.patch - patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch patches.arch/ppc-prom-nodisplay.patch patches.fixes/ptrace-getsiginfo patches.arch/ppc-ipic-suspend-without-83xx-fix @@ -241,7 +242,7 @@ patches.suse/shmall-bigger patches.fixes/grab-swap-token-oops - patches.suse/filp-slab-rcu +-RT patches.suse/filp-slab-rcu patches.fixes/loop-barriers patches.fixes/loop-barriers2 patches.suse/osync-error @@ -343,6 +344,7 @@ ######################################################## # NFS ######################################################## + patches.fixes/nfs-file-cred-context-null ######################################################## # lockd + statd @@ -628,8 +630,6 @@ ######################################################## # make debugging easier patches.suse/usb-storage-disable-delay.patch - #403346 - patches.fixes/ehci_sched.diff #433817 patches.fixes/wdm_autoload.diff @@ -642,6 +642,7 @@ ######################################################## patches.suse/bootsplash patches.drivers/elousb.patch + patches.fixes/input-add-acer-aspire-5710-to-nomux.patch ########################################################## # Sound @@ -994,7 +995,8 @@ # Real Time (RT) ######################################################## -# disable portions of lttng-instrumentation-irq +# revert portions of SUSE patches allowing RT to apply +# RT versions of reverted changes added back at end of RT series +RT patches.rt/partrevert-lttng-instrumentation-irq.patch +RT patches.rt/revert-preempt-bkl-revert.patch @@ -1865,7 +1867,8 @@ +RT patches.rt/slab-irq-nopreempt-fix.patch +RT patches.rt/ppc-tlbflush-preempt.patch # PG: (rc2) basic ctxt mod. -+RT patches.rt/swap-spinlock-fix.patch +# obsoleted by find_get_page_nodiscard() fix +#+RT patches.rt/swap-spinlock-fix.patch +RT patches.rt/aacraid-compat-sem.patch # percpu fixes to handle debug_smp_processor_id errors. @@ -2077,8 +2080,6 @@ +RT patches.rt/plist-fix-static-node-init.patch # PG: basic context mods +RT patches.rt/sched-only-push-once-per-queue.patch -+RT patches.rt/fix-up-comment.patch -+RT patches.rt/check-for-migration-during-push.patch # PG: basic context mods # PG: (rc6) again basic context mods +RT patches.rt/ftrace-ppc-define-mcount.patch @@ -2111,9 +2112,19 @@ +RT patches.rt/bit-spinlocks-fix-compile.patch +RT patches.rt/nmi-prof-compile.patch +# PG: fix intermittent boot problem w/ timer IRQ being incorrectly threaded ++RT patches.rt/start_irq_thread.patch + # reapply portions of lttng-instrumentation-irq +RT patches.rt/partreadd-lttng-instrumentation-irq.patch +# Patches not yet in .27 WR/upstream +# Gregory Haskins ++RT patches.rt/check-for-migration-during-push.patch ++RT patches.rt/fix-up-comment.patch + ++RT patches.rt/mapping_nrpages2.patch + # Local SUSE RT patches # Fix various issues with debug builds +RT patches.rt/kdb-disable-ist.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit syslinux
by root＠Hilbert.suse.de 16 Oct '08

16 Oct '08

Hello community, here is the log from the commit of package syslinux checked in at Thu Oct 16 14:40:02 CEST 2008. -------- --- arch/i386/syslinux/syslinux.changes 2008-09-10 18:51:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/syslinux/syslinux.changes 2008-10-16 14:34:11.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Oct 16 14:33:43 CEST 2008 - snwint(a)suse.de + +- minor serial line patch fix (bnc #436034) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslinux.spec ++++++ --- /var/tmp/diff_new_pack.H23235/_old 2008-10-16 14:39:50.000000000 +0200 +++ /var/tmp/diff_new_pack.H23235/_new 2008-10-16 14:39:50.000000000 +0200 @@ -29,7 +29,7 @@ AutoReqProv: on Summary: Boot Loader for Linux Version: 3.63 -Release: 41 +Release: 42 Source: %{name}-%{version}.tar.bz2 Source1: isolinux-config Patch: %{name}-%{version}.diff @@ -75,6 +75,8 @@ %{_datadir}/syslinux %changelog +* Thu Oct 16 2008 snwint(a)suse.de +- minor serial line patch fix (bnc #436034) * Wed Sep 10 2008 snwint(a)suse.de - reworked serial line patch (removed SERIALLINES) * Thu Sep 04 2008 snwint(a)suse.de ++++++ syslinux-3.63.diff ++++++ --- /var/tmp/diff_new_pack.H23235/_old 2008-10-16 14:39:50.000000000 +0200 +++ /var/tmp/diff_new_pack.H23235/_new 2008-10-16 14:39:50.000000000 +0200 @@ -2361,12 +2361,12 @@ gfx_user_info_0 dd 0 ; 12: data for info box gfx_user_info_1 dd 0 ; 16: data for info box gfx_bios_mem_size dd 0 ; 20: BIOS memory size (in bytes) -@@ -368,6 +368,8 @@ +@@ -366,6 +366,8 @@ + ; + gfx_get_sysconfig: push ax - mov al,[DriveNumber] - mov [gfx_boot_drive],al + mov ax,[SerialPort] + mov [gfx_serial_port],ax + mov al,[DriveNumber] + mov [gfx_boot_drive],al - %if IS_ISOLINUX - mov ah,2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yauap
by root＠Hilbert.suse.de 16 Oct '08

16 Oct '08

Hello community, here is the log from the commit of package yauap checked in at Thu Oct 16 14:39:00 CEST 2008. -------- --- yauap/yauap.changes 2008-01-14 13:17:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/yauap/yauap.changes 2008-10-16 02:47:50.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 16 02:47:40 CEST 2008 - dmueller(a)suse.de + +- update to version 0.2.3: + * fixed volume control of the playbin element (#22977) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yauap-0.2.2.tar.gz New: ---- yauap-0.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yauap.spec ++++++ --- /var/tmp/diff_new_pack.X15219/_old 2008-10-16 14:37:52.000000000 +0200 +++ /var/tmp/diff_new_pack.X15219/_new 2008-10-16 14:37:52.000000000 +0200 @@ -1,29 +1,37 @@ # -# spec file for package yauap (Version 0.2.2) +# spec file for package yauap (Version 0.2.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: yauap BuildRequires: dbus-1-devel gstreamer010-devel gstreamer010-plugins-base-devel %if %suse_version > 1010 BuildRequires: dbus-1-glib-devel %endif Summary: The useless audio player -Version: 0.2.2 +Version: 0.2.3 Release: 1 Url: http://www.nongnu.org/yauap/ License: LGPL v2.1 or later Group: Productivity/Multimedia/Sound/Players Requires: gstreamer010 gstreamer010-plugins-base-oil gstreamer010-plugins-good dbus-1-x11 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.bz2 %description yauap is a simple commandline audio player based on GStreamer. @@ -32,7 +40,7 @@ Authors: -------- - Sascha Sommer <ssommer(a)suse.de> + Sascha Sommer <saschasommer(a)freenet.de> %prep %setup -q @@ -53,23 +61,26 @@ %{_bindir}/yauap %changelog -* Mon Jan 14 2008 - ssommer(a)suse.de +* Thu Oct 16 2008 dmueller(a)suse.de +- update to version 0.2.3: + * fixed volume control of the playbin element (#22977) +* Mon Jan 14 2008 ssommer(a)suse.de - updated version to 0.2.2 - all fixes have been included -* Fri Sep 28 2007 - dmueller(a)suse.de +* Fri Sep 28 2007 dmueller(a)suse.de - quit when the host closed stdin -* Wed Sep 19 2007 - ssommer(a)suse.de +* Wed Sep 19 2007 ssommer(a)suse.de - report missing plugins (#307754) -* Thu Aug 23 2007 - ssommer(a)suse.de +* Thu Aug 23 2007 ssommer(a)suse.de - make sure that the player stops before a new file starts to play - fix segfault in player_get_scopedata (#301791) -* Tue Jul 31 2007 - ssommer(a)suse.de +* Tue Jul 31 2007 ssommer(a)suse.de - update to yauap 0.2.1: more verbose help output -* Fri Jun 01 2007 - dmueller(a)suse.de +* Fri Jun 01 2007 dmueller(a)suse.de - don't strip binaries -* Fri Jun 01 2007 - ssommer(a)suse.de +* Fri Jun 01 2007 ssommer(a)suse.de - strip binary - package documentation -* Mon Jan 08 2007 - ssommer(a)suse.de +* Mon Jan 08 2007 ssommer(a)suse.de - initial package of version 0.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-users
by root＠Hilbert.suse.de 16 Oct '08

16 Oct '08

Hello community, here is the log from the commit of package yast2-users checked in at Thu Oct 16 14:38:00 CEST 2008. -------- --- yast2-users/yast2-users.changes 2008-10-13 16:56:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2008-10-16 11:50:12.919664000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 16 11:32:53 CEST 2008 - jsuchome(a)suse.cz + +- check the return value of dig command (bnc#435878) +- use domainname to get the domain name (workaround for bnc#393951) +- 2.17.18 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-users-2.17.17.tar.bz2 New: ---- yast2-users-2.17.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.P14703/_old 2008-10-16 14:37:42.000000000 +0200 +++ /var/tmp/diff_new_pack.P14703/_new 2008-10-16 14:37:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-users (Version 2.17.17) +# spec file for package yast2-users (Version 2.17.18) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-users -Version: 2.17.17 +Version: 2.17.18 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-users-2.17.17.tar.bz2 +Source0: yast2-users-2.17.18.tar.bz2 Prefix: /usr BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite Requires: yast2-perl-bindings yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext @@ -52,7 +52,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-users-2.17.17 +%setup -n yast2-users-2.17.18 %build %{prefix}/bin/y2tool y2autoconf @@ -95,6 +95,10 @@ %{_libdir}/YaST2/plugin/libpy2ag_crack.la %doc %{prefix}/share/doc/packages/yast2-users %changelog +* Thu Oct 16 2008 jsuchome(a)suse.cz +- check the return value of dig command (bnc#435878) +- use domainname to get the domain name (workaround for bnc#393951) +- 2.17.18 * Mon Oct 13 2008 jsuchome(a)suse.cz - added CLI option 'batchmode': do not ask for data (bnc#431685) - 2.17.17 ++++++ yast2-users-2.17.17.tar.bz2 -> yast2-users-2.17.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.17/src/cmdline.ycp new/yast2-users-2.17.18/src/cmdline.ycp --- old/yast2-users-2.17.17/src/cmdline.ycp 2008-10-13 15:55:15.000000000 +0200 +++ new/yast2-users-2.17.18/src/cmdline.ycp 2008-10-13 16:56:41.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Command line interface functions. * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: cmdline.ycp 49295 2008-07-21 14:10:36Z jsuchome $ + * $Id: cmdline.ycp 52149 2008-10-13 14:56:39Z jsuchome $ * * All command line interface functions. */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.17/src/groups.ycp new/yast2-users-2.17.18/src/groups.ycp --- old/yast2-users-2.17.17/src/groups.ycp 2008-10-13 15:47:38.000000000 +0200 +++ new/yast2-users-2.17.18/src/groups.ycp 2008-10-13 16:56:41.000000000 +0200 @@ -10,7 +10,7 @@ * Authors: * Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: groups.ycp 23424 2005-05-17 11:35:38Z jsuchome $ + * $Id: groups.ycp 52149 2008-10-13 14:56:39Z jsuchome $ * * Just a shortcut to invoke groups management */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.17/src/UsersSimple.pm new/yast2-users-2.17.18/src/UsersSimple.pm --- old/yast2-users-2.17.17/src/UsersSimple.pm 2008-10-06 13:01:12.000000000 +0200 +++ new/yast2-users-2.17.18/src/UsersSimple.pm 2008-10-16 11:31:35.000000000 +0200 @@ -1218,19 +1218,31 @@ } my $domain = Hostname->CurrentDomain (); + y2milestone ("current domain : '$domain'"); + if (!$domain && Stage->cont ()) + { + my $out = SCR->Execute (".target.bash_output", "domainname"); + if ($out->{"exit"} eq 0) { + $domain = $out->{"stdout"}; + chomp $domain; + y2milestone ("current domain from domainname: '$domain'"); + } + } # First, check if LDAP server is available - my $out = SCR->Execute (".target.bash_output", "dig _ldap._tcp.$domain SRV +short"); + my $out = SCR->Execute (".target.bash_output", "dig '_ldap._tcp.$domain' SRV +short"); y2debug ("dig output: ", Dumper ($out)); my $ldap_server = ""; - foreach my $line (split (/\n/,$out->{"stdout"} || "")) { - y2debug ("line: $line"); - if ($line !~ m/^;/) { - $ldap_server = (split (/[ \t]/, $line))[3] || "."; - chop $ldap_server; - y2debug ("proposed LDAP server '$ldap_server'"); + if ($out->{"exit"} eq 0) { + foreach my $line (split (/\n/,$out->{"stdout"} || "")) { + y2debug ("line: $line"); + if ($line !~ m/^;/) { + $ldap_server = (split (/[ \t]/, $line))[3] || "."; + chop $ldap_server; + y2debug ("proposed LDAP server '$ldap_server'"); + } + last if $ldap_server ne ""; } - last if $ldap_server ne ""; } if ($ldap_server ne "") { @@ -1239,17 +1251,19 @@ } # check if AD server is available - $out = SCR->Execute (".target.bash_output", "dig _ldap._tcp.dc._msdcs.$domain SRV +short"); + $out = SCR->Execute (".target.bash_output", "dig '_ldap._tcp.dc._msdcs.$domain' SRV +short"); y2debug ("dig output: ", Dumper ($out)); my $ad_server = ""; - foreach my $line (split (/\n/,$out->{"stdout"} || "")) { - y2debug ("line: $line"); - if ($line !~ m/^;/) { - $ad_server = (split (/[ \t]/, $line))[3] || "."; - chop $ad_server; - y2debug ("proposed AD server '$ad_server'"); + if ($out->{"exit"} eq 0) { + foreach my $line (split (/\n/,$out->{"stdout"} || "")) { + y2debug ("line: $line"); + if ($line !~ m/^;/) { + $ad_server = (split (/[ \t]/, $line))[3] || "."; + chop $ad_server; + y2debug ("proposed AD server '$ad_server'"); + } + last if $ad_server ne ""; } - last if $ad_server ne ""; } if ($ad_server ne "") { @@ -1260,7 +1274,7 @@ return 1; } # check for eDirectory now - else { + elsif ($ldap_server) { $out = SCR->Execute (".target.bash_output", "ldapsearch -x -h $ldap_server -s base -b '' vendorName | grep -i '^vendorName: Novell'"); y2debug ("ldapsearch output: ", Dumper ($out)); if ($out->{"exit"} eq 0) { @@ -1270,17 +1284,18 @@ } # Now, check if kerberos is available - $out = SCR->Execute (".target.bash_output", "dig _kerberos._udp.$domain SRV +short"); + $out = SCR->Execute (".target.bash_output", "dig '_kerberos._udp.$domain' SRV +short"); y2debug ("dig output: ", Dumper ($out)); my $kdc = ""; - foreach my $line (split (/\n/,$out->{"stdout"} || "")) { - - y2debug ("line: $line"); - if ($line !~ m/^;/) { - $kdc = (split (/[ \t]/, $line))[3] || "."; - chop $kdc; + if ($out->{"exit"} eq 0) { + foreach my $line (split (/\n/,$out->{"stdout"} || "")) { + y2debug ("line: $line"); + if ($line !~ m/^;/) { + $kdc = (split (/[ \t]/, $line))[3] || "."; + chop $kdc; + } + last if $kdc ne ""; } - last if $kdc ne ""; } if ($kdc ne "" && $ldap_server ne "") { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.17/src/users.ycp new/yast2-users-2.17.18/src/users.ycp --- old/yast2-users-2.17.17/src/users.ycp 2008-10-13 15:47:47.000000000 +0200 +++ new/yast2-users-2.17.18/src/users.ycp 2008-10-13 16:56:41.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Main file * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: users.ycp 23424 2005-05-17 11:35:38Z jsuchome $ + * $Id: users.ycp 52149 2008-10-13 14:56:39Z jsuchome $ * * Main file for users and groups configuration. Uses all other files. */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.17/VERSION new/yast2-users-2.17.18/VERSION --- old/yast2-users-2.17.17/VERSION 2008-10-13 16:07:26.000000000 +0200 +++ new/yast2-users-2.17.18/VERSION 2008-10-16 11:33:29.000000000 +0200 @@ -1 +1 @@ -2.17.17 +2.17.18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-samba-client
by root＠Hilbert.suse.de 16 Oct '08

16 Oct '08

Hello community, here is the log from the commit of package yast2-samba-client checked in at Thu Oct 16 14:37:43 CEST 2008. -------- --- yast2-samba-client/yast2-samba-client.changes 2008-10-13 16:07:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-samba-client/yast2-samba-client.changes 2008-10-16 10:00:18.608065000 +0200 @@ -1,0 +2,7 @@ +Wed Oct 15 14:36:15 CEST 2008 - jsuchome(a)suse.cz + +- updated help text for pam_mount configuration +- offer "user=%(DOMAIN_USER)" as a default option value (bnc#433845) +- 2.17.9 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-samba-client-2.17.8.tar.bz2 New: ---- yast2-samba-client-2.17.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.J12892/_old 2008-10-16 14:37:15.000000000 +0200 +++ /var/tmp/diff_new_pack.J12892/_new 2008-10-16 14:37:15.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-samba-client (Version 2.17.8) +# spec file for package yast2-samba-client (Version 2.17.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-samba-client -Version: 2.17.8 +Version: 2.17.9 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-samba-client-2.17.8.tar.bz2 +Source0: yast2-samba-client-2.17.9.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite Requires: yast2-kerberos-client perl-XML-LibXML @@ -46,7 +46,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-samba-client-2.17.8 +%setup -n yast2-samba-client-2.17.9 %build %{prefix}/bin/y2tool y2autoconf @@ -84,6 +84,10 @@ /usr/share/YaST2/schema/autoyast/rnc/samba-client.rnc %doc %{prefix}/share/doc/packages/yast2-samba-client %changelog +* Wed Oct 15 2008 jsuchome(a)suse.cz +- updated help text for pam_mount configuration +- offer "user=%%(DOMAIN_USER)" as a default option value (bnc#433845) +- 2.17.9 * Mon Oct 13 2008 jsuchome(a)suse.cz - enable pam_mount module for PAM (bnc#433845) - do not use tmp config files for leaving domain (bnc#433836) ++++++ yast2-samba-client-2.17.8.tar.bz2 -> yast2-samba-client-2.17.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.17.8/src/dialogs.ycp new/yast2-samba-client-2.17.9/src/dialogs.ycp --- old/yast2-samba-client-2.17.8/src/dialogs.ycp 2008-09-18 11:50:52.000000000 +0200 +++ new/yast2-samba-client-2.17.9/src/dialogs.ycp 2008-10-15 13:17:29.000000000 +0200 @@ -81,6 +81,11 @@ `VSpacing (0.2) ), `HSpacing (0.2))); + if (volume == $[]) + { + // offer this as a default option for new volumes (bnc#433845) + volume["options"] = "user=%(DOMAIN_USER)"; + } foreach (string key, widgets, { UI::ChangeWidget (`id (key), `Value, volume[key]:""); }); @@ -98,10 +103,14 @@ // filter out default keys without value (but leave the rest, so they // may appear on next editing) - return filter (string k, string v, (map<string,string>)volume, ``( + volume = filter (string k, string v, (map<string,string>)volume, ``( v != "" || !contains (["server", "path", "mountpoint", "options", "user"], k) )); + // nothing was added, remove the proposal + if (size (volume) == 1 && volume["options"]:"" == "user=%(DOMAIN_USER)") + volume = $[]; + return volume; } /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.17.8/src/routines.ycp new/yast2-samba-client-2.17.9/src/routines.ycp --- old/yast2-samba-client-2.17.8/src/routines.ycp 2008-10-10 09:39:52.000000000 +0200 +++ new/yast2-samba-client-2.17.9/src/routines.ycp 2008-10-15 13:57:20.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Miscelanous functions for configuration of samba-client. * Authors: Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: routines.ycp 51263 2008-09-18 09:51:07Z jsuchome $ + * $Id: routines.ycp 52143 2008-10-13 14:08:41Z jsuchome $ */ { @@ -424,7 +424,10 @@ string PAMMountHelp () { // help text for PAM Mount table - return _("In the table Mount Server Directories, you can specify server directories (such as home directory) which should be localy mounted when the user is logged in. If mounting should be user-specific, specify User Name for selected rule. Otherwise, the directory is mounted for each user. For more information, see pam_mount.conf manual page."); + return _("In the table Mount Server Directories, you can specify server directories (such as home directory) which should be localy mounted when the user is logged in. If mounting should be user-specific, specify User Name for selected rule. Otherwise, the directory is mounted for each user. For more information, see pam_mount.conf manual page.") + + + // help text for PAM Mount table: example + _("For example, you may use <tt>/home/%(DOMAIN_USER)</tt> value for Remote Path, <tt>~/</tt> value for Local Mount Point to mount the home directory, together with a value <tt>user=%(DOMAIN_USER)</tt> as a part of Options."); } /* EOF */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.17.8/src/SambaNetJoin.pm new/yast2-samba-client-2.17.9/src/SambaNetJoin.pm --- old/yast2-samba-client-2.17.8/src/SambaNetJoin.pm 2008-10-13 12:08:38.000000000 +0200 +++ new/yast2-samba-client-2.17.9/src/SambaNetJoin.pm 2008-10-13 16:08:43.000000000 +0200 @@ -4,7 +4,7 @@ # Summary: Manage samba configuration data (smb.conf). # Authors: Martin Lazar <mlazar(a)suse.cz> # -# $Id: SambaNetJoin.pm 48038 2008-06-04 07:02:01Z jsuchome $ +# $Id: SambaNetJoin.pm 52143 2008-10-13 14:08:41Z jsuchome $ # package SambaNetJoin; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.17.8/src/SambaNmbLookup.pm new/yast2-samba-client-2.17.9/src/SambaNmbLookup.pm --- old/yast2-samba-client-2.17.8/src/SambaNmbLookup.pm 2008-10-09 14:34:37.000000000 +0200 +++ new/yast2-samba-client-2.17.9/src/SambaNmbLookup.pm 2008-10-13 16:08:43.000000000 +0200 @@ -4,7 +4,7 @@ # Authors: Stanislav Visnovsky <visnov(a)suse.cz> # Martin Lazar <mlazar(a)suse.cz> # -# $Id: SambaNmbLookup.pm 50010 2008-08-13 09:12:26Z jsuchome $ +# $Id: SambaNmbLookup.pm 52143 2008-10-13 14:08:41Z jsuchome $ # # Representation of the configuration of samba-client. # Input and output routines. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.17.8/src/SambaWinbind.pm new/yast2-samba-client-2.17.9/src/SambaWinbind.pm --- old/yast2-samba-client-2.17.8/src/SambaWinbind.pm 2008-10-13 12:58:20.000000000 +0200 +++ new/yast2-samba-client-2.17.9/src/SambaWinbind.pm 2008-10-13 16:08:43.000000000 +0200 @@ -4,7 +4,7 @@ # Authors: Stanislav Visnovsky <visnov(a)suse.cz> # Martin Lazar <mlazar(a)suse.cz> # -# $Id: SambaWinbind.pm 51492 2008-09-25 07:22:19Z jsuchome $ +# $Id: SambaWinbind.pm 52143 2008-10-13 14:08:41Z jsuchome $ package SambaWinbind; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.17.8/src/Samba.ycp new/yast2-samba-client-2.17.9/src/Samba.ycp --- old/yast2-samba-client-2.17.8/src/Samba.ycp 2008-10-13 12:21:50.000000000 +0200 +++ new/yast2-samba-client-2.17.9/src/Samba.ycp 2008-10-13 16:08:43.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Data for configuration of samba-client, input and output functions. * Authors: Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: Samba.ycp 51263 2008-09-18 09:51:07Z jsuchome $ + * $Id: Samba.ycp 52143 2008-10-13 14:08:41Z jsuchome $ * * Representation of the configuration of samba-client. * Input and output routines. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.17.8/VERSION new/yast2-samba-client-2.17.9/VERSION --- old/yast2-samba-client-2.17.8/VERSION 2008-10-13 12:25:28.000000000 +0200 +++ new/yast2-samba-client-2.17.9/VERSION 2008-10-15 14:37:29.000000000 +0200 @@ -1 +1 @@ -2.17.8 +2.17.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-registration
by root＠Hilbert.suse.de 16 Oct '08

16 Oct '08

Hello community, here is the log from the commit of package yast2-registration checked in at Thu Oct 16 14:37:32 CEST 2008. -------- --- yast2-registration/yast2-registration.changes 2008-10-14 19:49:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-registration/yast2-registration.changes 2008-10-16 13:14:09.385378000 +0200 @@ -1,0 +2,9 @@ +Thu Oct 16 13:12:43 CEST 2008 - jdsn(a)suse.de + +- call to saveLastZmdConfig added (bnc#435696) +- removed installing the certificate to zmd (bnc#435631) +- add credetials information to services url (bnc#435645) +- fix xulrunner dependency (bnc#435872) +- 2.17.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-registration-2.17.3.tar.bz2 New: ---- yast2-registration-2.17.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.C12785/_old 2008-10-16 14:37:12.000000000 +0200 +++ /var/tmp/diff_new_pack.C12785/_new 2008-10-16 14:37:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-registration (Version 2.17.3) +# spec file for package yast2-registration (Version 2.17.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,20 +19,18 @@ Name: yast2-registration -Version: 2.17.3 +Version: 2.17.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-registration-2.17.3.tar.bz2 +Source0: yast2-registration-2.17.4.tar.bz2 Prefix: /usr Requires: yast2 >= 2.16.6 Requires: suseRegister # because of SourceManager Requires: yast2-packager >= 2.13.152 -%if %sles_version -Requires: zmd rug -%endif +Requires: mozilla-xulrunner190 PreReq: %fillup_prereq BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-testsuite # Internet YCP module @@ -52,7 +50,7 @@ J. Daniel Schmidt <jdsn(a)suse.de> %prep -%setup -n yast2-registration-2.17.3 +%setup -n yast2-registration-2.17.4 %build %{prefix}/bin/y2tool y2autoconf @@ -108,6 +106,12 @@ /var/adm/fillup-templates/sysconfig.suse_register-yast2-registration /var/adm/fillup-templates/sysconfig.automatic_online_update-yast2-registration %changelog +* Thu Oct 16 2008 jdsn(a)suse.de +- call to saveLastZmdConfig added (bnc#435696) +- removed installing the certificate to zmd (bnc#435631) +- add credetials information to services url (bnc#435645) +- fix xulrunner dependency (bnc#435872) +- 2.17.4 * Tue Oct 14 2008 jdsn(a)suse.de - check if initialization of SuseRegister succeeds (bnc#435188) - initialize the target to prevent repeated key import (bnc#435192) ++++++ yast2-registration-2.17.3.tar.bz2 -> yast2-registration-2.17.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.3/configure new/yast2-registration-2.17.4/configure --- old/yast2-registration-2.17.3/configure 2008-10-14 20:40:03.000000000 +0200 +++ new/yast2-registration-2.17.4/configure 2008-10-16 13:21:54.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-registration 2.17.3. +# Generated by GNU Autoconf 2.61 for yast2-registration 2.17.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-registration' PACKAGE_TARNAME='yast2-registration' -PACKAGE_VERSION='2.17.3' -PACKAGE_STRING='yast2-registration 2.17.3' +PACKAGE_VERSION='2.17.4' +PACKAGE_STRING='yast2-registration 2.17.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,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-registration 2.17.3 to adapt to many kinds of systems. +\`configure' configures yast2-registration 2.17.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-registration 2.17.3:";; + short | recursive ) echo "Configuration of yast2-registration 2.17.4:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-registration configure 2.17.3 +yast2-registration configure 2.17.4 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,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-registration $as_me 2.17.3, which was +It was created by yast2-registration $as_me 2.17.4, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-registration' - VERSION='2.17.3' + VERSION='2.17.4' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.3" +VERSION="2.17.4" RPMNAME="yast2-registration" MAINTAINER="J. Daniel Schmidt <jdsn(a)suse.de>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-registration $as_me 2.17.3, which was +This file was extended by yast2-registration $as_me 2.17.4, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-registration config.status 2.17.3 +yast2-registration config.status 2.17.4 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.3/configure.in new/yast2-registration-2.17.4/configure.in --- old/yast2-registration-2.17.3/configure.in 2008-10-14 20:39:54.000000000 +0200 +++ new/yast2-registration-2.17.4/configure.in 2008-10-16 13:21:50.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-registration, 2.17.3, http://bugs.opensuse.org/, yast2-registration) +AC_INIT(yast2-registration, 2.17.4, http://bugs.opensuse.org/, yast2-registration) 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.17.3" +VERSION="2.17.4" RPMNAME="yast2-registration" MAINTAINER="J. Daniel Schmidt <jdsn(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.3/src/clients/inst_suse_register.ycp new/yast2-registration-2.17.4/src/clients/inst_suse_register.ycp --- old/yast2-registration-2.17.3/src/clients/inst_suse_register.ycp 2008-10-14 19:39:24.000000000 +0200 +++ new/yast2-registration-2.17.4/src/clients/inst_suse_register.ycp 2008-10-16 13:07:32.000000000 +0200 @@ -532,11 +532,17 @@ } else { - // check for and install mozilla-xulrunner if needed (#175166), modified due to (#304310) - string required_package = "mozilla-xulrunner181"; - if (!Package::Installed(required_package)) + // see if xulrunner is already there (bnc#435872) + cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/xulrunner") == 0 ? true:false; + + if ( ! cmd_ok ) { - Package::InstallAllMsg([required_package], nil); + // check for and install mozilla-xulrunner if needed (#175166), modified due to (#304310), modified due to (bnc#435872) + string required_package = "mozilla-xulrunner190"; + if (!Package::Installed(required_package)) + { + Package::InstallAllMsg([required_package], nil); + } } cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/xulrunner") == 0 ? true:false; bcmd = " MOZ_DISABLE_PANGO=1 /usr/bin/xulrunner /usr/share/YaST2/yastbrowser/application.ini -url "; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.3/src/modules/Register.ycp new/yast2-registration-2.17.4/src/modules/Register.ycp --- old/yast2-registration-2.17.3/src/modules/Register.ycp 2008-10-14 20:38:35.000000000 +0200 +++ new/yast2-registration-2.17.4/src/modules/Register.ycp 2008-10-16 13:18:04.000000000 +0200 @@ -36,6 +36,7 @@ map<string, any> contextDataSR = nil; map<string, map<string, string> > argsDataSR = nil; integer initialSRstatus = nil; +boolean repoUpdateSuccessful = true; // flag success of repo changes for saveLastZmdConfig (bnc#435696) // ------------------------------------------------------------------ // END: Locally defined data @@ -563,22 +564,16 @@ if ( trust ) { string installCert = sformat("cp -a %1 %2 && c_rehash %3", certTmpFile, smtpemFile, smtpemPath); - string installCertZMD = sformat("[ -d /etc/zmd/trusted-certs ] && cp -a %1 /etc/zmd/trusted-certs/registration-server.cer", certTmpFile); + // removed installing the certificate as well to zmd (bnc#435631) - integer instret = (integer) SCR::Execute(.target.bash, installCert); - integer instretZMD = (integer) SCR::Execute(.target.bash, installCertZMD); - - if ( instret == 0 && instretZMD == 0) + if ( (integer) SCR::Execute(.target.bash, installCert) == 0 ) { y2milestone("Successfully installed SMT certificate. Registration will now proceed."); return `ok; } else { - if (instret == 0 ) - y2error("Failed to install SMT certificate to common cert storage. Registration would fail and thus will be skipped."); - if (instretZMD == 0) - y2error("Failed to install SMT certificate for ZMD. Registration would fail and thus will be skipped."); + y2error("Failed to install SMT certificate to common cert storage. Registration would fail and thus will be skipped."); if (!ay) Popup::Message(_("Installation of the SMT certificates failed.\nPlease see the logs for further information.")); return `silentskip; @@ -852,10 +847,12 @@ if ( ! is(pAny, map) ) { y2error("A catalog returned by SuseRegister did not contain any details: %1", catalog); + repoUpdateSuccessful = false; } else if ( catalog == nil || catalog == "" ) { y2error("A catalog returned by SuseRegister has no or an invalid name."); + repoUpdateSuccessful = false; } else { @@ -864,12 +861,14 @@ if ( catDetail["ALIAS"]:"" == nil || catDetail["ALIAS"]:"" == "" ) { y2error("A catalog returned by SuseRegister has no or an invalid alias name."); + repoUpdateSuccessful = false; } else { if ( catDetail["TASK"]:"" == nil || catDetail["TASK"]:"" == "" ) { y2error("A catalog returned by SuseRegister has an invalid task: %1", catalog); + repoUpdateSuccessful = false; } else if ( catDetail["TASK"]:"" == "le" || catDetail["TASK"]:"" == "le" ) { @@ -890,12 +889,13 @@ else { y2error("A catalog returned by SuseRegister has an unsupported task: %1 (%2)", catalog, service); + repoUpdateSuccessful = false; } } } }); - + // FIXME: this should be done via the Pkg API - but these function is not available yet - so do it manually for now foreach (string fService, list<string> fCatalogs, catalogToDisable, { string toDisableString = "\"" + mergestring(fCatalogs, "\" \"") + "\""; integer retval = (integer) SCR::Execute(.target.bash, sformat(" [ -f /etc/zypp/services.d/%1.service ] && cat >> /etc/zypp/services.d/%2.service <<THISISTHEENDOFTHEFILE @@ -909,15 +909,16 @@ else { y2error("Catalogs returned by SuseRegister could not be disabled: %1 (%2)", toDisableString, service); + repoUpdateSuccessful = false; } }); - + // FIXME: this should be done via the Pkg API - but these function is not available yet - so do it manually for now foreach (string fService, list<string> fCatalogs, catalogToEnable, { string toEnableString = "\"" + mergestring(fCatalogs, "\" \"") + "\""; - integer retval = (integer) SCR::Execute(.target.bash, sformat(" [ -f /etc/zypp/services.d/%1.service ] && cat >> /etc/zypp/services.d/%1.service <<THISISTHEENDOFTHEFILE -repostoenable = %2 -THISISTHEENDOFTHEFILE", service, toEnableString )); + integer retval = (integer) SCR::Execute(.target.bash, sformat(" [ -f /etc/zypp/services.d/%1.service ] && cat >> /etc/zypp/services.d/%2.service <<THISISTHEENDOFTHEFILE +repostoenable = %3 +THISISTHEENDOFTHEFILE", service, service, toEnableString )); if ( retval == 0 ) { @@ -926,6 +927,7 @@ else { y2error("Catalogs returned by SuseRegister could not be enabled: %1 (%2)", toEnableString, service); + repoUpdateSuccessful = false; } }); @@ -963,16 +965,19 @@ if ( ! is(pAny, map) ) { y2error("A service returned by SuseRegister did not contain any details: %1", pService); + repoUpdateSuccessful = false; } else if ( pService == nil || pService == "" ) { y2error("A service returned by SuseRegister has no or an invalid name."); + repoUpdateSuccessful = false; } else { if ( ! is( ((map) pAny)["TYPE"]:"", string) ) { y2error("A service returned by SuseRegister has an invalid type: %1 (%2)", pService, ((map) pAny)["TYPE"]:""); + repoUpdateSuccessful = false; } if ( ((map) pAny)["TYPE"]:"" == "zypp" ) { @@ -980,6 +985,7 @@ if ( ! is( ((map) pAny)["TASK"]:"", string) ) { y2error("A service returned by SuseRegister has an invalid task: %1 (%2)", pService, ((map) pAny)["TASK"]:"" ); + repoUpdateSuccessful = false; } else if ( ((map) pAny)["TASK"]:"" == "le" || ((map) pAny)["TASK"]:"" == "ld" ) { @@ -1006,6 +1012,7 @@ if ( newSrcID == nil ) { y2error("Adding a new service failed: %1", pService ); + repoUpdateSuccessful = false; } else { @@ -1023,6 +1030,7 @@ if ( srcID == nil ) { y2error("A service that should be deleted can not be found: %1", pService); + repoUpdateSuccessful = false; } else { @@ -1034,12 +1042,14 @@ else { y2error("Could not delete a service: %1 (%2)", pService, srcID); + repoUpdateSuccessful = false; } } } else { y2error("A service returned by SuseRegister has an unsupported task: %1 (%2)", pService, ((map) pAny)["TASK"]:"" ); + repoUpdateSuccessful = false; } } @@ -1050,6 +1060,7 @@ if ( ! is( ((map) pAny)["TASK"]:"", string) ) { y2error("A service returned by SuseRegister has an invalid task: %1 (%2)", pService, ((map) pAny)["TASK"]:"" ); + repoUpdateSuccessful = false; } else if ( ((map) pAny)["TASK"]:"" == "ld" ) { @@ -1070,6 +1081,7 @@ else { y2error("A service returned by SuseRegister did not contain any catalogs."); + repoUpdateSuccessful = false; } } else if ( ((map) pAny)["TASK"]:"" == "a" ) @@ -1077,55 +1089,61 @@ // ServiceAdd y2milestone("According to SuseRegister a service has to be added: %1", pService); - if ( Pkg::ServiceAdd( ((map) pAny)["ALIAS"]:"", ((map) pAny)["URL"]:"" ) ) + // add credetials information (bnc#435645) + map serviceAddUrl = URL::Parse( ((map) pAny)["URL"]:"" ); + string queryJoinChar = ""; + if ( size( (string)serviceAddUrl["query"]:"" ) > 0 ) + { + queryJoinChar = "&"; + } + serviceAddUrl["query"] = (string) serviceAddUrl["query"]:"" + queryJoinChar + "credentials=NCCcredentials"; + + if ( Pkg::ServiceAdd( ((map) pAny)["ALIAS"]:"", URL::Build(serviceAddUrl) ) ) { y2milestone("Successfully added a new service: %1", pService); y2milestone("Now checking the catalogs of the service: %1", pService); summary = add(summary, sformat(_("Added Service: %1"), pService )); -// ------------------->>>>> FIXME - // need to save service to the system first?? - // documentation of Pkg::ServiceRefresh says : "Refresh the service, the service must already be saved on the system!" - // is this done with Pkg::SourceSaveAll() ?? - // service != source ?? -/* - if ( Pkg::SourceSaveAll() ) - { - y2milestone("Successfully saved all sources."); - } - else - { - y2error("Could not save all sources."); - } -*/ - - // need to call Pkg::ServiceRefresh() before checking the catalogs - if ( Pkg::ServiceRefresh(pService) ) - { - y2milestone("Successfully refreshed service: %1", pService); - } - else + // because the Pkg bindings do not operate on the system directly we need to save them before we can continue +// if ( Pkg::ServiceSave ) // function not yet available + if ( true ) { - y2error("Could not refresh service: %1", pService); - } + y2milestone("Successfully saved services."); - // then iterate over catalogs - any catalogsMap = ((map) pAny)["CATALOGS"]:$[]; - if ( is( catalogsMap , map) && catalogsMap != $[] ) - { - y2milestone("A new service returned by SuseRegister has catalogs that will be checked now."); - list<string> cSummary = checkCatalogs( (map<string, any>) catalogsMap, pService ); - summary = (list<string>) merge(summary, cSummary); + if ( Pkg::ServiceRefresh(pService) ) + { + y2milestone("Successfully refreshed service: %1", pService); + + // then iterate over catalogs + any catalogsMap = ((map) pAny)["CATALOGS"]:$[]; + if ( is( catalogsMap , map) && catalogsMap != $[] ) + { + y2milestone("A new service returned by SuseRegister has catalogs that will be checked now."); + list<string> cSummary = checkCatalogs( (map<string, any>) catalogsMap, pService ); + summary = (list<string>) merge(summary, cSummary); + } + else + { + y2error("A new service returned by SuseRegister did not contain any catalogs."); + repoUpdateSuccessful = false; + } + } + else + { + y2error("Could not refresh service: %1", pService); + repoUpdateSuccessful = false; + } } else { - y2error("A new service returned by SuseRegister did not contain any catalogs."); + y2error("Could not save services to the system."); + repoUpdateSuccessful = false; } - } else { y2error("Adding a new service failed: %1", pService); + repoUpdateSuccessful = false; } } @@ -1142,16 +1160,19 @@ else { y2error("Could not delete a service: %1", pService); + repoUpdateSuccessful = false; } } else { y2error("A service returned by SuseRegister has an unsupported task: %1 (%2)", pService, ((map) pAny)["TASK"]:"" ); + repoUpdateSuccessful = false; } } else { y2error("A service returned by SuseRegister has an unsupported type: %1 (%2)", pService, ((map) pAny)["TYPE"]:"" ); + repoUpdateSuccessful = false; } } @@ -1175,6 +1196,17 @@ } } + if ( repoUpdateSuccessful ) + { + y2error("SuseRegister will now save the lastZmdConfig."); + YSR::saveLastZmdConfig(); + } + else + { + y2error("Error occurred while changing the systems repositories according to the instructions of SuseRegister. SuseRegister will not save this status as lastZmdConfig."); + } + + return summary; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.3/VERSION new/yast2-registration-2.17.4/VERSION --- old/yast2-registration-2.17.3/VERSION 2008-10-14 18:06:13.000000000 +0200 +++ new/yast2-registration-2.17.4/VERSION 2008-10-16 13:09:59.000000000 +0200 @@ -1 +1 @@ -2.17.3 +2.17.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-printer
by root＠Hilbert.suse.de 16 Oct '08

16 Oct '08

Hello community, here is the log from the commit of package yast2-printer checked in at Thu Oct 16 14:37:06 CEST 2008. -------- --- yast2-printer/yast2-printer.changes 2008-10-13 17:03:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2008-10-16 12:32:42.479785000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 16 12:12:23 CEST 2008 - jsrain(a)suse.cz + +- fixed printer proposal (bnc #431559) +- 2.17.22 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-printer-2.17.21.tar.bz2 New: ---- yast2-printer-2.17.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.X11423/_old 2008-10-16 14:36:52.000000000 +0200 +++ /var/tmp/diff_new_pack.X11423/_new 2008-10-16 14:36:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.17.21) +# spec file for package yast2-printer (Version 2.17.22) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Url: http://en.opensuse.org/YaST/Modules/Printer Name: yast2-printer -Version: 2.17.21 +Version: 2.17.22 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.17.21.tar.bz2 +Source0: yast2-printer-2.17.22.tar.bz2 Prefix: /usr BuildRequires: cups-devel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite Recommends: netcat @@ -64,7 +64,7 @@ Michal Zugec <mzugec(a)suse.cz> %prep -%setup -n yast2-printer-2.17.21 +%setup -n yast2-printer-2.17.22 %build %{prefix}/bin/y2tool y2autoconf @@ -118,8 +118,10 @@ %doc %{prefix}/share/doc/packages/yast2-printer %exclude %{prefix}/share/doc/packages/yast2-printer/COPYING %exclude %{prefix}/share/doc/packages/yast2-printer/README - %changelog +* Thu Oct 16 2008 jsrain(a)suse.cz +- fixed printer proposal (bnc #431559) +- 2.17.22 * Mon Oct 13 2008 mzugec(a)suse.cz - fixed Connection Wizard - some help text improvements ++++++ yast2-printer-2.17.21.tar.bz2 -> yast2-printer-2.17.22.tar.bz2 ++++++ ++++ 4679 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-printer-2.17.21/configure.in new/yast2-printer-2.17.22/configure.in --- old/yast2-printer-2.17.21/configure.in 2008-10-13 16:49:13.000000000 +0200 +++ new/yast2-printer-2.17.22/configure.in 2008-10-16 12:32:14.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-printer dnl -dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-printer, 2.17.19, http://bugs.opensuse.org/, yast2-printer) +AC_INIT(yast2-printer, 2.17.22, http://bugs.opensuse.org/, yast2-printer) 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.17.19" +VERSION="2.17.22" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" 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-printer-2.17.21/src/printer_proposal.ycp new/yast2-printer-2.17.22/src/printer_proposal.ycp --- old/yast2-printer-2.17.21/src/printer_proposal.ycp 2008-08-11 13:09:24.000000000 +0200 +++ new/yast2-printer-2.17.22/src/printer_proposal.ycp 2008-10-16 11:55:47.000000000 +0200 @@ -47,7 +47,7 @@ /* create a textual proposal */ if(func == "MakeProposal") { - string proposal = ""; + list<string> proposal = []; string warning = nil; symbol warning_level = nil; boolean force_reset = param["force_reset"]:false; @@ -58,11 +58,17 @@ Printer::Read(); Progress::set (progress_orig); } - list sum = Printer::QueueItems( true, true ); - proposal = sum[0]:""; + + proposal = maplist ( map< string, string > queue, Printer::queues, { + string description = queue["description"]:""; + return description; + }); + proposal = filter (string p, proposal, { return p != ""; }); + if (size (proposal) == 0) + proposal = [ _("No printer queue configured.") ]; ret = $[ - "preformatted_proposal" : proposal, + "raw_proposal" : proposal, "warning_level" : warning_level, "warning" : warning, ]; 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-printer-2.17.21/VERSION new/yast2-printer-2.17.22/VERSION --- old/yast2-printer-2.17.21/VERSION 2008-10-13 17:00:26.000000000 +0200 +++ new/yast2-printer-2.17.22/VERSION 2008-10-16 12:12:44.000000000 +0200 @@ -1 +1 @@ -2.17.21 +2.17.22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ldap-server
by root＠Hilbert.suse.de 16 Oct '08

16 Oct '08

Hello community, here is the log from the commit of package yast2-ldap-server checked in at Thu Oct 16 14:36:55 CEST 2008. -------- --- yast2-ldap-server/yast2-ldap-server.changes 2008-10-08 18:09:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ldap-server/yast2-ldap-server.changes 2008-10-15 15:35:08.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Oct 15 14:52:59 CEST 2008 - rhafer(a)suse.de + +- Version 2.17.11 + * Error message when initialization fails (bnc#435642) + * restart slapd when needed (bnc#435625) + * Add not about back-config to slapd.conf (bnc#435623) + * Fixed typo (bnc#435153) + * Remove some unused code, less verbose default logging + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ldap-server-2.17.10.tar.bz2 New: ---- yast2-ldap-server-2.17.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-server.spec ++++++ --- /var/tmp/diff_new_pack.o10995/_old 2008-10-16 14:36:44.000000000 +0200 +++ /var/tmp/diff_new_pack.o10995/_new 2008-10-16 14:36:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ldap-server (Version 2.17.10) +# spec file for package yast2-ldap-server (Version 2.17.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-ldap-server -Version: 2.17.10 +Version: 2.17.11 Release: 1 License: GPL v2 or later; X11/MIT Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-server-2.17.10.tar.bz2 +Source0: yast2-ldap-server-2.17.11.tar.bz2 Prefix: /usr BuildRequires: boost-devel gcc-c++ libldapcpp-devel perl-Digest-SHA1 perl-X500-DN perl-gettext pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client Requires: acl net-tools perl perl-Digest-SHA1 perl-gettext perl-X500-DN yast2 yast2-ca-management yast2-ldap-client yast2-perl-bindings yast2-users @@ -41,7 +41,7 @@ Andreas Bauer <abauer(a)suse.de> %prep -%setup -n yast2-ldap-server-2.17.10 +%setup -n yast2-ldap-server-2.17.11 %build %{prefix}/bin/y2tool y2autoconf @@ -86,6 +86,13 @@ /usr/share/YaST2/scrconf/* %doc %{prefix}/share/doc/packages/yast2-ldap-server %changelog +* Wed Oct 15 2008 rhafer(a)suse.de +- Version 2.17.11 + * Error message when initialization fails (bnc#435642) + * restart slapd when needed (bnc#435625) + * Add not about back-config to slapd.conf (bnc#435623) + * Fixed typo (bnc#435153) + * Remove some unused code, less verbose default logging * Wed Oct 08 2008 rhafer(a)suse.de - Version 2.17.10 * fixed typo and HTML on online help (bnc#430521,bnc#432416, ++++++ yast2-ldap-server-2.17.10.tar.bz2 -> yast2-ldap-server-2.17.11.tar.bz2 ++++++ ++++ 55458 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-ldap-server-2.17.10/config.h.in new/yast2-ldap-server-2.17.11/config.h.in --- old/yast2-ldap-server-2.17.10/config.h.in 2008-10-07 17:54:22.000000000 +0200 +++ new/yast2-ldap-server-2.17.11/config.h.in 2008-10-15 14:56:16.000000000 +0200 @@ -45,10 +45,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - /* Name of package */ #undef PACKAGE 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-ldap-server-2.17.10/configure.in new/yast2-ldap-server-2.17.11/configure.in --- old/yast2-ldap-server-2.17.10/configure.in 2008-10-07 17:54:04.000000000 +0200 +++ new/yast2-ldap-server-2.17.11/configure.in 2008-10-15 14:55:56.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ldap-server, 2.17.10, http://bugs.opensuse.org/, yast2-ldap-server) +AC_INIT(yast2-ldap-server, 2.17.11, http://bugs.opensuse.org/, yast2-ldap-server) 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.17.10" +VERSION="2.17.11" RPMNAME="yast2-ldap-server" MAINTAINER="Ralf Haferkamp <rhafer(a)suse.de>" 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-ldap-server-2.17.10/src/agent/SlapdConfigAgent.cc new/yast2-ldap-server-2.17.11/src/agent/SlapdConfigAgent.cc --- old/yast2-ldap-server-2.17.10/src/agent/SlapdConfigAgent.cc 2008-10-07 17:46:50.000000000 +0200 +++ new/yast2-ldap-server-2.17.11/src/agent/SlapdConfigAgent.cc 2008-10-15 14:48:10.000000000 +0200 @@ -190,6 +190,7 @@ lastError->add(YCPString("summary"), YCPString(errstring) ); lastError->add(YCPString("description"), YCPString( details ) ); + y2milestone("Error connection to the LDAP Server: %s", details.c_str()); delete(lc); return YCPBoolean(false); } @@ -262,7 +263,7 @@ YCPMapIterator j = dbMap.begin(); for ( ; j != dbMap.end(); j++ ) { - y2milestone("Key: %s, Valuetype: %s", + y2debug("Key: %s, Valuetype: %s", j.key()->asString()->value_cstr(), j.value()->valuetype_str() ); if ( std::string("suffix") == j.key()->asString()->value_cstr() ) @@ -580,7 +581,7 @@ for ( ; j != idx.end(); j++ ) { YCPMap ycpIdx; - y2milestone("indexed Attribute: \"%s\"", j->first.c_str() ); + y2debug("indexed Attribute: \"%s\"", j->first.c_str() ); std::vector<IndexType>::const_iterator k = j->second.begin(); for ( ; k != j->second.end(); k++ ) { @@ -748,7 +749,7 @@ // Attention! This code assumes that supertypes have been // read prior to their subtypes if ( j->getSuperiorOid() != "" ){ - y2milestone("'%s' is a subtype of '%s'",j->getName().c_str(), j->getSuperiorOid().c_str() ); + y2debug("'%s' is a subtype of '%s'",j->getName().c_str(), j->getSuperiorOid().c_str() ); // locate Supertype YCPMap supMap = resMap->value(YCPString(j->getSuperiorOid()))->asMap(); @@ -893,7 +894,7 @@ for ( ; i != tlsMap.end(); i++ ) { std::string key(i.key()->asString()->value_cstr() ); - y2milestone("tlsMap Key: %s", key.c_str() ); + y2debug("tlsMap Key: %s", key.c_str() ); if ( key == "caCertDir" ) { if ( ! i.value().isNull() ) @@ -1022,7 +1023,7 @@ YCPMapIterator j = dbMap.begin(); for ( ; j != dbMap.end(); j++ ) { - y2milestone("Key: %s, Valuetype: %s", + y2debug("Key: %s, Valuetype: %s", j.key()->asString()->value_cstr(), j.value()->valuetype_str() ); if ( std::string("suffix") == j.key()->asString()->value_cstr() ) @@ -1309,7 +1310,7 @@ value = accessList->value(k)->asMap()->value( YCPString("value") )->asString()->value_cstr(); } std::string level( accessList->value(k)->asMap()->value( YCPString("level") )->asString()->value_cstr() ); - y2milestone("level %s, type %s, value %s", level.c_str(), type.c_str(), value.c_str() ); + y2debug("level %s, type %s, value %s", level.c_str(), type.c_str(), value.c_str() ); boost::shared_ptr<OlcAclBy> by( new OlcAclBy( level, type, value ) ); byList.push_back( by ); } 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-ldap-server-2.17.10/src/complex.ycp new/yast2-ldap-server-2.17.11/src/complex.ycp --- old/yast2-ldap-server-2.17.10/src/complex.ycp 2008-10-01 16:01:20.000000000 +0200 +++ new/yast2-ldap-server-2.17.11/src/complex.ycp 2008-10-15 14:48:10.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Andreas Bauer <abauer(a)suse.de> * - * $Id: complex.ycp 51752 2008-10-01 14:01:20Z rhafer $ + * $Id: complex.ycp 52249 2008-10-15 12:47:52Z rhafer $ */ { @@ -61,78 +61,10 @@ return `abort; } -/* Code for replacing the cn=config password temporarily - string oldRootPw = ""; - string newRootPw = ""; - string newRootPwCrypt = ""; - string entry = (string) SCR::Read(.target.string, "/etc/openldap/slapd.d/cn=config/olcDatabase={0}config.ldif"); - list<string> attrlist = splitstring( entry, "\n"); - list<string> newAttrlist = []; - - // Generate a temporary password - map pwMap = (map) SCR::Execute( .target.bash_output, "/usr/sbin/slappasswd -g"); - if ( (integer)(pwMap["exit"]:0) == 0 ) - { - newRootPw = (string) pwMap["stdout"]:""; - string cmd = sformat("/usr/sbin/slappasswd -h {SSHA} -n -s %1", newRootPw); - map cryptPwMap = (map) SCR::Execute( .target.bash_output, cmd); - if ( (integer)(cryptPwMap["exit"]:0) == 0 ) - { - newRootPwCrypt = (string) cryptPwMap["stdout"]:""; - y2milestone("crypted PW: %1", newRootPwCrypt ); - } - } - - // find and replace (or append) the password - boolean replaced = false; - foreach( string i, attrlist, - { - y2milestone("attr <%1> len %2", i, size(i)); - if ( regexpmatch( tolower(i), "^olcrootpw" ) ) { - // attr might be the base64 encoded password hash (": <hash>") - list<string> attr = regexptokenize( i, "^([^:]+):(.+)"); - oldRootPw = attr[1]:""; - newAttrlist[size(newAttrlist)] = sformat("olcRootPW: %1", newRootPwCrypt); - replaced = true; - } else { - if ( size(i) > 0 ) - { - newAttrlist[size(newAttrlist)] = i; - } - } - } - ); - if (! replaced ) - { - newAttrlist[size(newAttrlist)] = sformat("olcRootPW: %1", newRootPwCrypt); - } - newAttrlist[size(newAttrlist)] = ""; - string newEntry = mergestring(newAttrlist, "\n"); - boolean result = SCR::Write(.target.string, - "/etc/openldap/slapd.d/cn=config/olcDatabase={0}config.ldif", newEntry); - - y2milestone("Updated config.ldif %1", result); - list<string> progress_items = []; - if ( switchToBackConfig ) { - if ( isRunning ) { - progress_items[size(progress_items)] = _("Stopping the OpenLDAP Server."); - } - progress_items[size(progress_items)] = _("Switching configuration backend to \"ldap\"."); - progress_items[size(progress_items)] = _("Cleaning up configuration directory."); - } - if ( convert ) { - progress_items[size(progress_items)] = _("Converting config file."); - } - Progress::New("Caption", "Progress Title", size(progress_items), progress_items, progress_items, ""); - foreach( string i, progress_items, { - Progress::NextStage(); - } - ); -*/ - boolean ret = LdapServer::Read(); if ( ! ret ) { + DisplayError( LdapServer::ReadError() ); return `abort; } boolean hasBackconfig = LdapServer::IsUsingBackconfig(); 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-ldap-server-2.17.10/src/LdapServer.pm new/yast2-ldap-server-2.17.11/src/LdapServer.pm --- old/yast2-ldap-server-2.17.10/src/LdapServer.pm 2008-10-07 17:46:50.000000000 +0200 +++ new/yast2-ldap-server-2.17.11/src/LdapServer.pm 2008-10-15 14:52:51.000000000 +0200 @@ -4,7 +4,7 @@ # Summary: LdapServer settings, input and output functions # Authors: Ralf Haferkamp <rhafer(a)suse.de>, Andreas Bauer <abauer(a)suse.de> # -# $Id: LdapServer.pm 51897 2008-10-07 08:58:23Z rhafer $ +# $Id: LdapServer.pm 52251 2008-10-15 12:52:47Z rhafer $ # # Representation of the configuration of ldap-server. # Input and output routines. @@ -35,6 +35,7 @@ my %error = ( msg => undef, details => undef ); my $usingDefaults = 1; my $readConfig = 0; +my $restartRequired = 0; my $configured = 0; my $usesBackConfig = 0; my $slapdConfChanged = 0; @@ -191,7 +192,7 @@ # BEGIN { $TYPEINFO{Read} = ["function", "boolean"]; } sub Read { - y2milestone(""); + my $self = shift; SuSEFirewall->Read(); my $progressItems = [ "Reading Startup Configuration", @@ -229,7 +230,12 @@ { # assume a changed config as we don't ship a default for back-config $slapdConfChanged = 1; - SCR->Execute('.ldapserver.init' ); + if ( ! SCR->Execute('.ldapserver.init' ) ) + { + my $err = SCR->Error(".ldapserver"); + $self->SetError( _("Error while initializing the configuration.\nIs the LDAPI listener enabled?"), $err->{'description'} ); + return 0; + } my $rc = SCR->Read('.ldapserver.databases'); $usingDefaults = 0; $readConfig = 1; @@ -623,14 +629,7 @@ return 0; } Progress->NextStage(); - $rc = $self->CreateBaseObjects(); - if (! $rc ) - { - y2error("Error while creating base objects"); - $self->SetError( _("Creating base objects failed.") ); - Progress->Finish(); - return 0; - } + $self->CreateBaseObjects(); if ( $write_ldapconf ) { y2milestone("Updating /etc/openldap/ldap.conf"); @@ -639,6 +638,26 @@ SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".base", [$ldapconf_base]); } + if (! $usesBackConfig ) + { + SCR->Execute('.target.bash', 'cp -f /etc/openldap/slapd.conf /etc/openldap/slapd.conf.YaSTsave' ); + SCR->Write(".target.string", + "/etc/openldap/slapd.conf", + "#\n". + "# Note: The OpenLDAP configuration has been created by YaST. YaST does not\n". + "# use /etc/openldap/slapd.conf to store the OpenLDAP configuration anymore.\n". + "# YaST uses OpenLDAP\'s dynamic configuration database (back-config) to\n". + "# store the LDAP server\'s configuration.\n". + "# For details about the dynamic configuration backend please see the\n". + "# slapd-config(5) manpage or the OpenLDAP Software 2.4 Administrator's Guide\n". + "# located at /usr/share/doc/packages/openldap2/guide/admin/guide.html\n". + "# on this system.\n". + "#\n". + "# A copy of the original /etc/openldap/slapd.conf file has been created as:\n". + "# /etc/openldap/slapd.conf.YaSTsave\n". + "#\n" + ); + } Progress->Finish(); SuSEFirewall->Write(); } else { @@ -673,31 +692,58 @@ Progress->New("Writing OpenLDAP Configuration", "", 5, $progressItems, $progressItems, ""); Progress->NextStage(); - # these changes might require a restart of slapd + # these changes require a restart of slapd if ( $use_ldap_listener ) { - SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAP', 'yes'); + if (SCR->Read('.sysconfig.openldap.OPENLDAP_START_LDAP') eq "no" ) + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAP', 'yes'); + $restartRequired = 1; + } } else { - SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAP', 'no'); + if (SCR->Read('.sysconfig.openldap.OPENLDAP_START_LDAP') eq "yes" ) + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAP', 'no'); + $restartRequired = 1; + } } if ( $use_ldapi_listener ) { - SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPI', 'yes'); + if (SCR->Read('.sysconfig.openldap.OPENLDAP_START_LDAPI') eq "no" ) + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPI', 'yes'); + $restartRequired = 1; + } } else { - SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPI', 'no'); + if (SCR->Read('.sysconfig.openldap.OPENLDAP_START_LDAPI') eq "yes" ) + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPI', 'no'); + $restartRequired = 1; + } } if ( $use_ldaps_listener ) { - SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'yes'); + if (SCR->Read('.sysconfig.openldap.OPENLDAP_START_LDAPS') eq "no" ) + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'yes'); + $restartRequired = 1; + } } else { - SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'no'); + if (SCR->Read('.sysconfig.openldap.OPENLDAP_START_LDAPS') eq "yes" ) + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'no'); + $restartRequired = 1; + } } + # FIXME: + # Explicit cache flush, see bnc#350581 for details + SCR->Write(".sysconfig.openldap", undef); my $progress_orig = Progress->set(0); SuSEFirewall->Write(); Progress->set($progress_orig); @@ -737,6 +783,10 @@ } Progress->Finish(); + if ( $restartRequired ) + { + Service->Restart("ldap"); + } } sleep(1); $configured = $ret; @@ -1163,6 +1213,14 @@ return 0; } } + my $oldtls = $self->ReadTlsConfig(); + if ( $oldtls->{'certKeyFile'} ne $tls->{'certKeyFile'} || + $oldtls->{'certFile'} ne $tls->{'certFile'} || + $oldtls->{'caCertFile'} ne $tls->{'caCertFile'}) + { + $restartRequired = 1; + } + my $rc = SCR->Write('.ldapserver.global.tlsSettings', $tls ); return 1; } @@ -1476,7 +1534,7 @@ sub ChangeDatabaseIndex { my ($self, $dbIndex, $newIdx ) = @_; - y2milestone("ChangeDatabaseIndex: ".Data::Dumper->Dump([$newIdx]) ); + y2debug("ChangeDatabaseIndex: ".Data::Dumper->Dump([$newIdx]) ); if( defined $newIdx->{'pres'} ) { $newIdx->{'pres'} = YaST::YCP::Boolean($newIdx->{'pres'}); @@ -1527,7 +1585,7 @@ sub ChangeDatabaseAcl { my ($self, $dbIndex, $acllist ) = @_; - y2milestone("ChangeDatabaseAcl: ".Data::Dumper->Dump([$acllist]) ); + y2debug("ChangeDatabaseAcl: ".Data::Dumper->Dump([$acllist]) ); my $rc = SCR->Write(".ldapserver.database.{".$dbIndex."}.acl", $acllist ); if ( ! $rc ) { @@ -1549,7 +1607,7 @@ my ($self, $index) = @_; y2milestone("ReadDatabaseAcl ".$index); my $rc = SCR->Read(".ldapserver.database.{".$index."}.acl" ); - y2milestone( "ACL: ".Data::Dumper->Dump([$rc]) ); + y2debug( "ACL: ".Data::Dumper->Dump([$rc]) ); return $rc; } 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-ldap-server-2.17.10/src/ldap-server.ycp new/yast2-ldap-server-2.17.11/src/ldap-server.ycp --- old/yast2-ldap-server-2.17.10/src/ldap-server.ycp 2008-10-01 15:14:13.000000000 +0200 +++ new/yast2-ldap-server-2.17.11/src/ldap-server.ycp 2008-10-15 14:47:41.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Main file * Authors: Andreas Bauer <abauer(a)suse.de> * - * $Id: ldap-server.ycp 51737 2008-10-01 12:06:31Z rhafer $ + * $Id: ldap-server.ycp 52243 2008-10-15 12:47:30Z rhafer $ * * Main file for ldap-server configuration. Uses all other files. */ @@ -70,7 +70,7 @@ } else { - CommandLine::Print (_("No basedn provided\n")); + CommandLine::Print (_("No base DN provided\n")); return false; } db["type"] = options["type"]:"hdb"; 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-ldap-server-2.17.10/src/widgets.ycp new/yast2-ldap-server-2.17.11/src/widgets.ycp --- old/yast2-ldap-server-2.17.10/src/widgets.ycp 2008-10-07 17:46:50.000000000 +0200 +++ new/yast2-ldap-server-2.17.11/src/widgets.ycp 2008-10-15 14:47:41.000000000 +0200 @@ -6,7 +6,7 @@ import "Popup"; map<string, any> firewall_settings = $[ - "services": [ "ldap" , "ldaps" ], + "services": [ "service:openldap" ], "display_details": true, ]; 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-ldap-server-2.17.10/VERSION new/yast2-ldap-server-2.17.11/VERSION --- old/yast2-ldap-server-2.17.10/VERSION 2008-10-07 17:53:34.000000000 +0200 +++ new/yast2-ldap-server-2.17.11/VERSION 2008-10-15 14:48:22.000000000 +0200 @@ -1 +1 @@ -2.17.10 +2.17.11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0