scm-commits November 2007

scm-commits@lists.fedoraproject.org

1 participants
8975 discussions

rpms/pyflowtools/devel pyflowtools.spec,1.8,1.9
by fedora-extras-commits＠redhat.com 30 Nov '07

30 Nov '07

Author: stingray Update of /cvs/extras/rpms/pyflowtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21295/devel Modified Files: pyflowtools.spec Log Message: Fix urls Index: pyflowtools.spec =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/devel/pyflowtools.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pyflowtools.spec 29 Nov 2007 23:10:45 -0000 1.8 +++ pyflowtools.spec 30 Nov 2007 23:45:31 -0000 1.9 @@ -4,11 +4,11 @@ Name: pyflowtools Version: 0.3.2 Release: 1%{?dist} -Source0: http://www.net.informatik.tu-muenchen.de/pers/robin/flowtools/%{name}-%{ver… +Source0: http://pyflowtools.googlecode.com/files/%{name}-%{version}.tar.gz License: GPL Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -URL: http://www.net.informatik.tu-muenchen.de/pers/robin/flowtools/ +URL: http://pyflowtools.googlecode.com/ Requires: python BuildRequires: python-devel zlib-devel flow-tools-devel

1 0

rpms/pyflowtools/F-8 pyflowtools.spec,1.8,1.9
by fedora-extras-commits＠redhat.com 30 Nov '07

30 Nov '07

Author: stingray Update of /cvs/extras/rpms/pyflowtools/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21295/F-8 Modified Files: pyflowtools.spec Log Message: Fix urls Index: pyflowtools.spec =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-8/pyflowtools.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pyflowtools.spec 30 Nov 2007 23:29:30 -0000 1.8 +++ pyflowtools.spec 30 Nov 2007 23:45:28 -0000 1.9 @@ -4,11 +4,11 @@ Name: pyflowtools Version: 0.3.2 Release: 1%{?dist} -Source0: http://www.net.informatik.tu-muenchen.de/pers/robin/flowtools/%{name}-%{ver… +Source0: http://pyflowtools.googlecode.com/files/%{name}-%{version}.tar.gz License: GPL Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -URL: http://www.net.informatik.tu-muenchen.de/pers/robin/flowtools/ +URL: http://pyflowtools.googlecode.com/ Requires: python BuildRequires: python-devel zlib-devel flow-tools-devel

1 0

rpms/pyflowtools/F-7 pyflowtools.spec,1.7,1.8
by fedora-extras-commits＠redhat.com 30 Nov '07

30 Nov '07

Author: stingray Update of /cvs/extras/rpms/pyflowtools/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21295/F-7 Modified Files: pyflowtools.spec Log Message: Fix urls Index: pyflowtools.spec =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-7/pyflowtools.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pyflowtools.spec 30 Nov 2007 23:29:25 -0000 1.7 +++ pyflowtools.spec 30 Nov 2007 23:45:22 -0000 1.8 @@ -4,11 +4,11 @@ Name: pyflowtools Version: 0.3.2 Release: 1%{?dist} -Source0: http://www.net.informatik.tu-muenchen.de/pers/robin/flowtools/%{name}-%{ver… +Source0: http://pyflowtools.googlecode.com/files/%{name}-%{version}.tar.gz License: GPL Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -URL: http://www.net.informatik.tu-muenchen.de/pers/robin/flowtools/ +URL: http://pyflowtools.googlecode.com/ Requires: python BuildRequires: python-devel zlib-devel flow-tools-devel

1 0

rpms/SIBsim4/EL-4 .cvsignore, 1.8, 1.9 SIBsim4.spec, 1.9, 1.10 sources, 1.8, 1.9
by fedora-extras-commits＠redhat.com 30 Nov '07

30 Nov '07

