Hello community,
here is the log from the commit of package yast2
checked in at Tue Nov 28 10:08:57 CET 2006.
--------
--- yast2/yast2.changes 2006-11-21 11:16:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/STABLE/yast2/yast2.changes 2006-11-28 09:42:35.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 28 09:04:31 CET 2006 - jsrain@suse.cz
+
+- fixed board detection on PPC (#223872)
+- 2.14.15
+
+-------------------------------------------------------------------
Old:
----
yast2-2.14.14.tar.bz2
New:
----
yast2-2.14.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.1hVddY/_old 2006-11-28 10:08:41.000000000 +0100
+++ /var/tmp/diff_new_pack.1hVddY/_new 2006-11-28 10:08:41.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.14.14)
+# spec file for package yast2 (Version 2.14.15)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2
-Version: 2.14.14
+Version: 2.14.15
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.14.14.tar.bz2
+Source0: yast2-2.14.15.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# Need the new file popups
@@ -97,7 +97,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.14.14
+%setup -n yast2-2.14.15
%build
%{prefix}/bin/y2tool y2autoconf
@@ -197,6 +197,9 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog -n yast2
+* Tue Nov 28 2006 - jsrain@suse.cz
+- fixed board detection on PPC (#223872)
+- 2.14.15
* Tue Nov 21 2006 - mvidner@suse.cz
- Implemented yast2 --remove and yast2 --update (#222757).
(It needs yast2-packager-2.14.8 to work.)
++++++ yast2-2.14.14.tar.bz2 -> yast2-2.14.15.tar.bz2 ++++++
++++ 11440 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.14/VERSION new/yast2-2.14.15/VERSION
--- old/yast2-2.14.14/VERSION 2006-11-21 11:14:26.000000000 +0100
+++ new/yast2-2.14.15/VERSION 2006-11-28 09:40:18.000000000 +0100
@@ -1 +1 @@
-2.14.14
+2.14.15
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.14/configure.in new/yast2-2.14.15/configure.in
--- old/yast2-2.14.14/configure.in 2006-11-21 11:17:49.000000000 +0100
+++ new/yast2-2.14.15/configure.in 2006-11-28 09:40:45.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.14.14, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.14.15, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.14"
+VERSION="2.14.15"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.14/library/modules/Arch.ycp new/yast2-2.14.15/library/modules/Arch.ycp
--- old/yast2-2.14.14/library/modules/Arch.ycp 2006-10-10 10:17:14.000000000 +0200
+++ new/yast2-2.14.15/library/modules/Arch.ycp 2006-11-28 09:40:10.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf
* Flags: Stable
*
- * $Id: Arch.ycp 33167 2006-09-27 09:02:34Z jsrain $
+ * $Id: Arch.ycp 34611 2006-11-28 08:40:08Z jsrain $
*/
{
@@ -216,6 +216,7 @@
_board_compatible = checksys;
}
});
+ y2milestone("_board_compatible '%1' \n", _board_compatible);
if (i386 () || x86_64 ())
{
_board_compatible = "wintel";
@@ -223,12 +224,13 @@
// hwinfo expects CHRP/PReP/iSeries/MacRISC* in /proc/cpuinfo
// there is no standard for the board identification
// Cell and Maple based boards have no CHRP in /proc/cpuinfo
- if (ppc () && _board_compatible == nil)
+ // Pegasos and Cell do have CHRP in /proc/cpuinfo, but Pegasos2 should no be handled as CHRP
+ if (ppc () && (_board_compatible == nil || _board_compatible == "CHRP"))
{
map device_type = (map) SCR::Execute (.target.bash_output,
- "echo `cat /proc/device-tree/device_type`" , $[]);
+ "echo -n `cat /proc/device-tree/device_type`" , $[]);
map model = (map) SCR::Execute (.target.bash_output,
- "echo `cat /proc/device-tree/model`" , $[]);
+ "echo -n `cat /proc/device-tree/model`" , $[]);
string board = model["stdout"]:"";
y2milestone("model %1 , device_type %2\n", model, device_type);
// catch remaining IBM boards
@@ -237,18 +239,16 @@
{
_board_compatible = "CHRP";
}
- else
- {
- // Maple has its own way of pretenting OF1275 compliance
- if (board == "Momentum,Maple-D" || board == "Momentum,Maple-L"
+ // Maple has its own way of pretenting OF1275 compliance
+ if (board == "Momentum,Maple-D" || board == "Momentum,Maple-L"
|| board == "Momentum,Maple")
- {
- _board_compatible = "CHRP";
- }
- if (board == "Pegasos2")
- {
- _board_compatible = "Pegasos";
- }
+ {
+ _board_compatible = "CHRP";
+ }
+ // Pegasos has CHRP in /proc/cpuinfo and 'chrp' in /proc/device-tree/device_type
+ if (board == "Pegasos2")
+ {
+ _board_compatible = "Pegasos";
}
}
// avoid future re-probing if probing failed
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.14/library/modules/Version.ycp new/yast2-2.14.15/library/modules/Version.ycp
--- old/yast2-2.14.14/library/modules/Version.ycp 2006-11-21 11:18:35.000000000 +0100
+++ new/yast2-2.14.15/library/modules/Version.ycp 2006-11-28 09:41:22.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.14.14";
+global string yast2 = "2.14.15";
/* EOF */
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org