openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
December 2008
- 1 participants
- 817 discussions
Hello community,
here is the log from the commit of package gimp for openSUSE:Factory
checked in at Sun Dec 21 16:32:12 CET 2008.
--------
--- GNOME/gimp/gimp.changes 2008-11-03 18:36:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/gimp/gimp.changes 2008-12-19 19:10:24.038597000 +0100
@@ -1,0 +2,6 @@
+Fri Dec 19 13:10:12 EST 2008 - mauro(a)suse.de
+
+- Added hu-po.tar.bz2 to fix bnc#460663
+ + Updated hungarian translation.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
hu-po.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gimp.spec ++++++
--- /var/tmp/diff_new_pack.M24796/_old 2008-12-21 16:31:41.000000000 +0100
+++ /var/tmp/diff_new_pack.M24796/_new 2008-12-21 16:31:41.000000000 +0100
@@ -23,7 +23,7 @@
BuildRequires: aalib-devel alsa-devel cups cups-devel curl-devel dbus-1-glib-devel gegl-devel gnome-common gnutls-devel gtk-doc hal-devel intltool iso-codes-devel libexif-devel libgimpprint libgimpprint-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libgtkhtml-devel liblcms-devel libmng-devel libpoppler-glib-devel librsvg-devel libtiff-devel libwebkit-devel libwmf-devel libwnck-devel perl-XML-Parser postfix python-devel python-gtk-devel slang-devel update-desktop-files
Url: http://www.gimp.org/
Version: 2.6.2
-Release: 2
+Release: 3
License: GPL v2 or later
Group: Productivity/Graphics/Bitmap Editors
Suggests: AdobeICCProfiles
@@ -33,6 +33,7 @@
Requires: gtk2 >= 2.12.1
Summary: The GNU Image Manipulation Program
Source: ftp://ftp.gimp.org/pub/gimp/v2.6/%{name}-%{version}.tar.bz2
+Source1: hu-po.tar.bz2
# PATCH-FIX-UPSTREAM gimp-help-fallback-en.patch bgo558660 - sbrabec(a)suse.cz If help translation does not exist, fallback to English.
Patch: gimp-help-fallback-en.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -1047,7 +1048,7 @@
%lang_package
%prep
-%setup -q
+%setup -q -a1
# We can ignore these warnings:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22197
# spline.c: 47
@@ -1146,6 +1147,9 @@
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Dec 19 2008 mauro(a)suse.de
+- Added hu-po.tar.bz2 to fix bnc#460663
+ + Updated hungarian translation.
* Mon Nov 03 2008 sbrabec(a)suse.cz
- If help translation does not exist, fallback to English
(bgo#558660).
@@ -1272,10 +1276,10 @@
+ some code cleanup
+ lots of bug fixes
- Remove upstreamed gimp-psd-overflow.patch and gimp-sunras-overflow.patch.
-* Thu Jul 19 2007 maw(a)suse.de
+* Wed Jul 18 2007 maw(a)suse.de
- Respin gimp-psd-overflow.patch (http://bugzilla.gnome.org/show_bug.cgi?id=456042
and https://bugzilla.novell.com/show_bug.cgi?id=284288#c13)
-* Wed Jul 04 2007 maw(a)suse.de
+* Tue Jul 03 2007 maw(a)suse.de
- Add gimp-psd-overflow.patch (#284288 and CVE-2007-2949), fixing
a buffer overflow.
* Fri May 11 2007 pgajdos(a)suse.cz
@@ -1344,7 +1348,7 @@
- Fixed random return value.
* Mon Nov 07 2005 sbrabec(a)suse.cz
- Updated to version 2.3.5.
-* Thu Nov 03 2005 dmueller(a)suse.de
+* Wed Nov 02 2005 dmueller(a)suse.de
- don't build as root
* Tue Sep 27 2005 sbrabec(a)suse.cz
- Updated to version 2.3.4.
@@ -1371,7 +1375,7 @@
- Fixed devel requirements.
* Wed May 18 2005 sbrabec(a)suse.cz
- Updated to version 2.2.7.
-* Tue May 10 2005 ro(a)suse.de
+* Mon May 09 2005 ro(a)suse.de
- use -mmmx and -msse to compile asm-code for these extensions
* Tue Apr 12 2005 sbrabec(a)suse.cz
- Updated to version 2.2.6.
@@ -1383,15 +1387,15 @@
- Updated to version 2.2.3.
* Mon Jan 17 2005 sbrabec(a)suse.cz
- Updated to version 2.2.2.
-* Fri Jan 07 2005 ro(a)suse.de
+* Thu Jan 06 2005 ro(a)suse.de
- postfix is in neededforbuild, so add "-sendmail" for PLUS
* Thu Jan 06 2005 sbrabec(a)suse.cz
- Updated to version 2.2.1.
-* Wed Oct 27 2004 mmj(a)suse.de
+* Tue Oct 26 2004 mmj(a)suse.de
- locale rename no to nb
* Wed Sep 22 2004 adrian(a)suse.de
- add MimeTypes line to desktop file. Gimp does support .xcf files now
-* Tue Aug 31 2004 rml(a)suse.de
+* Mon Aug 30 2004 rml(a)suse.de
- upgrade to gimp 2.0.4 (Ximian bug #64677)
* Fri Aug 27 2004 shprasad(a)suse.de
- Fixes bug #63425
@@ -1419,7 +1423,7 @@
http://bugzilla.gnome.org/show_bug.cgi?id=139158
* Wed Apr 07 2004 sbrabec(a)suse.cz
- Fixed WMF plugin (#38582).
-* Fri Mar 26 2004 mmj(a)suse.de
+* Thu Mar 25 2004 mmj(a)suse.de
- Add postfix to # neededforbuild
* Wed Mar 24 2004 hhetter(a)suse.de
- updated to version 2.0.0 finally
@@ -1455,7 +1459,7 @@
- Updated to version 1.3.21. Fixes screenshot bug (#32288).
- Build SVG plug-in.
- Clean-up of neededforbuild.
-* Wed Oct 15 2003 ro(a)suse.de
+* Tue Oct 14 2003 ro(a)suse.de
- run full autoreconf
* Thu Sep 18 2003 sbrabec(a)suse.cz
- Do not show LZW in tiff save dialog at all (bug #29849).
@@ -1466,18 +1470,18 @@
* Thu Aug 28 2003 sbrabec(a)suse.cz
- Updated to version 1.3.19.
- Enabled EXIF support.
-* Sun Aug 17 2003 adrian(a)suse.de
+* Sat Aug 16 2003 adrian(a)suse.de
- install desktop file
* Thu Aug 14 2003 sbrabec(a)suse.cz
- Updated to version 1.3.18.
* Mon Aug 04 2003 sbrabec(a)suse.cz
- Updated to version 1.3.17.
-* Fri Jul 25 2003 hhetter(a)suse.de
+* Thu Jul 24 2003 hhetter(a)suse.de
- fix build
* Thu Jun 26 2003 sbrabec(a)suse.cz
- Updated to version 1.3.15.
- Used system libgimpprint.
-* Fri Jun 20 2003 ro(a)suse.de
+* Thu Jun 19 2003 ro(a)suse.de
- added directories to filelist
* Tue Jun 10 2003 sbrabec(a)suse.cz
- Initial SuSE version of GTK2 port.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory
checked in at Fri Dec 19 15:30:05 CET 2008.
--------
--- rpm/rpm.changes 2008-12-11 17:19:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2008-12-19 15:27:39.477650000 +0100
@@ -1,0 +2,5 @@
+Fri Dec 19 15:26:30 CET 2008 - mls(a)suse.de
+
+- add popt-devel and rpm-devel to baselibs config (bnc#445037)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpm-python.spec ++++++
--- /var/tmp/diff_new_pack.Gek826/_old 2008-12-19 15:29:39.000000000 +0100
+++ /var/tmp/diff_new_pack.Gek826/_new 2008-12-19 15:29:39.000000000 +0100
@@ -24,7 +24,7 @@
Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2.3
-Release: 21
+Release: 22
Requires: rpm = %{version}
%py_requires
Source99: rpm.spec
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.Gek826/_old 2008-12-19 15:29:39.000000000 +0100
+++ /var/tmp/diff_new_pack.Gek826/_new 2008-12-19 15:29:39.000000000 +0100
@@ -27,7 +27,7 @@
AutoReqProv: on
Summary: The RPM Package Manager
Version: 4.4.2.3
-Release: 21
+Release: 22
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2
@@ -331,7 +331,7 @@
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
-Release: 469
+Release: 470
#
%description -n popt
@@ -354,7 +354,7 @@
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
-Release: 469
+Release: 470
Requires: popt = 1.7
Requires: glibc-devel
@@ -389,6 +389,8 @@
%doc %{_mandir}/man3/popt.3*
%changelog
+* Fri Dec 19 2008 mls(a)suse.de
+- add popt-devel and rpm-devel to baselibs config (bnc#445037)
* Thu Dec 11 2008 ro(a)suse.de
- brp-symlink: whitelist kde4 doc path (bnc#457908)
* Thu Dec 11 2008 agruen(a)suse.de
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.Gek826/_old 2008-12-19 15:29:39.000000000 +0100
+++ /var/tmp/diff_new_pack.Gek826/_new 2008-12-19 15:29:39.000000000 +0100
@@ -1,2 +1,4 @@
popt
rpm
+arch ppc package popt-devel
+arch ppc package rpm-devel
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package openmpi for openSUSE:Factory
checked in at Fri Dec 19 15:23:59 CET 2008.
--------
--- openmpi/openmpi.changes 2008-11-14 13:37:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/openmpi/openmpi.changes 2008-12-19 15:22:46.119153000 +0100
@@ -1,0 +2,5 @@
+Fri Dec 19 15:22:31 CET 2008 - ro(a)suse.de
+
+- giving up: exclude s390 and s390x
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openmpi.spec ++++++
--- /var/tmp/diff_new_pack.S23564/_old 2008-12-19 15:23:53.000000000 +0100
+++ /var/tmp/diff_new_pack.S23564/_new 2008-12-19 15:23:53.000000000 +0100
@@ -21,7 +21,7 @@
Name: openmpi
Summary: A powerful implementaion of MPI
Version: 1.2.8
-Release: 2
+Release: 3
License: BSD 3-Clause
Group: Development/Libraries/Parallel
Source0: %{name}-%{version}.tar.bz2
@@ -31,9 +31,8 @@
Url: http://www.open-mpi.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ gcc-fortran libibumad-devel libibverbs-devel mpi-selector sysfsutils
-%ifnarch s390 s390x
BuildRequires: compat-dapl-devel
-%endif
+ExcludeArch: s390 s390x
%ifarch x86_64
BuildRequires: numactl
%endif
@@ -175,6 +174,8 @@
%_includedir/*
%changelog
+* Fri Dec 19 2008 ro(a)suse.de
+- giving up: exclude s390 and s390x
* Fri Nov 14 2008 aj(a)suse.de
- Fix setting of LD_LIBRARY_PATH.
* Tue Oct 28 2008 jjolly(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package yast2-sound for openSUSE:Factory
checked in at Fri Dec 19 15:21:34 CET 2008.
--------
--- yast2-sound/yast2-sound.changes 2008-12-02 13:06:33.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-sound/yast2-sound.changes 2008-12-18 11:10:32.348035000 +0100
@@ -1,0 +2,5 @@
+Thu Dec 18 11:10:21 CET 2008 - ro(a)suse.de
+
+- fix build for non-alsa case (s390)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
yast2-sound-non_alsa.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-sound.spec ++++++
--- /var/tmp/diff_new_pack.U20465/_old 2008-12-19 15:21:10.000000000 +0100
+++ /var/tmp/diff_new_pack.U20465/_new 2008-12-19 15:21:10.000000000 +0100
@@ -20,11 +20,12 @@
Name: yast2-sound
Version: 2.17.13
-Release: 1
+Release: 2
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-sound-2.17.13.tar.bz2
+Patch0: yast2-sound-non_alsa.patch
Prefix: /usr
BuildRequires: alsa-devel doxygen gcc-c++ perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite
# GetInstArgs::automatic_configuration
@@ -49,6 +50,7 @@
%prep
%setup -n yast2-sound-2.17.13
+%patch0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -93,7 +95,10 @@
%{_libdir}/YaST2/plugin/libpy2ag_audio.so*
/usr/share/YaST2/scrconf/*.scr
%doc %{prefix}/share/doc/packages/yast2-sound
+
%changelog
+* Thu Dec 18 2008 ro(a)suse.de
+- fix build for non-alsa case (s390)
* Tue Dec 02 2008 lslezak(a)suse.cz
- fixed package installation in autoyast installation mode
(bnc#450416)
++++++ yast2-sound-non_alsa.patch ++++++
--- agent-audio/src/AlsaAudio.cc
+++ agent-audio/src/AlsaAudio.cc
@@ -287,9 +287,9 @@
#else // __HAVE_ALSA
-YCPValue alsaSetVolume(int card, const string& channel, int value)
+YCPBoolean alsaSetVolume(int card, const string& channel, int value)
{
- return YCPVoid();
+ return YCPBoolean(false);
}
YCPValue alsaGetVolume(int card, const string& channel)
@@ -297,9 +297,9 @@
return YCPVoid();
}
-YCPValue alsaSetMute(int card, const string& channel, bool value)
+YCPBoolean alsaSetMute(int card, const string& channel, bool value)
{
- return YCPVoid();
+ return YCPBoolean(false);
}
YCPValue alsaGetMute(int card, const string& channel)
@@ -307,14 +307,16 @@
return YCPVoid();
}
-YCPValue alsaGetChannels(int card)
+YCPList alsaGetChannels(int card)
{
- return YCPVoid();
+ YCPList outlist;
+ return outlist;
}
-YCPValue alsaGetCards()
+YCPList alsaGetCards()
{
- return YCPVoid();
+ YCPList list;
+ return list;
}
YCPValue alsaGetCardName(int card_id)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package yast2-instserver for openSUSE:Factory
checked in at Fri Dec 19 15:21:10 CET 2008.
--------
--- yast2-instserver/yast2-instserver.changes 2008-10-15 16:08:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-instserver/yast2-instserver.changes 2008-12-19 14:08:57.006414000 +0100
@@ -1,0 +2,7 @@
+Fri Dec 19 12:57:33 CET 2008 - lslezak(a)suse.cz
+
+- do not configure vsftpd in xinetd mode if it's set to standalone
+ mode in the config file (bnc#438694)
+- 2.17.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-instserver-2.17.3.tar.bz2
New:
----
yast2-instserver-2.17.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-instserver.spec ++++++
--- /var/tmp/diff_new_pack.L19345/_old 2008-12-19 15:20:52.000000000 +0100
+++ /var/tmp/diff_new_pack.L19345/_new 2008-12-19 15:20:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-instserver (Version 2.17.3)
+# spec file for package yast2-instserver (Version 2.17.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://www.suse.com/
Name: yast2-instserver
-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-instserver-2.17.3.tar.bz2
+Source0: yast2-instserver-2.17.4.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite
# ag_content agent
@@ -47,7 +47,7 @@
Anas Nashif <nashif(a)suse.de>
%prep
-%setup -n yast2-instserver-2.17.3
+%setup -n yast2-instserver-2.17.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,6 +83,10 @@
%dir /etc/apache2
%dir /etc/apache2/conf.d
%changelog
+* Fri Dec 19 2008 lslezak(a)suse.cz
+- do not configure vsftpd in xinetd mode if it's set to standalone
+ mode in the config file (bnc#438694)
+- 2.17.4
* Wed Oct 15 2008 lslezak(a)suse.cz
- fixed UI syntax error when asking for a CD (bnc#435658)
- minor code11 fixes - remove cut blanks from content file values,
@@ -299,5 +303,5 @@
- Support for SLES8/ SLES8 products
- Support for adding from ISO images
- HTTP/NFS/FTP support
-* Wed Feb 11 2004 nashif(a)suse.de
+* Tue Feb 10 2004 nashif(a)suse.de
- initial version
++++++ yast2-instserver-2.17.3.tar.bz2 -> yast2-instserver-2.17.4.tar.bz2 ++++++
++++ 3354 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-instserver-2.17.3/configure.in new/yast2-instserver-2.17.4/configure.in
--- old/yast2-instserver-2.17.3/configure.in 2008-10-15 16:02:57.000000000 +0200
+++ new/yast2-instserver-2.17.4/configure.in 2008-12-19 13:59:08.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-instserver
dnl
-dnl -- This file is generated by y2autoconf 2.17.3 - 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-instserver, 2.17.3, http://bugs.opensuse.org/, yast2-instserver)
+AC_INIT(yast2-instserver, 2.17.4, http://bugs.opensuse.org/, yast2-instserver)
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-instserver"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-instserver-2.17.3/src/Instserver.ycp new/yast2-instserver-2.17.4/src/Instserver.ycp
--- old/yast2-instserver-2.17.3/src/Instserver.ycp 2008-10-15 13:45:49.000000000 +0200
+++ new/yast2-instserver-2.17.4/src/Instserver.ycp 2008-12-19 13:58:10.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Installation Server settings, input and output functions
* Authors: Anas Nashif <nashif(a)suse.de>
*
- * $Id: Instserver.ycp 49500 2008-07-30 07:18:00Z lslezak $
+ * $Id: Instserver.ycp 54292 2008-12-19 12:58:09Z lslezak $
*
* Representation of the configuration of Installation Server.
* Input and output routines.
@@ -106,6 +106,13 @@
}
+boolean vsftpd_is_standalone()
+{
+ boolean ret = SCR::Execute(.target.bash, "grep -q '^listen=YES$' /etc/vsftpd.conf") == 0;
+
+ y2milestone("vsftpd in standalone mode: %1", ret);
+ return ret;
+}
/**
* Create links
@@ -300,59 +307,78 @@
y2warning("not implemented");
}
- y2debug("configuring services");
- // read the current configuration
- map resource = (map)ReadServiceSettings("inetd_auto");
- list<map> netdconf = [];
-
- // replace vsftpd config
- boolean ftpdenabled = false;
- boolean servicefound = false;
- foreach(map conf, resource["netd_conf"]:[], {
- // the service is ftp with vsftpd server
- if (conf["service"]:"" == "ftp" && conf["script"]:"" == "vsftpd")
- {
- servicefound = true;
-
- // enable disabled service
- if (conf["enabled"]:false != true)
- {
- conf["enabled"] = true;
- }
- else
+ // check if vsftpd is configured in standalone mode (listen=YES) (bnc#438694)
+ // see 'man vsftpd.conf'
+ boolean vsftpd_standalone = vsftpd_is_standalone();
+
+ if (vsftpd_standalone)
+ {
+ y2milestone("Configuring FTP service in standalone mode");
+
+ // enable/start the service
+ Service::Enable("vsftpd");
+ if (Service::Status("vsftpd") == 0 )
+ Service::Reload("vsftpd");
+ else
+ Service::Start("vsftpd");
+ }
+ else
+ {
+ y2milestone("Configuring FTP service in xinetd mode");
+ // read the current configuration
+ map resource = (map)ReadServiceSettings("inetd_auto");
+ list<map> netdconf = [];
+
+ // replace vsftpd config
+ boolean ftpdenabled = false;
+ boolean servicefound = false;
+ foreach(map conf, resource["netd_conf"]:[], {
+ // the service is ftp with vsftpd server
+ if (conf["service"]:"" == "ftp" && conf["script"]:"" == "vsftpd")
{
- ftpdenabled = true;
+ servicefound = true;
+
+ // enable disabled service
+ if (conf["enabled"]:false != true)
+ {
+ conf["enabled"] = true;
+ }
+ else
+ {
+ ftpdenabled = true;
+ }
}
+
+ // add the configuration to the list
+ netdconf = add(netdconf, conf);
}
+ );
- // add the configuration to the list
- netdconf = add(netdconf, conf);
+ if (servicefound == false)
+ {
+ // the FTP service config was not found, add it
+ map vsftpdconf = $["protocol":"tcp", "script":"vsftpd", "server":"/usr/sbin/vsftpd", "service":"ftp"];
+ netdconf = add(netdconf, vsftpdconf);
}
- );
- if (servicefound == false)
- {
- // the FTP service config was not found, add it
- map vsftpdconf = $["protocol":"tcp", "script":"vsftpd", "server":"/usr/sbin/vsftpd", "service":"ftp"];
- netdconf = add(netdconf, vsftpdconf);
- }
+ // ftp service was not enabled/configured
+ if (ftpdenabled == false)
+ {
+ // update the configuration
+ resource["netd_conf"] = netdconf;
- // ftp service was not enabled/configured
- if (ftpdenabled == false)
- {
- // update the configuration
- resource["netd_conf"] = netdconf;
+ // write the configuration
+ ConfigureService("inetd_auto", resource);
+ }
- // write the configuration
- ConfigureService("inetd_auto", resource);
+ // enable/start the service
+ Service::Enable("xinetd");
+ if (Service::Status("xinetd") == 0 )
+ Service::Reload("xinetd");
+ else
+ Service::Start("xinetd");
}
- // enable/start the service
- Service::Enable("xinetd");
- if (Service::Status("xinetd") == 0 )
- Service::Reload("xinetd");
- else
- Service::Start("xinetd");
return true;
}
@@ -743,6 +769,15 @@
boolean FTPValid(map config)
{
+ if (vsftpd_is_standalone())
+ {
+ // is the service running?
+ boolean ret = (Service::Status("vsftpd") == 0 );
+ y2milestone("FTP (vsftpd) server running: %1", ret);
+
+ return ret;
+ }
+
// read the current configuration
map resource = (map)ReadServiceSettings("inetd_auto");
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-instserver-2.17.3/VERSION new/yast2-instserver-2.17.4/VERSION
--- old/yast2-instserver-2.17.3/VERSION 2008-10-15 16:02:00.000000000 +0200
+++ new/yast2-instserver-2.17.4/VERSION 2008-12-19 13:58:21.000000000 +0100
@@ -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
Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory
checked in at Fri Dec 19 15:21:01 CET 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-12-17 14:43:39.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2008-12-18 18:05:31.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Dec 18 18:04:47 CET 2008 - locilka(a)suse.cz
+
+- Updated control file documentation (bnc #438678).
+- 2.17.49
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.17.48.tar.bz2
New:
----
yast2-installation-2.17.49.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.w18848/_old 2008-12-19 15:20:43.000000000 +0100
+++ /var/tmp/diff_new_pack.w18848/_new 2008-12-19 15:20:43.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.17.48)
+# spec file for package yast2-installation (Version 2.17.49)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-installation
-Version: 2.17.48
+Version: 2.17.49
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.17.48.tar.bz2
+Source0: yast2-installation-2.17.49.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# xmllint
@@ -126,7 +126,7 @@
Lukas Ocilka <locilka(a)suse.cz>
%prep
-%setup -n yast2-installation-2.17.48
+%setup -n yast2-installation-2.17.49
%build
%{prefix}/bin/y2tool y2autoconf
@@ -197,6 +197,9 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Thu Dec 18 2008 locilka(a)suse.cz
+- Updated control file documentation (bnc #438678).
+- 2.17.49
* Wed Dec 17 2008 locilka(a)suse.cz
- Added yet another xset call (bnc #455771 comment #40)
- 2.17.48
++++++ yast2-installation-2.17.48.tar.bz2 -> yast2-installation-2.17.49.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.48/configure new/yast2-installation-2.17.49/configure
--- old/yast2-installation-2.17.48/configure 2008-12-16 12:11:39.000000000 +0100
+++ new/yast2-installation-2.17.49/configure 2008-12-18 18:07:04.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-installation 2.17.47.
+# Generated by GNU Autoconf 2.63 for yast2-installation 2.17.48.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.17.47'
-PACKAGE_STRING='yast2-installation 2.17.47'
+PACKAGE_VERSION='2.17.48'
+PACKAGE_STRING='yast2-installation 2.17.48'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1285,7 +1285,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-installation 2.17.47 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.17.48 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1357,7 +1357,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.17.47:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.17.48:";;
esac
cat <<\_ACEOF
@@ -1437,7 +1437,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.17.47
+yast2-installation configure 2.17.48
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1451,7 +1451,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-installation $as_me 2.17.47, which was
+It was created by yast2-installation $as_me 2.17.48, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2298,7 +2298,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.17.47'
+ VERSION='2.17.48'
cat >>confdefs.h <<_ACEOF
@@ -2522,7 +2522,7 @@
-VERSION="2.17.47"
+VERSION="2.17.48"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>"
@@ -3711,7 +3711,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-installation $as_me 2.17.47, which was
+This file was extended by yast2-installation $as_me 2.17.48, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3761,7 +3761,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-installation config.status 2.17.47
+yast2-installation config.status 2.17.48
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.48/configure.in new/yast2-installation-2.17.49/configure.in
--- old/yast2-installation-2.17.48/configure.in 2008-12-16 12:11:36.000000000 +0100
+++ new/yast2-installation-2.17.49/configure.in 2008-12-18 18:07:00.000000000 +0100
@@ -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-installation, 2.17.47, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.17.48, http://bugs.opensuse.org/, yast2-installation)
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.47"
+VERSION="2.17.48"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.48/control/docs/control-section.xml new/yast2-installation-2.17.49/control/docs/control-section.xml
--- old/yast2-installation-2.17.48/control/docs/control-section.xml 2008-12-15 14:13:02.000000000 +0100
+++ new/yast2-installation-2.17.49/control/docs/control-section.xml 2008-12-18 18:03:05.000000000 +0100
@@ -1519,4 +1519,7 @@
<emphasis>ProductControl::GetTranslatedText (text_id)</emphasis> call.</para>
</section>
</section>
+
+ <xi:include href="update-section.xml" parse="xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
</section>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.48/control/docs/examples/update-difffileformat.xml new/yast2-installation-2.17.49/control/docs/examples/update-difffileformat.xml
--- old/yast2-installation-2.17.48/control/docs/examples/update-difffileformat.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.17.49/control/docs/examples/update-difffileformat.xml 2008-12-18 17:52:12.000000000 +0100
@@ -0,0 +1,142 @@
+
+<?xml version="1.0"?>
+<productDefines xmlns="http://www.suse.com/1.0/yast2ns"
+ xmlns:config="http://www.suse.com/1.0/configns">
+ <!-- .mo-file must be in installation tarball -->
+ <textdomain>OES</textdomain>
+ <!-- these options override base product's ones -->
+ <globals>
+ <additional_kernel_parameters></additional_kernel_parameters>
+ </globals>
+ <software>
+ <selection_type config:type="symbol">auto</selection_type>
+ </software>
+ <partitioning>
+ <evms_config config:type="boolean">false</evms_config>
+ <root_max_size>10G</root_max_size>
+ </partitioning>
+ <network>
+ <force_static_ip config:type="boolean">false</force_static_ip>
+ <network_manager>laptop</network_manager>
+ </network>
+ <!-- base product's list is preserved, these are appended -->
+ <clone_modules config:type="list">
+ <clone_module>printer</clone_module>
+ </clone_modules>
+ <proposals config:type="list">
+<!-- put proposals for standalone product installation here -->
+ </proposals>
+<!-- workflow for standalone product installation -->
+ <workflows config:type="list">
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ </defaults>
+ <label>Preparation</label>
+ <!-- mode and stage must be set this way -->
+ <mode>installation</mode>
+ <stage>normal</stage>
+ <modules config:type="list">
+ <module>
+ <label>License Agreement</label>
+ <name>license</name>
+ <enable_back>no</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+ </modules>
+ </workflow>
+ </workflows>
+ <!-- stuff for installation together with base products -->
+ <update>
+ <proposals config:type="list">
+ <proposal>
+ <label>OES Installation Settings</label>
+ <mode>installation,demo,autoinstallation</mode>
+ <stage>initial</stage>
+ <name>initial</name>
+ <enable_skip>no</enable_skip>
+ <append_modules config:type="list">
+ <append_module>module_1</append_module>
+ <append_module>module_2</append_module>
+ </append_modules>
+ <remove_modules config:type="list">
+ <remove_module>module_3</remove_module>
+ <remove_module>module_4</remove_module>
+ </remove_modules>
+ <replace_modules config:type="list">
+ <replace_module>
+ <replace>old_module</replace>
+ <new_modules config:type="list">
+ <new_module>module_5</new_module>
+ <new_module>module_6</new_module>
+ </new_modules>
+ </replace_module>
+ </replace_modules>
+ </proposal>
+ </proposals>
+ <workflows config:type="list">
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ <enable_back>no</enable_back>
+ <enable_next>no</enable_next>
+ </defaults>
+ <mode>installation</mode>
+ <stage>initial</stage>
+ <append_modules config:type="list">
+ <module>
+ <heading>yes</heading>
+ <label>OES configuration</label>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>a1_netsetup</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>a2_netprobe</name>
+ </module>
+ </append_modules>
+ <remove_modules config:type="list">
+ <remove_module>finish</remove_module>
+ </remove_modules>
+ <insert_modules config:type="list">
+ <insert_module>
+ <before>perform</before>
+ <modules config:type="list">
+ <module>
+ <label>Perform Installation</label>
+ <name>i1_netprobe</name>
+ </module>
+ </modules>
+ </insert_module>
+ </insert_modules>
+ <replace_modules config:type="list">
+ <replace_module>
+ <replace>language</replace>
+ <modules config:type="list">
+ <module>
+ <label>Perform Installation</label>
+ <name>r1_language</name>
+ </module>
+ </modules>
+ </replace_module>
+ </replace_modules>
+ </workflow>
+ </workflows>
+ <inst_finish>
+ <before_chroot config:type=”list”>
+ <module>before_chroot_1</module>
+ <module>before_chroot_2</module>
+ </before_chroot>
+ <after_chroot config:type=”list”>
+ <module>after_chroot_1</module>
+ <module>after_chroot_2</module>
+ </after_chroot>
+ <before_umount config:type=”list”>
+ <module>before_umount_1</module>
+ <module>before_umount_2</module>
+ </before_umount>
+ </inst_finish>
+ </update>
+</productDefines>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.48/control/docs/examples/update-oes-example.xml new/yast2-installation-2.17.49/control/docs/examples/update-oes-example.xml
--- old/yast2-installation-2.17.48/control/docs/examples/update-oes-example.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.17.49/control/docs/examples/update-oes-example.xml 2008-12-18 17:52:02.000000000 +0100
@@ -0,0 +1,122 @@
+
+<?xml version="1.0"?>
+<productDefines xmlns="http://www.suse.com/1.0/yast2ns"
+ xmlns:config="http://www.suse.com/1.0/configns">
+<textdomain>OES</textdomain>
+<network>
+ <force_static_ip config:type="boolean">true</force_static_ip>
+ <network_manager_is_default config:type="boolean">false</network_manager_is_default>
+</network>
+<proposals config:type="list">
+ <proposal>
+ <name>oes</name>
+ <stage>continue,normal</stage>
+ <mode>installation</mode>
+ <proposal_modules config:type="list">
+ <proposal_module>oes-ldap</proposal_module>
+ <proposal_module>imanager</proposal_module>
+ <proposal_module>lifeconsole</proposal_module>
+ <proposal_module>linux-user-mgmt</proposal_module>
+ <proposal_module>eguide</proposal_module>
+ <proposal_module>novell-samba</proposal_module>
+ <proposal_module>ifolder2</proposal_module>
+ <proposal_module>ifolder</proposal_module>
+ <proposal_module>ifolderwebaccess</proposal_module>
+ <proposal_module>iprint</proposal_module>
+ <proposal_module>nss</proposal_module>
+ <proposal_module>netstorage</proposal_module>
+ <proposal_module>novell-quickfinder</proposal_module>
+ <proposal_module>novell-vo</proposal_module>
+ <proposal_module>ncs</proposal_module>
+ <proposal_module>ncpserver</proposal_module>
+ <proposal_module>sms</proposal_module>
+ </proposal_modules>
+ </proposal>
+</proposals>
+<workflows config:type="list">
+ <workflow>
+ <label>Preparation</label>
+ <defaults>
+ <archs>all</archs>
+ </defaults>
+ <mode>installation</mode>
+ <stage>normal</stage>
+ <modules config:type="list">
+ <module>
+ <label>License Agreement</label>
+ <name>inst_license</name>
+ <enable_back>no</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+ <module>
+ <label>OES Configuration</label>
+ <name>inst_check_cert</name>
+ <enable_back>no</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+ <module>
+ <label>OES Configuration</label>
+ <name>inst_proposal</name>
+ <arguments>false,false,`product</arguments>
+ <enable_back>no</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+ <module>
+ <label>OES Configuration</label>
+ <name>inst_oes</name>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+ <module>
+ <label>OES Configuration</label>
+ <name>inst_oes_congratulate</name>
+ <enable_back>no</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+ </modules>
+ </workflow>
+</workflows>
+<update>
+ <workflows config:type="list">
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ <enable_back>no</enable_back>
+ <enable_next>no</enable_next>
+ </defaults>
+ <stage>continue</stage>
+ <mode>installation</mode>
+ <append_modules config:type="list">
+ <module>
+ <label>OES Configuration</label>
+ <name>inst_oes_congratulate</name>
+ </module>
+ </append_modules>
+ <insert_modules config:type="list">
+ <insert_module>
+ <before>suseconfig</before>
+ <modules config:type="list">
+ <module>
+ <label>OES Configuration</label>
+ <name>inst_check_cert</name>
+ </module>
+ <module>
+ <label>OES Configuration</label>
+ <name>inst_edirectory</name>
+ </module>
+ <module>
+ <label>OES Configuration</label>
+ <name>inst_proposal</name>
+ <arguments>false,true,`product</arguments>
+ </module>
+ <module>
+ <label>OES Configuration</label>
+ <name>inst_oes</name>
+ </module>
+ </modules>
+ </insert_module>
+ </insert_modules>
+ </workflow>
+ </workflows>
+ </update>
+</productDefines>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.48/control/docs/Makefile.am new/yast2-installation-2.17.49/control/docs/Makefile.am
--- old/yast2-installation-2.17.48/control/docs/Makefile.am 2008-12-15 14:13:02.000000000 +0100
+++ new/yast2-installation-2.17.49/control/docs/Makefile.am 2008-12-18 18:03:47.000000000 +0100
@@ -13,7 +13,7 @@
pdf: control-doc.pdf
-html/index.html: control-doc.xml
+html/index.html: $(xml_files)
XML_CATALOG_FILES=@XML_CATALOG@ \
@XSLTPROC@ @XSLTPROC_FLAGS@ --xinclude \
@STYLESHEET_HTML@ $<
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.48/control/docs/Makefile.in new/yast2-installation-2.17.49/control/docs/Makefile.in
--- old/yast2-installation-2.17.48/control/docs/Makefile.in 2008-12-16 12:11:39.000000000 +0100
+++ new/yast2-installation-2.17.49/control/docs/Makefile.in 2008-12-18 18:07:04.000000000 +0100
@@ -531,7 +531,7 @@
pdf: control-doc.pdf
-html/index.html: control-doc.xml
+html/index.html: $(xml_files)
XML_CATALOG_FILES=@XML_CATALOG@ \
@XSLTPROC@ @XSLTPROC_FLAGS@ --xinclude \
@STYLESHEET_HTML@ $<
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.48/control/docs/update-section.xml new/yast2-installation-2.17.49/control/docs/update-section.xml
--- old/yast2-installation-2.17.48/control/docs/update-section.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.17.49/control/docs/update-section.xml 2008-12-18 18:00:43.000000000 +0100
@@ -0,0 +1,528 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Section originally written by Jiri Srain /jsrain(a)suse.cz/ -->
+<section id="update">
+ <title>Add-on Product Installation Workflow Specification</title>
+ <section id="update-intro">
+ <title>Introduction</title>
+
+ <section id="update-intro-proddep">
+ <title>Product dependency</title>
+ <para>Everywhere, product B depends on product A, there is no dependency
+ related to product C. A, B and C are add-on products.</para>
+ </section>
+
+ <section id="update-intro-order">
+ <title>Order of updates of the workflow/wizard</title>
+ <para>If there are two add-on products which want to insert their steps
+ into the same location of the installation workflow (or proposal), they
+ are inserted in the same order as the products are added. A must be added
+ before B (otherwise adding B fails), steps of A are always prior to steps
+ of B.</para>
+ </section>
+
+ <section id="update-intro-items">
+ <title>Steps/Proposal Items Naming</title>
+ <para>In order to avoid collisions of internal names of proposal items or
+ sequence steps, all items should have its internal name prefixed by the
+ add-on product name.</para>
+ </section>
+
+ <section id="update-updposs">
+ <title>Update possibilities</title>
+
+ <section id="update-updposs-insert">
+ <title>Insert an item into proposal</title>
+ <para>Item is always added at the end of the proposal. Multiple
+ items are possible.</para>
+ </section>
+
+ <section id="update-updposs-remove">
+ <title>Remove an item from proposal</title>
+ <para>Specified item(s) are removed from proposal. Useful when
+ add-on product extends functionality of the base product. If
+ product B wants to remove an item of product A, must specify the
+ name of the product as well. Product C cannot remove items of
+ products A or B (and vice versa), product A cannot remove items
+ of product B.</para>
+ </section>
+
+ <section id="update-updposs-replace">
+ <title>Replace an item in proposal</title>
+ <para>Usable in the same cases as the case above. If an item has
+ been replaced by another item(s) of product A before applying
+ changes of product B, the item(s) of product A will be replaced
+ by item(s) of product B. Items of product C cannot be replaced by
+ items of product A or B (and vice versa), such combination of
+ products cannot be installed at the same time.</para>
+ </section>
+
+ <section id="update-updposs-insert">
+ <title>Insert steps to installation sequence</title>
+ <para>Before each step of base product installation, additional
+ step can be inserted (eg. another proposal). For the order of
+ additionally added steps, the same rules as for items of proposal
+ will be applied.</para>
+ </section>
+
+ <section id="update-updposs-append">
+ <title>Append steps to installation sequence</title>
+ <para>The steps can be appended at the end of installation
+ sequence.</para>
+ </section>
+
+ <section id="update-updposs-remoandrepl">
+ <title>Remove and replace steps in installation sequence</title>
+ <para>The same rules for removing and replacing steps of the
+ installation workflow as for proposal items will be applied.</para>
+ </section>
+
+ <section id="update-updposs-instfinish">
+ <title>Add, remove, replace items in inst_finish.ycp</title>
+ <para>The same rules as for steps of the installation workflow are
+ valid here. There will be some points in the inst_finish where
+ performing additional actions makes sense (at least one before
+ moving SCR to chroot and one after).</para>
+ </section>
+
+ <section id="update-updposs-replaceworkflow">
+ <title>Replace whole second-stage workflow</title>
+ <para>Add-on product may replace whole second stage of installation.
+ It should be used only in rare cases, as there is no possibility to
+ merge two workflows completely written from scratch. If a product
+ replaces the workflow, all changes of all products which replaced it
+ before (in case of installation of multiple products) are gone.
+ Add-on products selected after this product update the new workflow
+ (which may not work, as the steps usually have different naming).
+ This is perfectly OK if there are dependencies between add-on
+ products.</para>
+ <para>The workflow can be replaced only for specified installation
+ mode. If it is replaced, it must be replaced for all
+ architectures.</para>
+ </section>
+
+ <section id="update-updposs-addproposal">
+ <title>Adding a new proposal</title>
+ <para>New proposal can be added, as the proposal handling routines
+ are generic. The information which is for current product in control.xml
+ file has to be provided, and the proposal must be added as a step into
+ the installation workflow. Basically, adding proposal has two
+ steps:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>defining the proposal (name, items,...)</para>
+ </listitem>
+
+ <listitem>
+ <para>adding a new step to the workflow referring to the new
+ added proposal</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ <section id="update-updposs-replaceproposal">
+ <title>Replace or remove whole proposal</title>
+ <para>Is possible as replacing or removing a step of the installation
+ workflow.</para>
+ </section>
+ </section>
+
+ <section id="update-filelayout">
+ <title>File layout</title>
+ <section id="update-filelayout-addon">
+ <title>Add-on Product CD</title>
+ <para>There will be following files in the root directory of the
+ add-on product's CD:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>servicepack.tar.gz – tarball with files which are
+ needed for the installation, both together with base
+ product and separatelly. Special files inside this
+ tarball:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>installation.xml – the control file of the
+ add-on product</para>
+ </listitem>
+ <listitem>
+ <para>the whole tarball or installation.xml can be
+ missing if add-on product doesn't provide any custom
+ installer, in this case, only its packages are added
+ to the package manager dialog, and packages/patterns/...
+ required by the product are selected by the
+ solver</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>(optional) setup.sh – script which starts the
+ installation automatically once the CD is in the
+ drive</para>
+ </listitem>
+
+ <listitem>
+ <para>(optional) files needed to make the CD bootable
+ (kernel, initrd, isolinux,...)</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ <section id="update-filelayout-wkfadapt">
+ <title>Workflow Adaptation</title>
+ <para>There is only a single control file to describe both an
+ add-on and standalone product installation. It is called
+ installation.xml. In principle, it contains a diff description
+ containing the changes to be applied to the installation workflow
+ plus a workflow, which is used for standalone product installation.
+ The reason why both installation methods are stored in a single
+ file is that the product features has to be shared as well as some
+ proposals and clients can be reused.</para>
+
+ <para>The proposals which are defined for standalone installation
+ are also available for the installation together with the base
+ product. They don't have to be defined twice.</para>
+
+ <para>The files are located in the top directory of the add-on
+ product installation source.</para>
+ </section>
+ </section>
+
+ <section id="update-difffileformat">
+ <title>Diff File Format</title>
+ <para>Because there are no really usable open source XML diff tools (the
+ existing ones are typically written in Java), we define a special purpose
+ file format aimed to cover the cases as described in the previous
+ chapter.</para>
+
+ <para>In principle, the format is a list of directives to be applied to
+ the existing control.xml. In principle, the file is a control file
+ defining its own proposals, workflows etc. The control file has a special
+ section, which defines changes to the existing workflow and
+ proposals.</para>
+
+ <programlisting>
+ <xi:include href="examples/update-difffileformat.xml" parse="text"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+
+ </section>
+
+ <section id="update-textdomain">
+ <title>Setting a text domain</title>
+ <para>Text domain is important for YaST to handle translations
+ properly. The appropriate set of .mo-files must be present to have
+ the texts related to the control file translated.</para>
+
+ <programlisting>
+ <textdomain>OES</textdomain>
+ </programlisting>
+ </section>
+
+ <section id="update-standaloneinst">
+ <title>Defining proposals and workflow for standalone installation</title>
+ <para>The proposals are defined the same way as for the base product.
+ The workflow for the standalone installation must have the mode and stage
+ set</para>
+
+ <programlisting>
+ <mode>installation</mode>
+ <stage>normal</stage>
+ </programlisting>
+ </section>
+
+ <section id="update-proposalmodif">
+ <title>Proposal modification</title>
+ <para>The label of the proposal can be modified. The mode, stage, and
+ proposal name has to be specified, other options (enable_skip,
+ architecture) are optional. The modes, stages, and architectures
+ do not</para>
+
+ <programlisting>
+ <proposal>
+ <label>OES Installation Settings</label>
+ <mode>installation,demo,autoinstallation</mode>
+ <stage>initial</stage>
+ <name>initial</name>
+ <enable_skip>no</enable_skip>
+ [.....]
+ </proposal>
+ </programlisting>
+ </section>
+
+ <section id="update-append">
+ <title>Appending an item at the end of proposal</title>
+ <para>Adding an item to a proposal is possible at the end only.
+ If the proposal has tabs, the items are added to a new created
+ tab.</para>
+
+ <programlisting>
+ <append_modules config:type="list">
+ <append_module>module_1</append_module>
+ <append_module>module_2</append_module>
+ </append_modules>
+ </programlisting>
+ </section>
+
+ <section id="update-removeproposal">
+ <title>Removing an item from a proposal</title>
+ <programlisting>
+ <remove_modules config:type="list">
+ <remove_module>module_3</remove_module>
+ <remove_module>module_4</remove_module>
+ </remove_modules>
+ </programlisting>
+ </section>
+
+ <section id="update-replaceproposal">
+ <title>Replacing an item of a proposal</title>
+ <para>The replacement is available in 1:N mode – one client is to be
+ replaced by one or more new clients. If you need M:N use remove and
+ replace together.</para>
+
+ <programlisting>
+ <replace_modules config:type="list">
+ <replace_module>
+ <replace>old_module</replace>
+ <new_modules config:type="list">
+ <new_module>module_5</new_module>
+ <new_module>module_6</new_module>
+ </new_modules>
+ </replace_module>
+ </replace_modules>
+ </programlisting>
+ </section>
+
+ <section id="update-workflowupdates">
+ <title>Workflow updates</title>
+ <para>The workflow to update is identified the same way as other
+ workflows. The archs, modes, and installation don't need tobe
+ alligned to the same groups as in the base product
+ workflows.</para>
+
+ <programlisting>
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ <enable_back>no</enable_back>
+ <enable_next>no</enable_next>
+ </defaults>
+ <mode>installation</mode>
+ <stage>initial</stage>
+ [...]
+ </workflow>
+ </programlisting>
+ </section>
+
+ <section id="update-append">
+ <title>Append steps to the end of installation sequence</title>
+
+ <programlisting>
+ <append_modules config:type="list">
+ <module>
+ <heading>yes</heading>
+ <label>OES configuration</label>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>a1_netsetup</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>a2_netprobe</name>
+ </module>
+ [...]
+ </append_modules>
+ </programlisting>
+ </section>
+
+ <section id="update-insert">
+ <title>Insert steps to installation sequence</title>
+
+ <programlisting>
+ <insert_modules config:type="list">
+ <insert_module>
+ <before>perform</before>
+ <modules config:type="list">
+ <module>
+ <label>Perform Installation</label>
+ <name>i1_netprobe</name>
+ </module>
+ [...]
+ </modules>
+ </insert_module>
+ </insert_modules>
+ </programlisting>
+ </section>
+
+ <section id="update-removesteps">
+ <title>Remove steps from installation sequence</title>
+
+ <programlisting>
+ <remove_modules config:type="list">
+ <remove_module>finish</remove_module>
+ [...]
+ </remove_modules>
+ </programlisting>
+ </section>
+
+ <section id="update-replacesteps">
+ <title>Replace steps in installation sequence</title>
+
+ <programlisting>
+ <replace_modules config:type="list">
+ <replace_module>
+ <replace>language</replace>
+ <modules config:type="list">
+ <module>
+ <label>Perform Installation</label>
+ <name>r1_language</name>
+ </module>
+ [...]
+ </modules>
+ </replace_module>
+ </replace_modules>
+ </programlisting>
+ </section>
+
+ <section id="update-instfinish">
+ <title>Add items in inst_finish.ycp</title>
+ <para>In CODE 10, the last step of an installation commonly known
+ as inst_finish has been modularized, so it's possible to control
+ the clients started at the end of the 1st stage. In principle, this
+ phase runs in a chroot environment – all system access is done via
+ chrooted process.</para>
+
+ <para>There are 3 cases that an add-on product can modify the workflow...</para>
+
+ <section id="update-instfinish-beforechroot">
+ <title>Before chroot</title>
+
+ <programlisting>
+ <inst_finish_stages config:type="list">
+ <before_chroot>
+ <label>Copy Theme</label>
+ <steps config:type="list">
+ <step>copy_theme</step>
+ [...]
+ </steps>
+ </before_chroot>
+ </inst_finish_stages>
+ </programlisting>
+ </section>
+
+ <section id="update-instfinish-chroot">
+ <title>Running in chroot</title>
+
+ <programlisting>
+ <inst_finish_stages config:type="list">
+ <chroot>
+ <label>Update Configuration</label>
+ <steps config:type="list">
+ <step>pkg</step>
+ [...]
+ </steps>
+ </chroot>
+ </inst_finish_stages>
+ </programlisting>
+ </section>
+
+ <section id="update-instfinish-beforeumount">
+ <title>Before unmounting the system</title>
+
+ <programlisting>
+ <inst_finish_stages config:type="list">
+ <before_umount>
+ <label>Disconnect Network Disks</label>
+ <steps config:type="list">
+ <step>iscsi_disconnect</step>
+ [...]
+ </steps>
+ </before_umount>
+ </inst_finish_stages>
+ </programlisting>
+ </section>
+
+ <para>All new steps are added at the end of the current list in the
+ particular inst_finish workflow. It is not possible to remove any
+ other inst_finish clients or replace them.</para>
+ </section>
+
+ <section id="update-replaceworkflow">
+ <title>Replace whole second-stage workflow</title>
+ <para>To replace a workflow, just create workflows as in base
+ product control file. The important is that the stage of the
+ workflow is set to</para>
+
+ <programlisting>
+ <stage>continue</stage>
+ </programlisting>
+
+ <para>and the mode is set for the specified mode.</para>
+ </section>
+
+ <section id="update-algorithm">
+ <title>Algorith for Adapting Workflow</title>
+ <para>The algorithm is rather straightforward. Every time, remove
+ is applied first, then replace and the last step is add. This is
+ done per product, so first the changes by product A are applied,
+ then by product B etc.</para>
+ </section>
+
+ <section id="update-algorithm-features">
+ <title>Product Features</title>
+ <para>One of the most important data stored in the control.xml
+ file are the values to influence the behavior of YaST code,
+ like proposals etc. The idea is the same as for workflow/proposal
+ adaptation: by redefining a value, the resulting values are
+ changed. Within YaST, the options are accessible via
+ ProductFeatures module. No new option groups can be defined.
+ Options which are defined by the base product, but not by the
+ add-on product, are kept unchanged (base product's value is
+ used).</para>
+
+ <programlisting>
+ <globals>
+ <additional_kernel_parameters></additional_kernel_parameters>
+ </globals>
+ [...]
+ <software>
+ <selection_type config:type="symbol">auto</selection_type>
+ </software>
+ </programlisting>
+ </section>
+
+ <section>
+ <title>AutoYaST profile generation</title>
+ <para>At the end of the installation, a profile for AutoYaST can be
+ generated. The profile will be generated using modules from the base
+ product and modules specified in the add-on product control
+ file.</para>
+
+ <programlisting>
+ <clone_modules config:type="list">
+ <clone_module>printer</clone_module>
+ [...]
+ </clone_modules>
+ </programlisting>
+ </section>
+
+ <section>
+ <title>Example of OES 1.0</title>
+ <para>The network code is instructed to force a static IP
+ address.</para>
+
+ <para>The control file contains steps for both standalone installation
+ and installation together with the base product. In the standalone
+ installation workflow, selecting and installing packages is missing,
+ these steps need to be prepended to the workflow.</para>
+
+ <programlisting>
+ <xi:include href="examples/update-oes-example.xml" parse="text"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+ </section>
+ </section>
+</section>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.48/VERSION new/yast2-installation-2.17.49/VERSION
--- old/yast2-installation-2.17.48/VERSION 2008-12-17 14:44:02.000000000 +0100
+++ new/yast2-installation-2.17.49/VERSION 2008-12-18 18:08:44.000000000 +0100
@@ -1 +1 @@
-2.17.48
+2.17.49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package yast2-bootloader for openSUSE:Factory
checked in at Fri Dec 19 15:20:43 CET 2008.
--------
--- yast2-bootloader/yast2-bootloader.changes 2008-12-17 14:32:57.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-12-19 11:11:15.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Dec 19 11:00:09 CET 2008 - juhliarik(a)suse.cz
+
+- added fix for changinf EFI label in running system (bnc #269198)
+- 2.17.48
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-bootloader-2.17.47.tar.bz2
New:
----
yast2-bootloader-2.17.48.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.B17816/_old 2008-12-19 15:20:29.000000000 +0100
+++ /var/tmp/diff_new_pack.B17816/_new 2008-12-19 15:20:29.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.17.47)
+# spec file for package yast2-bootloader (Version 2.17.48)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-bootloader
-Version: 2.17.47
+Version: 2.17.48
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.17.47.tar.bz2
+Source0: yast2-bootloader-2.17.48.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite
# to eliminate a cyclic dependency in autobuild:
@@ -68,7 +68,7 @@
Daniel Fiser
%prep
-%setup -n yast2-bootloader-2.17.47
+%setup -n yast2-bootloader-2.17.48
%build
%{prefix}/bin/y2tool y2autoconf
@@ -113,8 +113,10 @@
/usr/share/YaST2/scrconf/*.scr
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
-
%changelog
+* Fri Dec 19 2008 juhliarik(a)suse.cz
+- added fix for changinf EFI label in running system (bnc #269198)
+- 2.17.48
* Wed Dec 17 2008 juhliarik(a)suse.cz
- added fix for problem with primary language in GRUB (bnc #447053)
- 2.17.47
++++++ yast2-bootloader-2.17.47.tar.bz2 -> yast2-bootloader-2.17.48.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.47/src/modules/BootELILO.ycp new/yast2-bootloader-2.17.48/src/modules/BootELILO.ycp
--- old/yast2-bootloader-2.17.47/src/modules/BootELILO.ycp 2008-12-15 15:29:48.000000000 +0100
+++ new/yast2-bootloader-2.17.48/src/modules/BootELILO.ycp 2008-12-19 10:59:22.000000000 +0100
@@ -17,7 +17,7 @@
* Olaf Dabrunz <od(a)suse.de>
* Philipp Thomas <pth(a)suse.de>
*
- * $Id: BootELILO.ycp 54071 2008-12-11 16:50:11Z juhliarik $
+ * $Id: BootELILO.ycp 54283 2008-12-19 09:59:22Z juhliarik $
*
*/
@@ -479,6 +479,95 @@
}
+/** bnc #269198 change efi-label
+ * Function check if there exist same efi-label or different for
+ * same partition if efi-label is different delete it and create new one
+ * if it is same nothing to do it.
+ */
+
+boolean updateEFILabel()
+{
+ boolean ret = true;
+ string cmd = "";
+ map mp = Storage::GetMountPoints();
+ string boot_dev = mp[getEfiMountPoint (), 0]:"/boot/efi";
+ map splited = Storage::GetDiskPartition (boot_dev);
+ any boot_part = splited["nr"]:0;
+ any boot_disk = splited["disk"]:"";
+
+
+ // command for checking same boot entry in efi bnc #438215 (YaST creates efibootloader entry twice)
+ cmd = sformat("/usr/sbin/efibootmgr -v | grep -c \"%1.*HD(%2.*File(.\\efi.\\SuSE.\\elilo.efi)\"",
+ BootCommon::globals["boot_efilabel"]:"", tomyhexa(boot_part));
+
+ // check how many entries with same label and partition is actually in efi
+ y2milestone("run command %1", cmd);
+ map out = (map)SCR::Execute (.target.bash_output, cmd);
+ y2milestone("output of command %1", out);
+
+ // check number of same boot entries in efi
+ // if boot entry is added -> don't add it again
+ if (deletechars(out["stdout"]:"","\n") != "0")
+ {
+ if (out["exit"]:0 == 0)
+ y2milestone("Skip adding new boot entry - EFI Label exist");
+ else
+ y2error("Calling command %1 faild", cmd);
+ return ret;
+
+ } else {
+
+ cmd = sformat("/usr/sbin/efibootmgr -v | grep -c \"HD(%1.*File(.\\efi.\\SuSE.\\elilo.efi)\"", tomyhexa(boot_part));
+ // check how many entries with same label and partition is actually in efi
+ y2milestone("run command %1", cmd);
+ map out = (map)SCR::Execute (.target.bash_output, cmd);
+ y2milestone("output of command %1", out);
+
+ // check how many boot entries have same number of partitions
+ if (deletechars(out["stdout"]:"","\n") != "0")
+ {
+ // delete old boot entry
+
+ cmd = sformat("efibootmgr -v |grep \"HD(%1.*File(.\\efi.\\SuSE.\\elilo.efi)\" | cut -d \" \" -f 1",
+ tomyhexa(boot_part));
+ y2milestone("run command %1", cmd);
+ out = (map)SCR::Execute (.target.bash_output, cmd);
+ y2milestone("output of command %1", out);
+
+ string boot_entries = out["stdout"]:"";
+ y2milestone("EFI boot entries with \"same\" boot partition %1",boot_entries);
+
+ list<string> list_boot_entries = splitstring(boot_entries, "\n");
+
+ y2milestone("list_boot_entries=%1",list_boot_entries);
+
+ foreach(string entry, list_boot_entries,
+ {
+ if ((deletechars(entry, "\n*") != "") && (deletechars(entry, "\n*") != nil))
+ {
+ cmd = sformat("/usr/sbin/efibootmgr --delete-bootnum --bootnum %1 -q;",
+ substring (deletechars(entry, "\n*"),4, 4));
+ y2milestone("run command %1", cmd);
+ out = (map)SCR::Execute (.target.bash_output, cmd);
+ y2milestone("output of command %1", out);
+ }
+ });
+
+ }
+ // add new boot entry
+ string bl_logfile = "/var/log/YaST2/y2log_bootloader";
+ string bl_command = sformat ( "/usr/sbin/efibootmgr -v --create --label \"%1\" " +
+ "--disk %2 --part %3 " +
+ "--loader '\\efi\\SuSE\\elilo.efi' --write-signature >> %4 2>&1",
+ BootCommon::globals["boot_efilabel"]:"", boot_disk, boot_part, bl_logfile
+ );
+ ret = ret && installBootLoader (bl_command, bl_logfile);
+ }
+ return ret;
+}
+
+
+
/**
* Write bootloader settings to disk
* @return boolean true on success
@@ -496,6 +585,9 @@
computer, you need to load ELILO via the EFI shell."), 10);
}
+ if (Mode::normal())
+ updateEFILabel();
+
if (BootCommon::location_changed || create_efi_entry)
{
map mp = Storage::GetMountPoints();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.47/VERSION new/yast2-bootloader-2.17.48/VERSION
--- old/yast2-bootloader-2.17.47/VERSION 2008-12-17 14:26:57.000000000 +0100
+++ new/yast2-bootloader-2.17.48/VERSION 2008-12-19 11:04:43.000000000 +0100
@@ -1 +1 @@
-2.17.47
+2.17.48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package xvkbd for openSUSE:Factory
checked in at Fri Dec 19 15:20:32 CET 2008.
--------
--- xvkbd/xvkbd.changes 2008-07-24 16:10:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/xvkbd/xvkbd.changes 2008-12-18 18:18:36.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Dec 18 17:55:33 CET 2008 - dkukawka(a)suse.de
+
+- added default config file with 'Automatic Click' disabled to be
+ able to start xvkbd in the login manager (see bnc#441873) with
+ this option.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
xvkbd.default
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xvkbd.spec ++++++
--- /var/tmp/diff_new_pack.P16628/_old 2008-12-19 15:20:16.000000000 +0100
+++ /var/tmp/diff_new_pack.P16628/_new 2008-12-19 15:20:16.000000000 +0100
@@ -2,9 +2,16 @@
# spec file for package xvkbd (Version 3.0)
#
# 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/
#
@@ -18,7 +25,7 @@
%endif
Summary: Virtual Keyboard for the X Window System
Version: 3.0
-Release: 1
+Release: 29
License: GPL v2 or later
Group: System/X11/Utilities
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -26,6 +33,7 @@
Source: %{name}-%{version}.tar.bz2
Source1: xvkbd.desktop
Source2: xvkbd.png
+Source3: xvkbd.default
Patch0: %{name}-2.7a-compilerwarnings.diff
Patch1: %{name}-2.8-fix-compilerwarnings.diff
@@ -58,15 +66,17 @@
%endif
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp %{SOURCE3} $RPM_BUILD_ROOT/usr/share/X11/app-defaults/xvkbd.default
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
+%doc /usr/share/man/man1/*
/usr/share/X11/app-defaults/XVkbd*
+/usr/share/X11/app-defaults/xvkbd.default
/usr/bin/xvkbd
-%doc /usr/share/man/man1/*
%if %suse_version > 820
%{_datadir}/applications/*.desktop
%endif
@@ -74,6 +84,10 @@
%doc README
%changelog
+* Thu Dec 18 2008 dkukawka(a)suse.de
+- added default config file with 'Automatic Click' disabled to be
+ able to start xvkbd in the login manager (see bnc#441873) with
+ this option.
* Wed Jun 04 2008 dkukawka(a)suse.de
- enable build on SLE10
* Wed Jun 04 2008 dkukawka(a)suse.de
@@ -130,7 +144,7 @@
- added desktop file.
* Mon Nov 25 2002 tiwai(a)suse.de
- updated to version 2.5.
-* Tue Nov 12 2002 ro(a)suse.de
+* Mon Nov 11 2002 ro(a)suse.de
- changed neededforbuild <xshared> to <x-devel-packages>
- changed neededforbuild <xdevel> to <>
* Tue Aug 06 2002 tiwai(a)suse.de
++++++ xvkbd.default ++++++
#quick_modifiers 1
#shift_lock 0
#altgr_lock 0
#modifiers_lock 0
#key_click 1
#autoclick 0
#always_on_top 0
#jump_pointer 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
19 Dec '08
Hello community,
here is the log from the commit of package xorg-x11-driver-video-unichrome for openSUSE:Factory
checked in at Fri Dec 19 15:20:18 CET 2008.
--------
--- arch/i386/xorg-x11-driver-video-unichrome/xorg-x11-driver-video-unichrome.changes 2008-08-18 16:17:35.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-unichrome/xorg-x11-driver-video-unichrome.changes 2008-12-19 01:49:22.278044637 +0100
@@ -1,0 +2,21 @@
+Fri Dec 19 01:44:37 CET 2008 - sndirsch(a)suse.de
+
+- update to git commit 1464eb9 (2008-12-17)
+ * Memory Typing: Teach the driver about DDR2.
+ * Tabs cleanup: clean up via_host.c and VIAProbe.
+ * Host: Add P4M900 support.
+ * Host: Add CX700 support.
+ * DRI: Support AGPv3 modes correctly.
+ * Host: Allow more memory bandwidth when using DDR2 533.
+ * Host: Make FBBase retrieval more resilient.
+ * Change driver name from "via" to "unichrome".
+ * Wrapper: provide autoconf logic.
+ * Host: Add host support for CN400, CN700, P4M890, K8M890 and VX800.
+ * CLE266: Bus DFP: only null CR88.6 when using TMDS.
+ * fix make dist: man/wrapper.man and src/via_panel.h don't exist.
+ * fix make dist: EXTRA_DIST git_version.sh
+ * MapFB: move MTRR hack to a place where we _do_ know the FrameBufferBase.
+ * Host FBBaseGet: Fix FrameBufferBase on 64bit.
+- obsoletes xf86-video-unichrome.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-video-unichrome.diff
xf86-video-unichrome-fa90a8f.tar.bz2
New:
----
xf86-video-unichrome-1464eb9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video-unichrome.spec ++++++
--- /var/tmp/diff_new_pack.X13417/_old 2008-12-19 15:19:04.000000000 +0100
+++ /var/tmp/diff_new_pack.X13417/_new 2008-12-19 15:19:04.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package xorg-x11-driver-video-unichrome (Version 20080807)
+# spec file for package xorg-x11-driver-video-unichrome (Version 20081217)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -41,15 +41,14 @@
License: X11/MIT
Group: System/X11/Servers/XF86_4
AutoReqProv: on
-Version: 20080807
-Release: 12
+Version: 20081217
+Release: 1
Summary: The Unichrome Project
PreReq: coreutils
Requires: xorg-x11-server
Provides: xorg-x11-driver-video:%{_libdir}/xorg/modules/drivers/unichrome_drv.so
-Source: xf86-video-unichrome-fa90a8f.tar.bz2
+Source: xf86-video-unichrome-1464eb9.tar.bz2
Source1: pci_ids
-Patch: xf86-video-unichrome.diff
Patch1: mandriva2007.diff
ExclusiveArch: %ix86 ia64 ppc ppc64 x86_64
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -69,12 +68,10 @@
S3 Graphics, Inc.
%prep
-%setup -n xf86-video-unichrome
-%patch
+%setup -n xf86-video-unichrome-0.2.0.0
%if 0%{?mandriva_version} > 2006
%patch1
%endif
-ln -s via.man man/unichrome.man
%build
%if 0%{?suse_version} > 1010 || 0%{?fedora_version} >= 6 || 0%{?mandriva_version} > 2006
@@ -197,6 +194,24 @@
%endif
%changelog
+* Fri Dec 19 2008 sndirsch(a)suse.de
+- update to git commit 1464eb9 (2008-12-17)
+ * Memory Typing: Teach the driver about DDR2.
+ * Tabs cleanup: clean up via_host.c and VIAProbe.
+ * Host: Add P4M900 support.
+ * Host: Add CX700 support.
+ * DRI: Support AGPv3 modes correctly.
+ * Host: Allow more memory bandwidth when using DDR2 533.
+ * Host: Make FBBase retrieval more resilient.
+ * Change driver name from "via" to "unichrome".
+ * Wrapper: provide autoconf logic.
+ * Host: Add host support for CN400, CN700, P4M890, K8M890 and VX800.
+ * CLE266: Bus DFP: only null CR88.6 when using TMDS.
+ * fix make dist: man/wrapper.man and src/via_panel.h don't exist.
+ * fix make dist: EXTRA_DIST git_version.sh
+ * MapFB: move MTRR hack to a place where we _do_ know the FrameBufferBase.
+ * Host FBBaseGet: Fix FrameBufferBase on 64bit.
+- obsoletes xf86-video-unichrome.diff
* Mon Aug 18 2008 ro(a)suse.de
- change prereq to coreutils
* Fri Aug 08 2008 sndirsch(a)suse.de
@@ -234,5 +249,5 @@
- fixed ModuleData symbol name (Bug #227741, comment #26)
* Thu Oct 18 2007 sndirsch(a)suse.de
- make sure to install this package during update
-* Fri Aug 31 2007 sndirsch(a)suse.de
+* Thu Aug 30 2007 sndirsch(a)suse.de
- created package
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package uClibc for openSUSE:Factory
checked in at Fri Dec 19 15:20:06 CET 2008.
--------
--- uClibc/uClibc.changes 2008-12-18 11:28:18.000000000 +0100
+++ /mounts/work_src_done/STABLE/uClibc/uClibc.changes 2008-12-19 13:59:54.000000000 +0100
@@ -1,0 +2,11 @@
+Fri Dec 19 13:57:06 CET 2008 - sassmann(a)suse.de
+
+- enable pthread support on i386, x86_64, ppc and ia64
+- tweak config files
+- add:
+ uClibc.fix-pthread-warnings.patch: fix "warning: no previous
+ prototype for ..."
+ uClibc.ppc-fix-nested-extern-declaration.patch: fix "warning:
+ nested extern declaration of '__illegally_sized_syscall_arg1'"
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
uClibc.fix-pthread-warnings.patch
uClibc.ppc-fix-nested-extern-declaration.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ uClibc.spec ++++++
--- /var/tmp/diff_new_pack.b12061/_old 2008-12-19 15:18:51.000000000 +0100
+++ /var/tmp/diff_new_pack.b12061/_new 2008-12-19 15:18:51.000000000 +0100
@@ -21,7 +21,7 @@
Name: uClibc
Version: 0.9.30
-Release: 4
+Release: 5
Summary: A full-featured C library optimized for size
License: LGPL v2.1 or later
BuildRequires: linux-kernel-headers ncurses-devel
@@ -47,6 +47,8 @@
Patch2: uClibc.ia64-fake-getpgrp-syscall.patch
Patch3: uClibc.ia64-use-sched_setaffinity-if-present.patch
Patch4: uClibc.ia64-INTERNAL_SYSCALL-conversion.patch
+Patch5: uClibc.fix-pthread-warnings.patch
+Patch6: uClibc.ppc-fix-nested-extern-declaration.patch
Group: System/Libraries
%description
@@ -70,6 +72,8 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
cp %{S:1} .config
cp %{S:2} gcc-uClibc.in
cp %{S:3} README.SUSE
@@ -135,6 +139,14 @@
#/usr/lib/*-linux-uclibc/usr/lib/*.so
%changelog
+* Fri Dec 19 2008 sassmann(a)suse.de
+- enable pthread support on i386, x86_64, ppc and ia64
+- tweak config files
+- add:
+ uClibc.fix-pthread-warnings.patch: fix "warning: no previous
+ prototype for ..."
+ uClibc.ppc-fix-nested-extern-declaration.patch: fix "warning:
+ nested extern declaration of '__illegally_sized_syscall_arg1'"
* Thu Dec 18 2008 sassmann(a)suse.de
- add uClibc.ia64-INTERNAL_SYSCALL-conversion.patch: use
INTERNAL_SYSCALL on ia64
++++++ config.i386 ++++++
--- /var/tmp/diff_new_pack.b12061/_old 2008-12-19 15:18:51.000000000 +0100
+++ /var/tmp/diff_new_pack.b12061/_new 2008-12-19 15:18:51.000000000 +0100
@@ -1,9 +1,11 @@
#
# Automatically generated make config: don't edit
-# Wed Oct 22 12:25:38 2008
+# Version: 0.9.30
+# Fri Dec 19 10:34:09 2008
#
# TARGET_alpha is not set
# TARGET_arm is not set
+# TARGET_avr32 is not set
# TARGET_bfin is not set
# TARGET_cris is not set
# TARGET_e1 is not set
@@ -25,6 +27,7 @@
# TARGET_v850 is not set
# TARGET_vax is not set
# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
#
# Target Architecture Features and Options
@@ -63,6 +66,7 @@
UCLIBC_HAS_FLOATS=y
UCLIBC_HAS_FPU=y
# DO_C99_MATH is not set
+# UCLIBC_HAS_FENV is not set
KERNEL_HEADERS="/usr/include"
HAVE_DOT_CONFIG=y
@@ -71,12 +75,15 @@
#
# HAVE_NO_PIC is not set
DOPIC=y
-# HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_SHARED is not set
# ARCH_HAS_NO_LDSO is not set
# HAVE_SHARED is not set
UCLIBC_CTOR_DTOR=y
# HAS_NO_THREADS is not set
-# UCLIBC_HAS_THREADS is not set
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
+LINUXTHREADS_OLD=y
+UCLIBC_HAS_SYSLOG=y
UCLIBC_HAS_LFS=y
# MALLOC is not set
# MALLOC_SIMPLE is not set
@@ -86,11 +93,13 @@
# COMPAT_ATEXIT is not set
# UCLIBC_SUSV3_LEGACY is not set
# UCLIBC_SUSV3_LEGACY_MACROS is not set
+# UCLIBC_HAS_STUBS is not set
UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
+UCLIBC_HAS_PTY=y
ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+# UCLIBC_HAS_GETPT is not set
UCLIBC_HAS_TM_EXTENSIONS=y
UCLIBC_HAS_TZ_CACHING=y
UCLIBC_HAS_TZ_FILE=y
@@ -104,9 +113,28 @@
UCLIBC_GRP_BUFFER_SIZE=256
#
-# Networking Support
+# Support various families of functions
#
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_LINUX_MODULE_24=y
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+UCLIBC_HAS_PROFILING=y
+UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+UCLIBC_HAS_IPV6=y
UCLIBC_HAS_RPC=y
# UCLIBC_HAS_FULL_RPC is not set
# UCLIBC_HAS_REENTRANT_RPC is not set
@@ -120,8 +148,8 @@
UCLIBC_HAS_STRING_ARCH_OPT=y
UCLIBC_HAS_CTYPE_TABLES=y
UCLIBC_HAS_CTYPE_SIGNED=y
-UCLIBC_HAS_CTYPE_UNSAFE=y
-# UCLIBC_HAS_CTYPE_CHECKED is not set
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
# UCLIBC_HAS_CTYPE_ENFORCED is not set
# UCLIBC_HAS_WCHAR is not set
# UCLIBC_HAS_LOCALE is not set
@@ -178,7 +206,12 @@
#
# UCLIBC_HAS_ARC4RANDOM is not set
# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
+UCLIBC_HAS_SSP=y
+# UCLIBC_HAS_SSP_COMPAT is not set
+# SSP_QUICK_CANARY is not set
+# PROPOLICE_BLOCK_ABRT is not set
+PROPOLICE_BLOCK_SEGV=y
+UCLIBC_BUILD_SSP=y
UCLIBC_BUILD_NOEXECSTACK=y
#
@@ -186,8 +219,8 @@
#
CROSS_COMPILER_PREFIX=""
UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DOSTRIP is not set
+DODEBUG=y
+# DODEBUG_PT is not set
# DOASSERTS is not set
# UCLIBC_MALLOC_DEBUGGING is not set
WARNINGS="-Wall"
++++++ config.ia64 ++++++
--- /var/tmp/diff_new_pack.b12061/_old 2008-12-19 15:18:51.000000000 +0100
+++ /var/tmp/diff_new_pack.b12061/_new 2008-12-19 15:18:51.000000000 +0100
@@ -1,9 +1,11 @@
#
# Automatically generated make config: don't edit
-# Wed Oct 22 08:00:42 2008
+# Version: 0.9.30
+# Fri Dec 19 11:40:01 2008
#
# TARGET_alpha is not set
# TARGET_arm is not set
+# TARGET_avr32 is not set
# TARGET_bfin is not set
# TARGET_cris is not set
# TARGET_e1 is not set
@@ -25,6 +27,7 @@
# TARGET_v850 is not set
# TARGET_vax is not set
# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
#
# Target Architecture Features and Options
@@ -46,6 +49,7 @@
UCLIBC_HAS_FLOATS=y
UCLIBC_HAS_FPU=y
# DO_C99_MATH is not set
+# UCLIBC_HAS_FENV is not set
KERNEL_HEADERS="/usr/include"
HAVE_DOT_CONFIG=y
@@ -54,11 +58,14 @@
#
# HAVE_NO_PIC is not set
DOPIC=y
-HAVE_NO_SHARED=y
+ARCH_HAS_NO_SHARED=y
ARCH_HAS_NO_LDSO=y
UCLIBC_CTOR_DTOR=y
# HAS_NO_THREADS is not set
-# UCLIBC_HAS_THREADS is not set
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
+LINUXTHREADS_OLD=y
+UCLIBC_HAS_SYSLOG=y
UCLIBC_HAS_LFS=y
# MALLOC is not set
# MALLOC_SIMPLE is not set
@@ -68,11 +75,13 @@
# COMPAT_ATEXIT is not set
# UCLIBC_SUSV3_LEGACY is not set
# UCLIBC_SUSV3_LEGACY_MACROS is not set
+# UCLIBC_HAS_STUBS is not set
UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
+UCLIBC_HAS_PTY=y
ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+# UCLIBC_HAS_GETPT is not set
UCLIBC_HAS_TM_EXTENSIONS=y
UCLIBC_HAS_TZ_CACHING=y
UCLIBC_HAS_TZ_FILE=y
@@ -86,9 +95,28 @@
UCLIBC_GRP_BUFFER_SIZE=256
#
-# Networking Support
+# Support various families of functions
#
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_LINUX_MODULE_24=y
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+UCLIBC_HAS_PROFILING=y
+UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+UCLIBC_HAS_IPV6=y
UCLIBC_HAS_RPC=y
# UCLIBC_HAS_FULL_RPC is not set
# UCLIBC_HAS_REENTRANT_RPC is not set
@@ -102,8 +130,8 @@
UCLIBC_HAS_STRING_ARCH_OPT=y
UCLIBC_HAS_CTYPE_TABLES=y
UCLIBC_HAS_CTYPE_SIGNED=y
-UCLIBC_HAS_CTYPE_UNSAFE=y
-# UCLIBC_HAS_CTYPE_CHECKED is not set
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
# UCLIBC_HAS_CTYPE_ENFORCED is not set
# UCLIBC_HAS_WCHAR is not set
# UCLIBC_HAS_LOCALE is not set
@@ -160,7 +188,12 @@
#
# UCLIBC_HAS_ARC4RANDOM is not set
# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
+UCLIBC_HAS_SSP=y
+# UCLIBC_HAS_SSP_COMPAT is not set
+# SSP_QUICK_CANARY is not set
+# PROPOLICE_BLOCK_ABRT is not set
+PROPOLICE_BLOCK_SEGV=y
+UCLIBC_BUILD_SSP=y
UCLIBC_BUILD_NOEXECSTACK=y
#
@@ -168,8 +201,8 @@
#
CROSS_COMPILER_PREFIX=""
UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DOSTRIP is not set
+DODEBUG=y
+# DODEBUG_PT is not set
# DOASSERTS is not set
# UCLIBC_MALLOC_DEBUGGING is not set
WARNINGS="-Wall"
++++++ config.ppc ++++++
--- /var/tmp/diff_new_pack.b12061/_old 2008-12-19 15:18:51.000000000 +0100
+++ /var/tmp/diff_new_pack.b12061/_new 2008-12-19 15:18:51.000000000 +0100
@@ -1,9 +1,11 @@
#
# Automatically generated make config: don't edit
-# Wed Oct 22 12:06:03 2008
+# Version: 0.9.30
+# Fri Dec 19 10:55:00 2008
#
# TARGET_alpha is not set
# TARGET_arm is not set
+# TARGET_avr32 is not set
# TARGET_bfin is not set
# TARGET_cris is not set
# TARGET_e1 is not set
@@ -25,6 +27,7 @@
# TARGET_v850 is not set
# TARGET_vax is not set
# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
#
# Target Architecture Features and Options
@@ -48,6 +51,7 @@
UCLIBC_HAS_FLOATS=y
UCLIBC_HAS_FPU=y
# DO_C99_MATH is not set
+# UCLIBC_HAS_FENV is not set
KERNEL_HEADERS="/usr/include"
HAVE_DOT_CONFIG=y
@@ -56,12 +60,15 @@
#
# HAVE_NO_PIC is not set
DOPIC=y
-# HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_SHARED is not set
# ARCH_HAS_NO_LDSO is not set
# HAVE_SHARED is not set
UCLIBC_CTOR_DTOR=y
# HAS_NO_THREADS is not set
-# UCLIBC_HAS_THREADS is not set
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
+LINUXTHREADS_OLD=y
+UCLIBC_HAS_SYSLOG=y
UCLIBC_HAS_LFS=y
# MALLOC is not set
# MALLOC_SIMPLE is not set
@@ -71,11 +78,13 @@
# COMPAT_ATEXIT is not set
# UCLIBC_SUSV3_LEGACY is not set
# UCLIBC_SUSV3_LEGACY_MACROS is not set
+# UCLIBC_HAS_STUBS is not set
UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
+UCLIBC_HAS_PTY=y
ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+# UCLIBC_HAS_GETPT is not set
UCLIBC_HAS_TM_EXTENSIONS=y
UCLIBC_HAS_TZ_CACHING=y
UCLIBC_HAS_TZ_FILE=y
@@ -89,9 +98,28 @@
UCLIBC_GRP_BUFFER_SIZE=256
#
-# Networking Support
+# Support various families of functions
#
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_LINUX_MODULE_24=y
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+UCLIBC_HAS_PROFILING=y
+UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+UCLIBC_HAS_IPV6=y
UCLIBC_HAS_RPC=y
# UCLIBC_HAS_FULL_RPC is not set
# UCLIBC_HAS_REENTRANT_RPC is not set
@@ -105,8 +133,8 @@
UCLIBC_HAS_STRING_ARCH_OPT=y
UCLIBC_HAS_CTYPE_TABLES=y
UCLIBC_HAS_CTYPE_SIGNED=y
-UCLIBC_HAS_CTYPE_UNSAFE=y
-# UCLIBC_HAS_CTYPE_CHECKED is not set
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
# UCLIBC_HAS_CTYPE_ENFORCED is not set
# UCLIBC_HAS_WCHAR is not set
# UCLIBC_HAS_LOCALE is not set
@@ -163,7 +191,12 @@
#
# UCLIBC_HAS_ARC4RANDOM is not set
# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
+UCLIBC_HAS_SSP=y
+# UCLIBC_HAS_SSP_COMPAT is not set
+# SSP_QUICK_CANARY is not set
+# PROPOLICE_BLOCK_ABRT is not set
+PROPOLICE_BLOCK_SEGV=y
+UCLIBC_BUILD_SSP=y
UCLIBC_BUILD_NOEXECSTACK=y
#
@@ -171,8 +204,8 @@
#
CROSS_COMPILER_PREFIX=""
UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DOSTRIP is not set
+DODEBUG=y
+# DODEBUG_PT is not set
# DOASSERTS is not set
# UCLIBC_MALLOC_DEBUGGING is not set
WARNINGS="-Wall"
++++++ config.x86_64 ++++++
--- /var/tmp/diff_new_pack.b12061/_old 2008-12-19 15:18:51.000000000 +0100
+++ /var/tmp/diff_new_pack.b12061/_new 2008-12-19 15:18:51.000000000 +0100
@@ -1,9 +1,11 @@
#
# Automatically generated make config: don't edit
-# Wed Oct 22 11:22:21 2008
+# Version: 0.9.30
+# Fri Dec 19 10:34:48 2008
#
# TARGET_alpha is not set
# TARGET_arm is not set
+# TARGET_avr32 is not set
# TARGET_bfin is not set
# TARGET_cris is not set
# TARGET_e1 is not set
@@ -25,6 +27,7 @@
# TARGET_v850 is not set
# TARGET_vax is not set
TARGET_x86_64=y
+# TARGET_xtensa is not set
#
# Target Architecture Features and Options
@@ -46,6 +49,7 @@
UCLIBC_HAS_FLOATS=y
UCLIBC_HAS_FPU=y
# DO_C99_MATH is not set
+# UCLIBC_HAS_FENV is not set
KERNEL_HEADERS="/usr/include"
HAVE_DOT_CONFIG=y
@@ -54,12 +58,15 @@
#
# HAVE_NO_PIC is not set
DOPIC=y
-# HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_SHARED is not set
# ARCH_HAS_NO_LDSO is not set
# HAVE_SHARED is not set
UCLIBC_CTOR_DTOR=y
# HAS_NO_THREADS is not set
-# UCLIBC_HAS_THREADS is not set
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
+LINUXTHREADS_OLD=y
+UCLIBC_HAS_SYSLOG=y
UCLIBC_HAS_LFS=y
# MALLOC is not set
# MALLOC_SIMPLE is not set
@@ -69,11 +76,13 @@
# COMPAT_ATEXIT is not set
# UCLIBC_SUSV3_LEGACY is not set
# UCLIBC_SUSV3_LEGACY_MACROS is not set
+# UCLIBC_HAS_STUBS is not set
UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
+UCLIBC_HAS_PTY=y
ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+# UCLIBC_HAS_GETPT is not set
UCLIBC_HAS_TM_EXTENSIONS=y
UCLIBC_HAS_TZ_CACHING=y
UCLIBC_HAS_TZ_FILE=y
@@ -87,9 +96,28 @@
UCLIBC_GRP_BUFFER_SIZE=256
#
-# Networking Support
+# Support various families of functions
#
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_LINUX_MODULE_24=y
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+UCLIBC_HAS_PROFILING=y
+UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+UCLIBC_HAS_IPV6=y
UCLIBC_HAS_RPC=y
# UCLIBC_HAS_FULL_RPC is not set
# UCLIBC_HAS_REENTRANT_RPC is not set
@@ -103,8 +131,8 @@
UCLIBC_HAS_STRING_ARCH_OPT=y
UCLIBC_HAS_CTYPE_TABLES=y
UCLIBC_HAS_CTYPE_SIGNED=y
-UCLIBC_HAS_CTYPE_UNSAFE=y
-# UCLIBC_HAS_CTYPE_CHECKED is not set
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
# UCLIBC_HAS_CTYPE_ENFORCED is not set
# UCLIBC_HAS_WCHAR is not set
# UCLIBC_HAS_LOCALE is not set
@@ -161,7 +189,12 @@
#
# UCLIBC_HAS_ARC4RANDOM is not set
# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
+UCLIBC_HAS_SSP=y
+# UCLIBC_HAS_SSP_COMPAT is not set
+# SSP_QUICK_CANARY is not set
+# PROPOLICE_BLOCK_ABRT is not set
+PROPOLICE_BLOCK_SEGV=y
+UCLIBC_BUILD_SSP=y
UCLIBC_BUILD_NOEXECSTACK=y
#
@@ -169,8 +202,8 @@
#
CROSS_COMPILER_PREFIX=""
UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DOSTRIP is not set
+DODEBUG=y
+# DODEBUG_PT is not set
# DOASSERTS is not set
# UCLIBC_MALLOC_DEBUGGING is not set
WARNINGS="-Wall"
++++++ uClibc.fix-pthread-warnings.patch ++++++
Subject: fix pthread warnings
From: Stefan Assmann <sassmann(a)suse.de>
This patch declares prototypes of several functions to get rid of the
following compiler warnings:
./libpthread/linuxthreads.old/sysdeps/x86_64/pt-machine.h:44: warning: no previous prototype for 'testandset'
./libpthread/linuxthreads.old/sysdeps/x86_64/pt-machine.h:62: warning: no previous prototype for '__compare_and_swap'
./libpthread/linuxthreads.old/sysdeps/ia64/pt-machine.h:101: warning: no previous prototype for '__compare_and_swap_with_release_semantics'
Signed-off-by: Stefan Assmann <sassmann(a)suse.de>
---
libpthread/linuxthreads.old/sysdeps/alpha/pt-machine.h | 2 ++
libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h | 1 +
libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h | 2 ++
libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h | 2 ++
libpthread/linuxthreads.old/sysdeps/cris/pt-machine.h | 1 +
libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h | 1 +
libpthread/linuxthreads.old/sysdeps/h8300/pt-machine.h | 1 +
libpthread/linuxthreads.old/sysdeps/i386/pt-machine.h | 2 ++
libpthread/linuxthreads.old/sysdeps/ia64/pt-machine.h | 4 ++++
libpthread/linuxthreads.old/sysdeps/m68k/pt-machine.h | 2 ++
libpthread/linuxthreads.old/sysdeps/mips/pt-machine.h | 2 ++
libpthread/linuxthreads.old/sysdeps/nios/pt-machine.h | 1 +
libpthread/linuxthreads.old/sysdeps/nios2/pt-machine.h | 1 +
libpthread/linuxthreads.old/sysdeps/powerpc/pt-machine.h | 3 +++
libpthread/linuxthreads.old/sysdeps/sh/pt-machine.h | 1 +
libpthread/linuxthreads.old/sysdeps/v850/pt-machine.h | 1 +
libpthread/linuxthreads.old/sysdeps/x86_64/pt-machine.h | 2 ++
libpthread/linuxthreads.old/sysdeps/xtensa/pt-machine.h | 1 +
18 files changed, 30 insertions(+)
--- a/libpthread/linuxthreads.old/sysdeps/x86_64/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/x86_64/pt-machine.h
@@ -40,6 +40,7 @@ register char * stack_pointer __asm__ ("
/* Spinlock implementation; required. */
+PT_EI long int testandset (int *__spinlock);
PT_EI long int
testandset (int *__spinlock)
{
@@ -58,6 +59,7 @@ testandset (int *__spinlock)
/* Compare-and-swap for semaphores. */
# define HAS_COMPARE_AND_SWAP
+PT_EI int __compare_and_swap (long int *__p, long int __oldval, long int __newval);
PT_EI int
__compare_and_swap (long int *__p, long int __oldval, long int __newval)
{
--- a/libpthread/linuxthreads.old/sysdeps/alpha/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/alpha/pt-machine.h
@@ -48,6 +48,7 @@ register char *stack_pointer __asm__("$3
/* Spinlock implementation; required. */
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
@@ -95,6 +96,7 @@ testandset (int *spinlock)
/* Compare-and-swap for semaphores. */
#define HAS_COMPARE_AND_SWAP
+PT_EI int __compare_and_swap (long int *p, long int oldval, long int newval);
PT_EI int
__compare_and_swap (long int *p, long int oldval, long int newval)
{
--- a/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h
@@ -33,6 +33,7 @@
time; let's hope nobody tries to use one. */
/* Spinlock implementation; required. */
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
--- a/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h
@@ -34,6 +34,7 @@ extern long int testandset (int *spinloc
extern int __compare_and_swap (long int *p, long int oldval, long int newval);
/* Spinlock implementation; required. */
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
@@ -49,6 +50,7 @@ register char * stack_pointer __asm__ ("
/* Compare-and-swap for semaphores. */
#define HAS_COMPARE_AND_SWAP
+PT_EI int __compare_and_swap (long int *p, long int oldval, long int newval);
PT_EI int
__compare_and_swap(long int *p, long int oldval, long int newval)
{
--- a/libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h
@@ -36,6 +36,7 @@
It's ugly. But it's the only thing we can do now.
The handler of EXCPT 0x4 expects the address of the lock is passed through
R0. And the result is returned by R0. */
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
@@ -51,6 +52,7 @@ testandset (int *spinlock)
}
#define HAS_COMPARE_AND_SWAP
+PT_EI int __compare_and_swap (long int *p, long int oldval, long int newval);
PT_EI int
__compare_and_swap (long int *p, long int oldval, long int newval)
{
--- a/libpthread/linuxthreads.old/sysdeps/cris/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/cris/pt-machine.h
@@ -26,6 +26,7 @@
# define PT_EI __extern_always_inline
#endif
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
--- a/libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h
@@ -31,6 +31,7 @@
#endif
/* Spinlock implementation; required. */
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
--- a/libpthread/linuxthreads.old/sysdeps/h8300/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/h8300/pt-machine.h
@@ -29,6 +29,7 @@
#endif
/* Spinlock implementation; required. */
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
--- a/libpthread/linuxthreads.old/sysdeps/i386/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/i386/pt-machine.h
@@ -43,6 +43,7 @@ extern int __compare_and_swap (long int
defined __athlon__ || defined __k8__)
/* Spinlock implementation; required. */
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
@@ -60,6 +61,7 @@ testandset (int *spinlock)
/* Compare-and-swap for semaphores. It's always available on i686. */
#define HAS_COMPARE_AND_SWAP
+PT_EI int __compare_and_swap (long int *p, long int oldval, long int newval);
PT_EI int
__compare_and_swap (long int *p, long int oldval, long int newval)
{
--- a/libpthread/linuxthreads.old/sysdeps/ia64/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/ia64/pt-machine.h
@@ -82,6 +82,7 @@ register struct _pthread_descr_struct *_
#define HAS_COMPARE_AND_SWAP_WITH_RELEASE_SEMANTICS
+PT_EI int __compare_and_swap (long int *p, long int oldval, long int newval);
PT_EI int
__compare_and_swap (long int *p, long int oldval, long int newval)
{
@@ -96,6 +97,8 @@ __compare_and_swap (long int *p, long in
return readval == oldval;
}
+PT_EI int __compare_and_swap_with_release_semantics (long int *p, long int
+ oldval, long int newval);
PT_EI int
__compare_and_swap_with_release_semantics (long int *p,
long int oldval,
@@ -115,6 +118,7 @@ __compare_and_swap_with_release_semantic
#endif /* ELF_MACHINE_NAME */
/* Spinlock implementation; required. */
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
--- a/libpthread/linuxthreads.old/sysdeps/m68k/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/m68k/pt-machine.h
@@ -29,6 +29,7 @@
#endif
/* Spinlock implementation; required. */
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
@@ -58,6 +59,7 @@ register char * stack_pointer __asm__ ("
#if !defined(__mcoldfire__) && !defined(__mcf5200__) && !defined(__mc68000)
#define HAS_COMPARE_AND_SWAP
+PT_EI int __compare_and_swap (long int *p, long int oldval, long int newval);
PT_EI int
__compare_and_swap (long int *p, long int oldval, long int newval)
{
--- a/libpthread/linuxthreads.old/sysdeps/mips/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/mips/pt-machine.h
@@ -61,6 +61,7 @@ __NTH (_test_and_set (int *p, int v))
/* Spinlock implementation; required. */
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
@@ -77,6 +78,7 @@ register char * stack_pointer __asm__ ("
/* Compare-and-swap for semaphores. */
#define HAS_COMPARE_AND_SWAP
+PT_EI int __compare_and_swap (long int *p, long int oldval, long int newval);
PT_EI int
__compare_and_swap (long int *p, long int oldval, long int newval)
{
--- a/libpthread/linuxthreads.old/sysdeps/nios2/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/nios2/pt-machine.h
@@ -28,6 +28,7 @@
#endif
/* Spinlock implementation; required. */
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
--- a/libpthread/linuxthreads.old/sysdeps/nios/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/nios/pt-machine.h
@@ -33,6 +33,7 @@
what else we can do before we have a swap like instruction? This is better
than nothing
*/
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
--- a/libpthread/linuxthreads.old/sysdeps/sh/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/sh/pt-machine.h
@@ -32,6 +32,7 @@
extern long int testandset (int *spinlock);
/* Spinlock implementation; required. */
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
--- a/libpthread/linuxthreads.old/sysdeps/xtensa/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/xtensa/pt-machine.h
@@ -33,6 +33,7 @@
#define MEMORY_BARRIER() __asm__ ("memw" : : : "memory")
/* Spinlock implementation; required. */
+PT_EI long int testandset (int *spinlock);
PT_EI long int
testandset (int *spinlock)
{
--- a/libpthread/linuxthreads.old/sysdeps/powerpc/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/powerpc/pt-machine.h
@@ -56,6 +56,7 @@ register struct _pthread_descr_struct *_
#define HAS_COMPARE_AND_SWAP_WITH_RELEASE_SEMANTICS
#define IMPLEMENT_TAS_WITH_CAS
+PT_EI int __compare_and_swap (long int *p, long int oldval, long int newval);
PT_EI int
__compare_and_swap (long int *p, long int oldval, long int newval)
{
@@ -79,6 +80,8 @@ __compare_and_swap (long int *p, long in
return ret == 0;
}
+PT_EI int __compare_and_swap_with_release_semantics (long int *p, long int
+ oldval, long int newval);
PT_EI int
__compare_and_swap_with_release_semantics (long int *p,
long int oldval, long int newval)
--- a/libpthread/linuxthreads.old/sysdeps/v850/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/v850/pt-machine.h
@@ -29,6 +29,7 @@ register char *__stack_pointer __asm__ (
/* Atomically: If *PTR == OLD, set *PTR to NEW and return true,
otherwise do nothing and return false. */
+PT_EI int __compare_and_swap (long int *p, long int oldval, long int newval);
PT_EI int
__compare_and_swap (long *ptr, long old, long new)
{
++++++ uClibc.ppc-fix-nested-extern-declaration.patch ++++++
From: Stefan Assmann <sassmann(a)suse.de>
This patch gets rid of the following annoying warnings on ppc:
warning: nested extern declaration of '__illegally_sized_syscall_arg1'
warning: nested extern declaration of '__illegally_sized_syscall_arg2'
warning: nested extern declaration of '__illegally_sized_syscall_arg3'
warning: nested extern declaration of '__illegally_sized_syscall_arg4'
warning: nested extern declaration of '__illegally_sized_syscall_arg5'
warning: nested extern declaration of '__illegally_sized_syscall_arg6'
Signed-off-by: Stefan Assmann <sassmann(a)suse.de>
---
libc/sysdeps/linux/powerpc/bits/syscalls.h | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
--- a/libc/sysdeps/linux/powerpc/bits/syscalls.h
+++ b/libc/sysdeps/linux/powerpc/bits/syscalls.h
@@ -196,47 +196,48 @@
# undef INTERNAL_SYSCALL_ERRNO
# define INTERNAL_SYSCALL_ERRNO(val, err) (val)
+extern void __illegally_sized_syscall_arg1 (void);
+extern void __illegally_sized_syscall_arg2 (void);
+extern void __illegally_sized_syscall_arg3 (void);
+extern void __illegally_sized_syscall_arg4 (void);
+extern void __illegally_sized_syscall_arg5 (void);
+extern void __illegally_sized_syscall_arg6 (void);
+
# define LOADARGS_0(name, dummy) \
r0 = name
# define LOADARGS_1(name, __arg1) \
long int arg1 = (long int) (__arg1); \
LOADARGS_0(name, 0); \
- extern void __illegally_sized_syscall_arg1 (void); \
if (__builtin_classify_type (__arg1) != 5 && sizeof (__arg1) > 4) \
__illegally_sized_syscall_arg1 (); \
r3 = arg1
# define LOADARGS_2(name, __arg1, __arg2) \
long int arg2 = (long int) (__arg2); \
LOADARGS_1(name, __arg1); \
- extern void __illegally_sized_syscall_arg2 (void); \
if (__builtin_classify_type (__arg2) != 5 && sizeof (__arg2) > 4) \
__illegally_sized_syscall_arg2 (); \
r4 = arg2
# define LOADARGS_3(name, __arg1, __arg2, __arg3) \
long int arg3 = (long int) (__arg3); \
LOADARGS_2(name, __arg1, __arg2); \
- extern void __illegally_sized_syscall_arg3 (void); \
if (__builtin_classify_type (__arg3) != 5 && sizeof (__arg3) > 4) \
__illegally_sized_syscall_arg3 (); \
r5 = arg3
# define LOADARGS_4(name, __arg1, __arg2, __arg3, __arg4) \
long int arg4 = (long int) (__arg4); \
LOADARGS_3(name, __arg1, __arg2, __arg3); \
- extern void __illegally_sized_syscall_arg4 (void); \
if (__builtin_classify_type (__arg4) != 5 && sizeof (__arg4) > 4) \
__illegally_sized_syscall_arg4 (); \
r6 = arg4
# define LOADARGS_5(name, __arg1, __arg2, __arg3, __arg4, __arg5) \
long int arg5 = (long int) (__arg5); \
LOADARGS_4(name, __arg1, __arg2, __arg3, __arg4); \
- extern void __illegally_sized_syscall_arg5 (void); \
if (__builtin_classify_type (__arg5) != 5 && sizeof (__arg5) > 4) \
__illegally_sized_syscall_arg5 (); \
r7 = arg5
# define LOADARGS_6(name, __arg1, __arg2, __arg3, __arg4, __arg5, __arg6) \
long int arg6 = (long int) (__arg6); \
LOADARGS_5(name, __arg1, __arg2, __arg3, __arg4, __arg5); \
- extern void __illegally_sized_syscall_arg6 (void); \
if (__builtin_classify_type (__arg6) != 5 && sizeof (__arg6) > 4) \
__illegally_sized_syscall_arg6 (); \
r8 = arg6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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