Author: c4chris Update of /cvs/extras/rpms/SIBsim4/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20789 Modified Files: .cvsignore SIBsim4.spec sources Log Message: Version 0.16. Fix License tag to GPLv2+. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/EL-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 24 Apr 2007 12:28:01 -0000 1.8 +++ .cvsignore 30 Nov 2007 23:31:14 -0000 1.9 @@ -1 +1 @@ -SIBsim4-0.15.tar.gz +SIBsim4-0.16.tar.gz Index: SIBsim4.spec =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/EL-4/SIBsim4.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- SIBsim4.spec 24 Apr 2007 12:28:01 -0000 1.9 +++ SIBsim4.spec 30 Nov 2007 23:31:14 -0000 1.10 @@ -1,9 +1,9 @@ Name: SIBsim4 -Version: 0.15 +Version: 0.16 Release: 1%{?dist} Summary: Align expressed RNA sequences on a DNA template Group: Applications/Engineering -License: GPL +License: GPLv2+ URL: http://sibsim4.sourceforge.net Source0: http://downloads.sourceforge.net/sibsim4/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,6 +43,10 @@ %changelog +* Fri Nov 30 2007 Christian Iseli <Christian.Iseli(a)licr.org> 0.16-1 +- Version 0.16. +- Fix License tag to GPLv2+. + * Tue Apr 24 2007 Christian Iseli <Christian.Iseli(a)licr.org> 0.15-1 - Version 0.15. - Set Source0 according to Packaging/SourceURL Index: sources =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/EL-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 24 Apr 2007 12:28:01 -0000 1.8 +++ sources 30 Nov 2007 23:31:14 -0000 1.9 @@ -1 +1 @@ -4cef55d0a357c047989e003872d5e142 SIBsim4-0.15.tar.gz +dfaf87d5554d7a36787d98f1648821d7 SIBsim4-0.16.tar.gz

1 0

rpms/pyflowtools/F-8 .cvsignore, 1.2, 1.3 pyflowtools.spec, 1.7, 1.8 sources, 1.2, 1.3 pyflowtools-0.3.1.patch, 1.1, NONE
by fedora-extras-commits＠redhat.com 30 Nov '07

30 Nov '07

Author: stingray Update of /cvs/extras/rpms/pyflowtools/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20655/F-8 Modified Files: .cvsignore pyflowtools.spec sources Removed Files: pyflowtools-0.3.1.patch Log Message: pyflowtools-0.3.2-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Oct 2005 20:33:58 -0000 1.2 +++ .cvsignore 30 Nov 2007 23:29:30 -0000 1.3 @@ -1 +1 @@ -pyflowtools-0.3.tar.gz +pyflowtools-0.3.2.tar.gz Index: pyflowtools.spec =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-8/pyflowtools.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pyflowtools.spec 21 May 2007 22:58:22 -0000 1.7 +++ pyflowtools.spec 30 Nov 2007 23:29:30 -0000 1.8 @@ -2,10 +2,9 @@ Summary: An interface to OSU FlowTools Name: pyflowtools -Version: 0.3 -Release: 9%{?dist} +Version: 0.3.2 +Release: 1%{?dist} Source0: http://www.net.informatik.tu-muenchen.de/pers/robin/flowtools/%{name}-%{ver… -Patch0: pyflowtools-0.3.1.patch License: GPL Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,7 +20,6 @@ %prep %setup -q -%patch0 -p1 %build export libdirname=%{_lib} @@ -40,6 +38,9 @@ %{python_sitelib}/* %changelog +* Thu Nov 29 2007 Paul P. Komkoff Jr <i(a)stingr.net> - 0.3.2-1 +- new upstream version + * Tue May 22 2007 Paul P. Komkoff Jr <i(a)stingr.net> - 0.3-9 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Oct 2005 20:33:58 -0000 1.2 +++ sources 30 Nov 2007 23:29:30 -0000 1.3 @@ -1 +1 @@ -a9268d59812aeb5f34c1d41a6535ef95 pyflowtools-0.3.tar.gz +8c30e84d2bfacc619a4f80410491f05b pyflowtools-0.3.2.tar.gz --- pyflowtools-0.3.1.patch DELETED ---

1 0

rpms/pyflowtools/F-7 .cvsignore, 1.2, 1.3 pyflowtools.spec, 1.6, 1.7 sources, 1.2, 1.3 pyflowtools-0.3.1.patch, 1.1, NONE
by fedora-extras-commits＠redhat.com 30 Nov '07

30 Nov '07

Author: stingray Update of /cvs/extras/rpms/pyflowtools/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20655/F-7 Modified Files: .cvsignore pyflowtools.spec sources Removed Files: pyflowtools-0.3.1.patch Log Message: pyflowtools-0.3.2-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-7/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Oct 2005 20:33:58 -0000 1.2 +++ .cvsignore 30 Nov 2007 23:29:25 -0000 1.3 @@ -1 +1 @@ -pyflowtools-0.3.tar.gz +pyflowtools-0.3.2.tar.gz Index: pyflowtools.spec =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-7/pyflowtools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pyflowtools.spec 17 Dec 2006 07:32:29 -0000 1.6 +++ pyflowtools.spec 30 Nov 2007 23:29:25 -0000 1.7 @@ -2,10 +2,9 @@ Summary: An interface to OSU FlowTools Name: pyflowtools -Version: 0.3 -Release: 8%{?dist} +Version: 0.3.2 +Release: 1%{?dist} Source0: http://www.net.informatik.tu-muenchen.de/pers/robin/flowtools/%{name}-%{ver… -Patch0: pyflowtools-0.3.1.patch License: GPL Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,7 +20,6 @@ %prep %setup -q -%patch0 -p1 %build export libdirname=%{_lib} @@ -40,6 +38,12 @@ %{python_sitelib}/* %changelog +* Thu Nov 29 2007 Paul P. Komkoff Jr <i(a)stingr.net> - 0.3.2-1 +- new upstream version + +* Tue May 22 2007 Paul P. Komkoff Jr <i(a)stingr.net> - 0.3-9 +- rebuild + * Sun Dec 17 2006 Paul P. Komkoff Jr <i(a)stingr.net> - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Oct 2005 20:33:58 -0000 1.2 +++ sources 30 Nov 2007 23:29:25 -0000 1.3 @@ -1 +1 @@ -a9268d59812aeb5f34c1d41a6535ef95 pyflowtools-0.3.tar.gz +8c30e84d2bfacc619a4f80410491f05b pyflowtools-0.3.2.tar.gz --- pyflowtools-0.3.1.patch DELETED ---

1 0

rpms/wesnoth/devel wesnoth-1.2.8-remove-ogg-test.patch, NONE, 1.1 wesnoth.spec, 1.44, 1.45
by fedora-extras-commits＠redhat.com 30 Nov '07

30 Nov '07

Author: bpepple Update of /cvs/pkgs/rpms/wesnoth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19672 Modified Files: wesnoth.spec Added Files: wesnoth-1.2.8-remove-ogg-test.patch Log Message: * Fri Nov 30 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 1.2.8-2 - Add patch to drop ogg test from configure script, until better workaround. - Enable python support. wesnoth-1.2.8-remove-ogg-test.patch: --- NEW FILE wesnoth-1.2.8-remove-ogg-test.patch --- diff -ur wesnoth-1.2.8.OLD/configure.ac wesnoth-1.2.8/configure.ac --- wesnoth-1.2.8.OLD/configure.ac 2007-11-25 06:37:12.000000000 -0500 +++ wesnoth-1.2.8/configure.ac 2007-11-30 14:21:07.000000000 -0500 @@ -798,23 +798,6 @@ LIBS="$LIBS $SDL_LIBS $SDL_MIXER_LIBS" ac_link="$LDPREFIX $ac_link" - AC_RUN_IFELSE([AC_LANG_SOURCE([ - #include <SDL_mixer.h> - #include <stdlib.h> - - int main(int argc, char **argv) - { - Mix_Music* music = Mix_LoadMUS("music/main_menu.ogg"); - if (music == NULL) - exit(1); - exit(0); - } - ])], - [AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)] - [AC_MSG_ERROR([*** SDL_mixer has no OGG support! You need SDL_mixer with OGG support])], - [AC_MSG_RESULT([not tested in cross-compiling])]) - CPPFLAGS=$OLD_CPPFLAGS CFLAGS=$OLD_CFLAGS Index: wesnoth.spec =================================================================== RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- wesnoth.spec 29 Nov 2007 20:05:10 -0000 1.44 +++ wesnoth.spec 30 Nov 2007 23:15:10 -0000 1.45 @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.2.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme Group: Amusements/Games @@ -9,6 +9,7 @@ Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 Source1: wesnothd.init Source2: %{name}.sysconfig +Patch0: %{name}-%{version}-remove-ogg-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel @@ -17,8 +18,12 @@ BuildRequires: freetype-devel BuildRequires: libpng-devel BuildRequires: fribidi-devel +BuildRequires: python-devel BuildRequires: desktop-file-utils BuildRequires: gettext +# Drop these when ogg test patch is removed. +BuildRequires: autoconf +BuildRequires: automake %description @@ -65,6 +70,8 @@ %prep %setup -q +%patch0 -p1 -b .ogg +autoreconf chmod -x MANUAL* @@ -74,9 +81,9 @@ --enable-editor \ --enable-tools \ --enable-server \ + --enable-python \ --with-fifodir=/var/run/wesnothd \ --with-server-uid=$(id -u) \ - --with-server-gid=$(id -g) make %{?_smp_mflags} @@ -160,6 +167,10 @@ %ghost /var/run/wesnothd/socket %changelog +* Fri Nov 30 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 1.2.8-2 +- Add patch to drop ogg test from configure script, until better workaround. +- Enable python support. + * Thu Nov 29 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 1.2.8-1 - Update to 1.2.8.

1 0

rpms/libcmpiutil/devel libcmpiutil.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by fedora-extras-commits＠redhat.com 30 Nov '07

30 Nov '07

Author: danms Update of /cvs/pkgs/rpms/libcmpiutil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12161/devel Modified Files: .cvsignore sources Added Files: libcmpiutil.spec Log Message: First actual Fedora release of libcmpiutil --- NEW FILE libcmpiutil.spec --- # -*- rpm-spec -*- Summary: CMPI Utility Library Name: libcmpiutil Version: 0.1 Release: 6%{?dist}%{?extra_release} License: LGPLv2+ Group: System Environment/Libraries Source: ftp://libvirt.org/libvirt-cim/libcmpiutil-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/CIM/ BuildRequires: tog-pegasus-devel BuildRequires: flex BuildRequires: bison BuildConflicts: sblim-cmpi-devel %description Libcmpiutil is a library of utility functions for CMPI providers. The goal is to reduce the amount of repetitive work done in most CMPI providers by encapsulating common procedures with more "normal" APIs. This extends from operations like getting typed instance properties to standardizing method dispatch and argument checking. %package devel Summary: Libraries, includes, etc. to use the CMPI utility library Group: Development/Libraries Requires: tog-pegasus-devel Requires: pkgconfig Requires: %{name} = %{version}-%{release} %description devel Includes and documentations for the CMPI utility library The goal is to reduce the amount of repetitive work done in most CMPI providers by encapsulating common procedures with more "normal" APIs. This extends from operations like getting typed instance properties to standardizing method dispatch and argument checking. %prep %setup -q chmod -x *.c *.y *.h *.l %build %configure --enable-static=no make %{?_smp_mflags} %install rm -fr $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %clean rm -fr $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-, root, root, -) %doc doc/doxygen.conf doc/mainpage README COPYING %{_libdir}/lib*.so.* %files devel %defattr(-, root, root, -) %{_libdir}/lib*.so %dir %{_includedir}/libcmpiutil %{_includedir}/libcmpiutil/*.h %{_libdir}/pkgconfig/libcmpiutil.pc %doc doc/SubmittingPatches %changelog * Fri Nov 30 2007 Dan Smith <danms(a)us.ibm.com> - 0.1-6 - Updated to offical 0.1 source release - Added Source0 URL * Fri Oct 26 2007 Daniel Veillard <veillard(a)redhat.com> - 0.1-1 - created Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libcmpiutil/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Nov 2007 19:23:23 -0000 1.1 +++ .cvsignore 30 Nov 2007 22:52:09 -0000 1.2 @@ -0,0 +1 @@ +libcmpiutil-0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libcmpiutil/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Nov 2007 19:23:23 -0000 1.1 +++ sources 30 Nov 2007 22:52:09 -0000 1.2 @@ -0,0 +1 @@ +5689b47e17a4e00308914f00b10e354c libcmpiutil-0.1.tar.gz

1 0

rpms/pirut/devel .cvsignore, 1.78, 1.79 pirut.spec, 1.82, 1.83 sources, 1.81, 1.82
by fedora-extras-commits＠redhat.com 30 Nov '07

30 Nov '07

Author: katzj Update of /cvs/pkgs/rpms/pirut/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11858 Modified Files: .cvsignore pirut.spec sources Log Message: * Fri Nov 30 2007 Jeremy Katz <katzj(a)redhat.com> - 1.3.28-1 - Warn users on edit/removal of repos that come from packages (#404921) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pirut/devel/.cvsignore,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- .cvsignore 26 Nov 2007 19:02:09 -0000 1.78 +++ .cvsignore 30 Nov 2007 22:43:00 -0000 1.79 @@ -1 +1 @@ -pirut-1.3.27.tar.gz +pirut-1.3.28.tar.gz Index: pirut.spec =================================================================== RCS file: /cvs/pkgs/rpms/pirut/devel/pirut.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- pirut.spec 26 Nov 2007 19:02:09 -0000 1.82 +++ pirut.spec 30 Nov 2007 22:43:00 -0000 1.83 @@ -2,7 +2,7 @@ Summary: Package Installation, Removal and Update Tools Name: pirut -Version: 1.3.27 +Version: 1.3.28 Release: 1%{?dist} License: GPL Group: Applications/System @@ -76,6 +76,9 @@ %{_mandir}/man8/system-install-packages.8* %changelog +* Fri Nov 30 2007 Jeremy Katz <katzj(a)redhat.com> - 1.3.28-1 +- Warn users on edit/removal of repos that come from packages (#404921) + * Mon Nov 26 2007 Jeremy Katz <katzj(a)redhat.com> - 1.3.27-1 - Avoid a case where we could install with broken deps (#397161) - Don't focus reboot by default (#395061) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pirut/devel/sources,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- sources 26 Nov 2007 19:02:09 -0000 1.81 +++ sources 30 Nov 2007 22:43:00 -0000 1.82 @@ -1 +1 @@ -f6c370647d52bb9621abf07ef2123e16 pirut-1.3.27.tar.gz +f8c8061467c653597ddd0cef49bc0774 pirut-1.3.28.tar.gz

1 0

rpms/kernel/F-7 linux-2.6-netdev-e1000-disable-alpm.patch, NONE, 1.1 kernel-2.6.spec, 1.3392, 1.3393
by fedora-extras-commits＠redhat.com 30 Nov '07

30 Nov '07

Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11506 Modified Files: kernel-2.6.spec Added Files: linux-2.6-netdev-e1000-disable-alpm.patch Log Message: * Fri Nov 30 2007 Chuck Ebbert <cebbert(a)redhat.com> - Disable e1000 link power management linux-2.6-netdev-e1000-disable-alpm.patch: --- NEW FILE linux-2.6-netdev-e1000-disable-alpm.patch --- Port of f2fa3114919fa195f800a04a5e57156c0f67fff4 (from the netdev tree) from e1000e to e1000. Should fix the checksum problems too. bz #400561 --- drivers/net/e1000/e1000_main.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) --- linux-2.6.23.noarch.orig/drivers/net/e1000/e1000_main.c +++ linux-2.6.23.noarch/drivers/net/e1000/e1000_main.c @@ -846,6 +846,33 @@ e1000_reset(struct e1000_adapter *adapte e1000_release_manageability(adapter); } +static void e1000e_disable_l1aspm(struct pci_dev *pdev) +{ + int pos; + u32 cap; + u16 val; + + /* + * 82573 workaround - disable L1 ASPM on mobile chipsets + * + * L1 ASPM on various mobile (ich7) chipsets do not behave properly + * resulting in lost data or garbage information on the pci-e link + * level. This could result in (false) bad EEPROM checksum errors, + * long ping times (up to 2s) or even a system freeze/hang. + * + * Unfortunately this feature saves about 1W power consumption when + * active. + */ + pos = pci_find_capability(pdev, PCI_CAP_ID_EXP); + pci_read_config_dword(pdev, pos + PCI_EXP_LNKCAP, &cap); + pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, &val); + if (val & 0x2) { + dev_warn(&pdev->dev, "Disabling L1 ASPM\n"); + val &= ~0x2; + pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, val); + } +} + /** * e1000_probe - Device Initialization Routine * @pdev: PCI device information struct @@ -872,6 +899,8 @@ e1000_probe(struct pci_dev *pdev, int i, err, pci_using_dac; uint16_t eeprom_data = 0; uint16_t eeprom_apme_mask = E1000_EEPROM_APME; + + e1000e_disable_l1aspm(pdev); if ((err = pci_enable_device(pdev))) return err; @@ -5180,6 +5209,7 @@ e1000_resume(struct pci_dev *pdev) pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); + e1000e_disable_l1aspm(pdev); if ((err = pci_enable_device(pdev))) { printk(KERN_ERR "e1000: Cannot enable PCI device from suspend\n"); return err; @@ -5276,6 +5306,7 @@ static pci_ers_result_t e1000_io_slot_re struct net_device *netdev = pci_get_drvdata(pdev); struct e1000_adapter *adapter = netdev->priv; + e1000e_disable_l1aspm(pdev); if (pci_enable_device(pdev)) { printk(KERN_ERR "e1000: Cannot re-enable PCI device after reset.\n"); return PCI_ERS_RESULT_DISCONNECT; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v retrieving revision 1.3392 retrieving revision 1.3393 diff -u -r1.3392 -r1.3393 --- kernel-2.6.spec 29 Nov 2007 00:17:36 -0000 1.3392 +++ kernel-2.6.spec 30 Nov 2007 22:39:17 -0000 1.3393 @@ -616,6 +616,7 @@ Patch717: linux-2.6-netdev-e1000e-08.patch Patch718: linux-2.6-netdev-e1000e-09.patch Patch719: linux-2.6-netdev-e1000e-10.patch +Patch721: linux-2.6-netdev-e1000-disable-alpm.patch Patch730: linux-2.6-net-e100-disable-polling.patch Patch740: linux-2.6-snd-ad1988-fix-spdif-output.patch @@ -1308,6 +1309,8 @@ ApplyPatch linux-2.6-netdev-e1000e-08.patch ApplyPatch linux-2.6-netdev-e1000e-09.patch ApplyPatch linux-2.6-netdev-e1000e-10.patch +# disable link power savings, should fix bad eeprom checksum too +ApplyPatch linux-2.6-netdev-e1000-disable-alpm.patch # fix e100 crash on init ApplyPatch linux-2.6-net-e100-disable-polling.patch @@ -2268,6 +2271,9 @@ %endif %changelog +* Fri Nov 30 2007 Chuck Ebbert <cebbert(a)redhat.com> +- Disable e1000 link power management + * Wed Nov 28 2007 Chuck Ebbert <cebbert(a)redhat.com> - Fix further bugs in init of Huawei USB modem - Fix libata handling of IO ready test

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits November 2007