October 2008 - openSUSE Commits - openSUSE Mailing Lists

commit mstflint
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package mstflint checked in at Tue Oct 28 00:25:43 CET 2008. -------- --- mstflint/mstflint.changes 2008-09-12 08:37:31.000000000 +0200 +++ /d/STABLE/mstflint/mstflint.changes 2008-10-27 23:07:16.735276000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 27 23:07:12 CET 2008 - ro(a)suse.de + +- fix build + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mstflint-includefix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mstflint.spec ++++++ --- /var/tmp/diff_new_pack.N21051/_old 2008-10-28 00:25:07.000000000 +0100 +++ /var/tmp/diff_new_pack.N21051/_new 2008-10-28 00:25:07.000000000 +0100 @@ -21,10 +21,11 @@ Name: mstflint Summary: Burning Firmware Application Version: 1.3 -Release: 1 +Release: 3 License: BSD 3-Clause; GPL v2 or later Group: System/Console Source0: %{name}-%{version}.tar.bz2 +Patch: mstflint-includefix.patch Url: http://www.openfabrics.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ zlib-devel @@ -37,6 +38,7 @@ %prep %setup -q +%patch %build %{configure} @@ -60,6 +62,8 @@ %_includedir/* %changelog +* Tue Oct 28 2008 ro(a)suse.de +- fix build * Fri Sep 12 2008 jjolly(a)suse.de - Updated to v1.3 from OFED 1.4 RC1 * Tue Aug 07 2007 hvogel(a)suse.de ++++++ mstflint-includefix.patch ++++++ --- mstdump.c +++ mstdump.c @@ -36,12 +36,12 @@ * */ +#include "mtcr.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <errno.h> -#include <mtcr.h> static unsigned tavor_address_list[]= { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libjingle
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package libjingle checked in at Tue Oct 28 00:24:50 CET 2008. -------- --- libjingle/libjingle.changes 2008-10-22 19:34:10.000000000 +0200 +++ /d/STABLE/libjingle/libjingle.changes 2008-10-27 18:25:26.000000000 +0100 @@ -2 +2 @@ -Wed Oct 22 12:33:49 CDT 2008 - maw(a)suse.de +Mon Oct 27 11:23:59 CST 2008 - maw(a)suse.de @@ -7,13 +6,0 @@ -Fri Sep 12 17:20:25 CDT 2008 - maw(a)suse.de - -- Update to version 0.4.0: - + File transfer support - + Protocol updates - + Proxy detection - + Relay server support - + Many other assorted changes -- Drop libjingle-0.3.11-gcc43.patch and - libjingle-0.3.11-return.patch -- Add libjingle-proper-c++.patch. - -------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libjingle-0.4.0.tar.bz2 libjingle-proper-c++.patch New: ---- libjingle-0.3.11-gcc43.patch libjingle-0.3.11-return.patch libjingle-0.3.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjingle.spec ++++++ --- /var/tmp/diff_new_pack.e18991/_old 2008-10-28 00:23:30.000000000 +0100 +++ /var/tmp/diff_new_pack.e18991/_new 2008-10-28 00:23:30.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libjingle (Version 0.4.0) +# spec file for package libjingle (Version 0.3.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,22 +22,18 @@ # Original project http://code.google.com/apis/talk/libjingle/index.html # does not have shared library any more. Url: http://sourceforge.net/projects/tapioca-voip/ -BuildRequires: gcc-c++ -BuildRequires: glib2-devel -BuildRequires: gtk2-devel -BuildRequires: libexpat-devel -BuildRequires: linphone-devel -BuildRequires: openssl-devel -BuildRequires: pkg-config -Version: 0.4.0 -Release: 1 +BuildRequires: gcc-c++ glib2-devel libexpat-devel linphone-devel openssl-devel pkg-config +Version: 0.3.11 +Release: 6 License: GPL v2 only BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libjingle-0_3-0 = %{version}-%{release} Group: Productivity/Networking/Other Summary: Library for Peer-to-Peer Applications Source: %{name}-%{version}.tar.bz2 -Patch0: libjingle-proper-c++.patch +# http://sourceforge.net/tracker/index.php?func=detail&aid=1879592&group_id=1… +Patch: libjingle-0.3.11-gcc43.patch +Patch1: libjingle-0.3.11-return.patch %description Libjingle is a collection of open-source C++ code and sample @@ -82,7 +78,8 @@ %prep %setup -q -%patch0 -p1 +%patch +%patch1 tr -d '\r' <README >README.unix ; touch -r README README.unix ; mv README.unix README %build @@ -118,18 +115,8 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Wed Oct 22 2008 maw(a)suse.de +* Mon Oct 27 2008 maw(a)suse.de - Make debug packages require a specific %%{version}-%%{release}. -* Fri Sep 12 2008 maw(a)suse.de -- Update to version 0.4.0: - + File transfer support - + Protocol updates - + Proxy detection - + Relay server support - + Many other assorted changes -- Drop libjingle-0.3.11-gcc43.patch and - libjingle-0.3.11-return.patch -- Add libjingle-proper-c++.patch. * Fri Aug 01 2008 ro(a)suse.de - fix requires for debuginfo package * Mon May 05 2008 coolo(a)suse.de ++++++ libjingle-0.3.11-gcc43.patch ++++++ --- talk/base/asynctcpsocket.cc +++ talk/base/asynctcpsocket.cc @@ -32,12 +32,11 @@ #include "talk/base/byteorder.h" #include "talk/base/common.h" #include "talk/base/logging.h" +#include <string.h> -#if defined(_MSC_VER) && _MSC_VER < 1300 namespace std { using ::strerror; } -#endif #ifdef POSIX extern "C" { --- talk/base/bytebuffer.cc +++ talk/base/bytebuffer.cc @@ -30,6 +30,7 @@ #include "talk/base/byteorder.h" #include <algorithm> #include <cassert> +#include <string.h> #if defined(_MSC_VER) && _MSC_VER < 1300 namespace std { --- talk/base/host.cc +++ talk/base/host.cc @@ -33,6 +33,7 @@ #include <iostream> #include <cassert> #include <errno.h> +#include <cstdlib> #if defined(_MSC_VER) && _MSC_VER < 1300 namespace std { --- talk/base/logging.cc +++ talk/base/logging.cc @@ -33,6 +33,7 @@ #include <iostream> #include <iomanip> +#include <string.h> #include "talk/base/logging.h" #include "talk/base/stream.h" --- talk/base/messagequeue.h +++ talk/base/messagequeue.h @@ -35,6 +35,7 @@ #include <vector> #include <queue> #include <algorithm> +#include <string.h> namespace cricket { --- talk/base/physicalsocketserver.cc +++ talk/base/physicalsocketserver.cc @@ -30,6 +30,8 @@ #endif #include <cassert> +#include <string.h> +#include <algorithm> #ifdef POSIX extern "C" { --- talk/base/protocolinfo.cc +++ talk/base/protocolinfo.cc @@ -27,6 +27,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <string.h> #include "talk/base/protocolinfo.h" namespace cricket { --- talk/base/socketadapters.cc +++ talk/base/socketadapters.cc @@ -134,7 +134,7 @@ int len = socket_->Recv(buffer_ + data_len_, buffer_size_ - data_len_); if (len < 0) { // TODO: Do something better like forwarding the error to the user. - LOG(INFO) << "Recv: " << errno << " " << std::strerror(errno); + LOG(INFO) << "Recv: " << errno << " " << strerror(errno); return; } --- talk/base/stream.cc +++ talk/base/stream.cc @@ -29,6 +29,7 @@ #include <sys/stat.h> #include <errno.h> #include <string> +#include <string.h> #include "talk/base/basictypes.h" #include "talk/base/common.h" #include "talk/base/stream.h" --- talk/base/stringutils.h +++ talk/base/stringutils.h @@ -36,6 +36,7 @@ #endif // WIN32 #include <string> +#include <string.h> /////////////////////////////////////////////////////////////////////////////// // Rename a bunch of common string functions so they are consistent across --- talk/base/xmpppassword.h +++ talk/base/xmpppassword.h @@ -30,6 +30,7 @@ #include "talk/base/linked_ptr.h" #include "talk/base/scoped_ptr.h" +#include <string.h> namespace buzz { --- talk/p2p/base/port.cc +++ talk/p2p/base/port.cc @@ -265,7 +265,7 @@ if (stun_msg->type() == STUN_BINDING_REQUEST) { if ((remote_frag_len < 0) - || (std::memcmp(username_attr->bytes(), + || (::memcmp(username_attr->bytes(), username_frag_.c_str(), username_frag_.size()) != 0)) { LOG(LERROR) << "Received STUN request with bad username"; SendBindingErrorResponse(stun_msg.get(), addr, STUN_ERROR_BAD_REQUEST, @@ -278,7 +278,7 @@ } else if ((stun_msg->type() == STUN_BINDING_RESPONSE) || (stun_msg->type() == STUN_BINDING_ERROR_RESPONSE)) { if ((remote_frag_len < 0) - || (std::memcmp(username_attr->bytes() + remote_frag_len, + || (::memcmp(username_attr->bytes() + remote_frag_len, username_frag_.c_str(), username_frag_.size()) != 0)) { LOG(LERROR) << "Received STUN response with bad username"; // Do not send error response to a response @@ -723,7 +723,7 @@ if (valid) { std::string username_fragment = port_->username_fragment(); int offset = (int)(username_attr->length() - username_fragment.size()); - if (std::memcmp(username_attr->bytes() + offset, + if (::memcmp(username_attr->bytes() + offset, username_fragment.c_str(), username_fragment.size()) != 0) { LOG(LERROR) << "Received STUN response with bad username"; valid = false; --- talk/p2p/base/pseudotcp.cc +++ talk/p2p/base/pseudotcp.cc @@ -33,6 +33,8 @@ #include "talk/base/socket.h" #include "talk/base/time.h" #include "talk/p2p/base/pseudotcp.h" +#include <string.h> +#include <stdlib.h> #define _DBG_NONE 0 #define _DBG_NORMAL 1 --- talk/p2p/base/relayport.cc +++ talk/p2p/base/relayport.cc @@ -37,6 +37,7 @@ #ifdef OSX #include <errno.h> #endif +#include <string.h> #if defined(_MSC_VER) && _MSC_VER < 1300 namespace std { @@ -212,7 +213,7 @@ if (size < 24 + magic_cookie_.size()) { return false; } else { - return 0 == std::memcmp(data + 24, + return 0 == ::memcmp(data + 24, magic_cookie_.c_str(), magic_cookie_.size()); } @@ -375,7 +376,7 @@ socket_->SignalReadPacket.connect(this, &RelayEntry::OnReadPacket); if (socket_->Bind(local_addr_) < 0) - LOG(INFO) << "bind: " << std::strerror(socket_->GetError()); + LOG(INFO) << "bind: " << ::strerror(socket_->GetError()); for (unsigned i = 0; i < port_->options().size(); ++i) socket_->SetOption(port_->options()[i].first, port_->options()[i].second); @@ -568,7 +569,7 @@ } int sent = socket_->SendTo(data, size, ra->address); if (sent <= 0) { - LOG(LS_VERBOSE) << "sendto: " << std::strerror(socket_->GetError()); + LOG(LS_VERBOSE) << "sendto: " << ::strerror(socket_->GetError()); assert(sent < 0); } return sent; --- talk/p2p/base/relayserver_main.cc +++ talk/p2p/base/relayserver_main.cc @@ -30,6 +30,7 @@ #include "talk/base/host.h" #include "talk/base/thread.h" #include "talk/p2p/base/relayserver.h" +#include <string.h> #ifdef POSIX extern "C" { @@ -53,13 +54,13 @@ AsyncUDPSocket* int_socket = CreateAsyncUDPSocket(pthMain->socketserver()); if (int_socket->Bind(int_addr) < 0) { - std::cerr << "bind: " << std::strerror(errno) << std::endl; + std::cerr << "bind: " << ::strerror(errno) << std::endl; return 1; } AsyncUDPSocket* ext_socket = CreateAsyncUDPSocket(pthMain->socketserver()); if (ext_socket->Bind(ext_addr) < 0) { - std::cerr << "bind: " << std::strerror(errno) << std::endl; + std::cerr << "bind: " << ::strerror(errno) << std::endl; return 1; } --- talk/p2p/base/stun.cc +++ talk/p2p/base/stun.cc @@ -29,6 +29,7 @@ #include "talk/p2p/base/stun.h" #include <iostream> #include <cassert> +#include <string.h> #if defined(_MSC_VER) && _MSC_VER < 1300 namespace std { @@ -384,7 +385,7 @@ void StunByteStringAttribute::CopyBytes(const void* bytes, uint16 length) { char* new_bytes = new char[length]; - std::memcpy(new_bytes, bytes, length); + memcpy(new_bytes, bytes, length); SetBytes(new_bytes, length); } --- talk/p2p/base/stunserver.cc +++ talk/p2p/base/stunserver.cc @@ -28,6 +28,7 @@ #include "talk/base/bytebuffer.h" #include "talk/p2p/base/stunserver.h" #include <iostream> +#include <string.h> #ifdef POSIX extern "C" { @@ -154,7 +155,7 @@ // TODO: Allow response addr attribute if sent from another stun server. if (socket_->SendTo(buf.Data(), buf.Length(), addr) < 0) - std::cerr << "sendto: " << std::strerror(errno) << std::endl; + std::cerr << "sendto: " << ::strerror(errno) << std::endl; } } // namespace cricket --- talk/p2p/base/stunserver_main.cc +++ talk/p2p/base/stunserver_main.cc @@ -50,7 +50,7 @@ AsyncUDPSocket* server_socket = CreateAsyncUDPSocket(pthMain->socketserver()); if (server_socket->Bind(server_addr) < 0) { - std::cerr << "bind: " << std::strerror(errno) << std::endl; + std::cerr << "bind: " << ::strerror(errno) << std::endl; return 1; } --- talk/p2p/base/tcpport.cc +++ talk/p2p/base/tcpport.cc @@ -35,6 +35,7 @@ #endif // WIN32 #include <iostream> #include <cassert> +#include <string.h> #if defined(_MSC_VER) && _MSC_VER < 1300 namespace std { @@ -61,7 +62,7 @@ socket_ = thread->socketserver()->CreateAsyncSocket(SOCK_STREAM); socket_->SignalReadEvent.connect(this, &TCPPort::OnAcceptEvent); if (socket_->Bind(address) < 0) - LOG(INFO) << "bind: " << std::strerror(socket_->GetError()); + LOG(INFO) << "bind: " << ::strerror(socket_->GetError()); } TCPPort::~TCPPort() { @@ -111,7 +112,7 @@ #endif // WIN32 if (allow_listen) { if (socket_->Listen(5) < 0) - LOG(INFO) << "listen: " << std::strerror(socket_->GetError()); + LOG(INFO) << "listen: " << ::strerror(socket_->GetError()); } else { LOG(INFO) << "not listening due to firewall restrictions"; } @@ -157,7 +158,7 @@ AsyncSocket * newsocket = static_cast<AsyncSocket *>(socket->Accept(&incoming.addr)); if (!newsocket) { // TODO: Do something better like forwarding the error to the user. - LOG(INFO) << "accept: " << socket_->GetError() << " " << std::strerror(socket_->GetError()); + LOG(INFO) << "accept: " << socket_->GetError() << " " << ::strerror(socket_->GetError()); return; } incoming.socket = new AsyncTCPSocket(newsocket); --- talk/session/phone/voicechannel.cc +++ talk/session/phone/voicechannel.cc @@ -159,7 +159,7 @@ channel_->OnPacketReceived(data, (int)len); } -void VoiceChannel::SendPacket(const void *data, unsigned int len) { +void VoiceChannel::SendPacket(const void *data, size_t len) { // SendPacket gets called from MediaEngine; send to socket // MediaEngine will call us on a random thread. The Send operation on the socket is // special in that it can handle this. ++++++ libjingle-0.3.11-return.patch ++++++ --- talk/session/phone/linphonemediaengine.cc.orig 2008-05-05 21:51:35.000000000 +0200 +++ talk/session/phone/linphonemediaengine.cc 2008-05-05 21:52:48.000000000 +0200 @@ -48,6 +48,7 @@ void *thread_function(void *data) if (iface && (mc->mute()==FALSE)) iface->SendPacket(buf, len); } + return 0; } LinphoneMediaChannel::LinphoneMediaChannel() { @@ -119,8 +120,8 @@ void LinphoneMediaChannel::SetSend(bool mute_ = !send; } -float LinphoneMediaChannel::GetCurrentQuality() {} -int LinphoneMediaChannel::GetOutputLevel() {} +float LinphoneMediaChannel::GetCurrentQuality() { return 0; } +int LinphoneMediaChannel::GetOutputLevel() { return 0;} LinphoneMediaEngine::LinphoneMediaEngine() {} LinphoneMediaEngine::~LinphoneMediaEngine() {} @@ -158,8 +159,8 @@ MediaChannel *LinphoneMediaEngine::Creat return new LinphoneMediaChannel(); } -int LinphoneMediaEngine::SetAudioOptions(int options) {} -int LinphoneMediaEngine::SetSoundDevices(int wave_in_device, int wave_out_device) {} +int LinphoneMediaEngine::SetAudioOptions(int options) { return 0; } +int LinphoneMediaEngine::SetSoundDevices(int wave_in_device, int wave_out_device) { return 0; } -float LinphoneMediaEngine::GetCurrentQuality() {} -int LinphoneMediaEngine::GetInputLevel() {} +float LinphoneMediaEngine::GetCurrentQuality() { return 0; } +int LinphoneMediaEngine::GetInputLevel() { return 0; } ++++++ libjingle-0.4.0.tar.bz2 -> libjingle-0.3.11.tar.bz2 ++++++ ++++ 71864 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libehca-rdmav2
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package libehca-rdmav2 checked in at Tue Oct 28 00:23:12 CET 2008. -------- --- libehca-rdmav2/libehca-rdmav2.changes 2008-09-15 14:39:16.000000000 +0200 +++ /d/STABLE/libehca-rdmav2/libehca-rdmav2.changes 2008-10-27 22:57:48.763156000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 27 22:57:43 CET 2008 - ro(a)suse.de + +- add exclusivearch + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libehca-rdmav2.spec ++++++ --- /var/tmp/diff_new_pack.D17365/_old 2008-10-28 00:22:51.000000000 +0100 +++ /var/tmp/diff_new_pack.D17365/_new 2008-10-28 00:22:51.000000000 +0100 @@ -20,7 +20,7 @@ Name: libehca-rdmav2 Version: 1.2 -Release: 1 +Release: 2 Summary: Userspace driver for IBM InfiniBand HCAs (ehca) Group: System/Libraries License: BSD 3-Clause; GPL v2 or later @@ -28,6 +28,7 @@ Source: libehca-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libibverbs-devel +ExclusiveArch: ppc ppc64 %description libehca is a userspace driver for IBM InfiniBand HCAs (ehca). It works @@ -96,5 +97,7 @@ %{_libdir}/libehca.a %changelog +* Mon Oct 27 2008 ro(a)suse.de +- add exclusivearch * Mon Sep 15 2008 jjolly(a)suse.de - Initial packing using v1.2 from OFED 1.4 RC1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libcxgb3-rdmav2
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package libcxgb3-rdmav2 checked in at Tue Oct 28 00:22:42 CET 2008. -------- --- libcxgb3-rdmav2/libcxgb3-rdmav2.changes 2008-09-15 13:42:07.000000000 +0200 +++ /d/STABLE/libcxgb3-rdmav2/libcxgb3-rdmav2.changes 2008-10-27 23:38:53.502727000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 27 23:38:36 CET 2008 - jjolly(a)suse.de + +- Updated to version from OFED 1.4 rc3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcxgb3-rdmav2.spec ++++++ --- /var/tmp/diff_new_pack.s16047/_old 2008-10-28 00:21:43.000000000 +0100 +++ /var/tmp/diff_new_pack.s16047/_new 2008-10-28 00:21:43.000000000 +0100 @@ -21,7 +21,7 @@ Name: libcxgb3-rdmav2 Summary: Chelsio T3 RNIC OpenIB Userspace Library Version: 1.2.2 -Release: 1 +Release: 2 License: GPL v2 only Group: System/Libraries Source0: libcxgb3-%{version}.tar.bz2 @@ -77,6 +77,8 @@ %_libdir/libcxgb3.so %changelog +* Tue Oct 28 2008 jjolly(a)suse.de +- Updated to version from OFED 1.4 rc3 * Mon Sep 15 2008 jjolly(a)suse.de - Changed packages name to libcxgb3-rdmav2 to match the library name ++++++ libcxgb3-1.2.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libcxgb3-1.2.2/libcxgb3.spec new/libcxgb3-1.2.2/libcxgb3.spec --- old/libcxgb3-1.2.2/libcxgb3.spec 2008-09-08 13:53:17.000000000 +0200 +++ new/libcxgb3-1.2.2/libcxgb3.spec 2008-10-19 14:02:54.000000000 +0200 @@ -2,7 +2,7 @@ Name: libcxgb3 Version: 1.2.2 -Release: 1.ofed1.4.rc1 +Release: 1.ofed1.4.rc3 Summary: Chelsio T3 RNIC Open Fabrics Userspace Library Group: System Environment/Libraries ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

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

27 Oct '08

Hello community, here is the log from the commit of package kernel-source checked in at Tue Oct 28 00:21:20 CET 2008. -------- --- kernel-source/kernel-debug.changes 2008-10-24 17:43:49.000000000 +0200 +++ /d/STABLE/kernel-source/kernel-debug.changes 2008-10-27 19:55:19.000000000 +0100 @@ -1,0 +2,73 @@ +Mon Oct 27 14:13:04 CET 2008 - trenn(a)suse.de + +- patches.arch/x86_uv_early_detect.patch: Delete hacks that were + necessary while waiting for x2apic code. (bnc#429984). + +------------------------------------------------------------------- +Mon Oct 27 11:46:43 CET 2008 - tj(a)suse.de + +Refresh the govault patch. + +- patches.drivers/libata-add-waits-for-govault: libata: add + waits for GoVault (bnc#246451). + +------------------------------------------------------------------- +Sun Oct 26 18:48:09 CET 2008 - bwalle(a)suse.de + +- patches.fixes/kdb-oops-panic.diff: + Fix NULL pointer dereference when regs == NULL (bnc#439007). +- patches.fixes/hpwdt-kdump.diff: + Fix kdump when using hpwdt (bnc#436786). + +------------------------------------------------------------------- +Sun Oct 26 06:58:29 CET 2008 - gregkh(a)suse.de + +- refresh patches to apply cleanly and properly. + +------------------------------------------------------------------- +Sun Oct 26 06:44:24 CET 2008 - gregkh(a)suse.de + +- Update to 2.6.27.4 + +------------------------------------------------------------------- +Sat Oct 25 20:47:27 CEST 2008 - agruen(a)suse.de + +- Fix the dependencies between the split kernel packages and KMPs + (FATE 303631). +- Fix for kernel paclages which are not split. +- rpm/kernel-source.spec.in: Update list of scripts to include. + +------------------------------------------------------------------- +Sat Oct 25 18:36:05 CEST 2008 - jjolly(a)suse.de + +- patches.arch/s390-02-02-smp-sysdev.patch: kernel: sysdev class + file creation (bnc#434333) +- patches.arch/s390-02-03-zfcp.patch: Fix zfcp problems that have + been found (bnc#434333) +- patches.arch/s390-02-04-qeth-mac.patch: qeth: use firmware + MAC-address for layer2 hsi-devices (bnc#434333) +- patches.arch/s390-02-05-qeth-recovery.patch: qeth: qeth recovery + fails (bnc#434333) +- patches.arch/s390-02-06-qeth-offset.patch: qeth: fix offset error + in non prealloc header path (bnc#434333,LTC#48840) +- patches.arch/s390-02-07-qeth-ipv6check.patch: qeth: remove + unnecessary support ckeck in sysfs route6 (bnc#434333) +- patches.arch/s390-02-08-qeth-panic.patch: qeth: avoid + skb_under_panic for malformatted inbound data (bnc#434333) +- patches.arch/s390-02-09-tape-lock.patch: tape device driver: + improve locking (bnc#434333) + +------------------------------------------------------------------- +Sat Oct 25 11:51:28 CEST 2008 - neilb(a)suse.de + +- patches.kernel.org/touch_mnt_namespace-when-the-mount-flags-change.patch: + touch_mnt_namespace when the mount flags change (FATE#304218). + +------------------------------------------------------------------- +Fri Oct 24 23:57:11 CEST 2008 - gregkh(a)suse.de + +- Updated to 2.6.27.4-rc3: + - fixed ath5k suspend/resume regression + - fixed pvrusb2 so it actually works + +------------------------------------------------------------------- @@ -622 +695 @@ -Thu Oct 16 23:57:16 CEST 2008 - mfasheh(a)suse.com +Fri Oct 17 00:57:16 CEST 2008 - mfasheh(a)suse.com kernel-default.changes: same change kernel-dummy.changes: same change kernel-kdump.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-rt.changes: same change kernel-rt_debug.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-source-rt.changes: same change kernel-syms.changes: same change kernel-syms-rt.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change calling whatdependson for head-i586 Old: ---- make-symsets New: ---- list-exported-symbols split-into-symsets ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:03.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-debug (Version 2.6.27.3) +# spec file for package kernel-debug (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ %if %{build_flavor} == "vanilla" %define build_vanilla 1 %endif -%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks}) +%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %define symbols %(set -- kernel-debug debug $(case debug in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/debug$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -57,8 +57,8 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -97,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.3 -Obsoletes: kernel-xenpae <= 2.6.27.3 +Provides: kernel-xenpae = 2.6.27.4 +Obsoletes: kernel-xenpae <= 2.6.27.4 %endif #!BuildIgnore: xen %endif @@ -123,7 +123,7 @@ %if %build_um #Conflicts: kernel %else -Provides: kernel = 2.6.27.3-%source_rel +Provides: kernel = 2.6.27.4-%source_rel %endif %ifarch %ix86 %else @@ -149,8 +149,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source100: config.tar.bz2 @@ -215,12 +216,12 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-debug-2.6.27.3.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.3.src.rpm." + echo "The kernel-debug-2.6.27.4.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.4.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -299,7 +300,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27.3-$RELEASE-debug +KERNELRELEASE=2.6.27.4-$RELEASE-debug EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -459,6 +460,12 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp .config %buildroot/boot/config-$KERNELRELEASE +# Figure out where the symbols that vmlinux exports are defined. +# (We need this information below as well as in find-provides; we "annotate" +# the original Module.symvers here to make sure that we are consistent in +# both places.) +%_sourcedir/built-in-where < Module.symvers > Module.symvers.split +mv Module.symvers.split Module.symvers gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz if [ $CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -469,20 +476,6 @@ %endif echo "Consistency check error: please update supported.conf." fi - # Preserve exports from previous kernels when possible. - old_symsets=%my_builddir/kabi/$SUBARCH/symsets-debug.tar.gz - [ -e $old_symsets ] || old_symsets= - # Group the exported symbols listed in symvers.gz by directory, and - # create a database of sets. - { awk '$3 != "vmlinux" { print }' Module.symvers - # Find out in which built-in.o files the exported symbols that ended - # up in vmlinux were defined. - awk '$3 == "vmlinux" { print }' Module.symvers \ - | %_sourcedir/built-in-where - } | %_sourcedir/make-symsets \ - %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets || - [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] # Also put the resulting file in $obj_dir/$SUBARCH/debug # so that kernel-source + kernel-debug is sufficient for building # modules that have modversions as well. @@ -606,6 +599,39 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + exported_by_modules() { + local module + while read module; do + %_sourcedir/list-exported-symbols $RPM_BUILD_ROOT$module + done + } + mkdir %my_builddir/{base,main,extra} + ( awk '$3 == "vmlinux" || $3 ~ /\/built-in$/ { print }' Module.symvers + exported_by_modules < %my_builddir/base-modules + ) | %_sourcedir/split-into-symsets %my_builddir/base +%if %split_packages + exported_by_modules < %my_builddir/main-modules \ + | %_sourcedir/split-into-symsets %my_builddir/main + exported_by_modules < %my_builddir/unsupported-modules \ + | %_sourcedir/split-into-symsets %my_builddir/extra +%endif + # Notes: + # - We rely on list-exported-symbols to correctly extract all exported + # symbols from modules; Module.symvers is disregarded for that. + # - We recompute the symsets in find-provides. Take care to keep the + # algorithm the same in both places. + ## Preserve exports from previous kernels when possible. + #old_symsets=%my_builddir/kabi/$SUBARCH/symsets-debug.tar.gz + #[ -e $old_symsets ] || old_symsets= + # FIXME: implement + symsets=%my_builddir/symsets-$KERNELRELEASE + mkdir $symsets + find %my_builddir/{base,main,extra} -type f \ + | xargs --replace='{}' cp '{}' $symsets/ + tar c -C ${symsets%/*} ${symsets##*/} \ + | gzip -9 \ + > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz + # FIXME: check for abi changes # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ @@ -700,7 +726,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun base -f preun-base.sh @@ -737,7 +763,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun extra -f preun-extra.sh ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:03.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-default (Version 2.6.27.3) +# spec file for package kernel-default (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ %if %{build_flavor} == "vanilla" %define build_vanilla 1 %endif -%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks}) +%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %define symbols %(set -- kernel-default default $(case default in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/default$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -57,8 +57,8 @@ Name: kernel-default Summary: The Standard Kernel -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -97,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.3 -Obsoletes: kernel-xenpae <= 2.6.27.3 +Provides: kernel-xenpae = 2.6.27.4 +Obsoletes: kernel-xenpae <= 2.6.27.4 %endif #!BuildIgnore: xen %endif @@ -123,7 +123,7 @@ %if %build_um #Conflicts: kernel %else -Provides: kernel = 2.6.27.3-%source_rel +Provides: kernel = 2.6.27.4-%source_rel %endif %ifarch %ix86 Provides: k_athlon k_debug k_deflt k_deflt_22 k_deflt_24 k_eide k_laptop k_orig k_pentiu k_pos_ibm k_psmp k_smp k_smp_22 k_smp_24 smp kernel-smp @@ -168,8 +168,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source100: config.tar.bz2 @@ -233,12 +234,12 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-default-2.6.27.3.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.3.src.rpm." + echo "The kernel-default-2.6.27.4.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.4.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -317,7 +318,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27.3-$RELEASE-default +KERNELRELEASE=2.6.27.4-$RELEASE-default EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -477,6 +478,12 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp .config %buildroot/boot/config-$KERNELRELEASE +# Figure out where the symbols that vmlinux exports are defined. +# (We need this information below as well as in find-provides; we "annotate" +# the original Module.symvers here to make sure that we are consistent in +# both places.) +%_sourcedir/built-in-where < Module.symvers > Module.symvers.split +mv Module.symvers.split Module.symvers gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz if [ $CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -487,20 +494,6 @@ %endif echo "Consistency check error: please update supported.conf." fi - # Preserve exports from previous kernels when possible. - old_symsets=%my_builddir/kabi/$SUBARCH/symsets-default.tar.gz - [ -e $old_symsets ] || old_symsets= - # Group the exported symbols listed in symvers.gz by directory, and - # create a database of sets. - { awk '$3 != "vmlinux" { print }' Module.symvers - # Find out in which built-in.o files the exported symbols that ended - # up in vmlinux were defined. - awk '$3 == "vmlinux" { print }' Module.symvers \ - | %_sourcedir/built-in-where - } | %_sourcedir/make-symsets \ - %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets || - [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] # Also put the resulting file in $obj_dir/$SUBARCH/default # so that kernel-source + kernel-default is sufficient for building # modules that have modversions as well. @@ -624,6 +617,39 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + exported_by_modules() { + local module + while read module; do + %_sourcedir/list-exported-symbols $RPM_BUILD_ROOT$module + done + } + mkdir %my_builddir/{base,main,extra} + ( awk '$3 == "vmlinux" || $3 ~ /\/built-in$/ { print }' Module.symvers + exported_by_modules < %my_builddir/base-modules + ) | %_sourcedir/split-into-symsets %my_builddir/base +%if %split_packages + exported_by_modules < %my_builddir/main-modules \ + | %_sourcedir/split-into-symsets %my_builddir/main + exported_by_modules < %my_builddir/unsupported-modules \ + | %_sourcedir/split-into-symsets %my_builddir/extra +%endif + # Notes: + # - We rely on list-exported-symbols to correctly extract all exported + # symbols from modules; Module.symvers is disregarded for that. + # - We recompute the symsets in find-provides. Take care to keep the + # algorithm the same in both places. + ## Preserve exports from previous kernels when possible. + #old_symsets=%my_builddir/kabi/$SUBARCH/symsets-default.tar.gz + #[ -e $old_symsets ] || old_symsets= + # FIXME: implement + symsets=%my_builddir/symsets-$KERNELRELEASE + mkdir $symsets + find %my_builddir/{base,main,extra} -type f \ + | xargs --replace='{}' cp '{}' $symsets/ + tar c -C ${symsets%/*} ${symsets##*/} \ + | gzip -9 \ + > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz + # FIXME: check for abi changes # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ @@ -717,7 +743,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun base -f preun-base.sh @@ -753,7 +779,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun extra -f preun-extra.sh ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:04.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:04.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-dummy (Version 2.6.27.3) +# spec file for package kernel-dummy (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ Name: kernel-dummy Summary: Internal dummy package for synchronizing release numbers -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: System/Kernel AutoReqProv: off @@ -36,7 +36,7 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %install rm -rf %buildroot ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:04.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:04.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-kdump (Version 2.6.27.3) +# spec file for package kernel-kdump (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ %if %{build_flavor} == "vanilla" %define build_vanilla 1 %endif -%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks}) +%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %define symbols %(set -- kernel-kdump kdump $(case kdump in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/kdump$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -57,8 +57,8 @@ Name: kernel-kdump Summary: kernel for kdump -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -97,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.3 -Obsoletes: kernel-xenpae <= 2.6.27.3 +Provides: kernel-xenpae = 2.6.27.4 +Obsoletes: kernel-xenpae <= 2.6.27.4 %endif #!BuildIgnore: xen %endif @@ -123,7 +123,7 @@ %if %build_um #Conflicts: kernel %else -Provides: kernel = 2.6.27.3-%source_rel +Provides: kernel = 2.6.27.4-%source_rel %endif %ifarch ppc %else @@ -146,8 +146,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source100: config.tar.bz2 @@ -214,12 +215,12 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-kdump-2.6.27.3.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.3.src.rpm." + echo "The kernel-kdump-2.6.27.4.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.4.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -298,7 +299,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27.3-$RELEASE-kdump +KERNELRELEASE=2.6.27.4-$RELEASE-kdump EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -458,6 +459,12 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp .config %buildroot/boot/config-$KERNELRELEASE +# Figure out where the symbols that vmlinux exports are defined. +# (We need this information below as well as in find-provides; we "annotate" +# the original Module.symvers here to make sure that we are consistent in +# both places.) +%_sourcedir/built-in-where < Module.symvers > Module.symvers.split +mv Module.symvers.split Module.symvers gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz if [ $CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -468,20 +475,6 @@ %endif echo "Consistency check error: please update supported.conf." fi - # Preserve exports from previous kernels when possible. - old_symsets=%my_builddir/kabi/$SUBARCH/symsets-kdump.tar.gz - [ -e $old_symsets ] || old_symsets= - # Group the exported symbols listed in symvers.gz by directory, and - # create a database of sets. - { awk '$3 != "vmlinux" { print }' Module.symvers - # Find out in which built-in.o files the exported symbols that ended - # up in vmlinux were defined. - awk '$3 == "vmlinux" { print }' Module.symvers \ - | %_sourcedir/built-in-where - } | %_sourcedir/make-symsets \ - %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets || - [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] # Also put the resulting file in $obj_dir/$SUBARCH/kdump # so that kernel-source + kernel-kdump is sufficient for building # modules that have modversions as well. @@ -605,6 +598,39 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + exported_by_modules() { + local module + while read module; do + %_sourcedir/list-exported-symbols $RPM_BUILD_ROOT$module + done + } + mkdir %my_builddir/{base,main,extra} + ( awk '$3 == "vmlinux" || $3 ~ /\/built-in$/ { print }' Module.symvers + exported_by_modules < %my_builddir/base-modules + ) | %_sourcedir/split-into-symsets %my_builddir/base +%if %split_packages + exported_by_modules < %my_builddir/main-modules \ + | %_sourcedir/split-into-symsets %my_builddir/main + exported_by_modules < %my_builddir/unsupported-modules \ + | %_sourcedir/split-into-symsets %my_builddir/extra +%endif + # Notes: + # - We rely on list-exported-symbols to correctly extract all exported + # symbols from modules; Module.symvers is disregarded for that. + # - We recompute the symsets in find-provides. Take care to keep the + # algorithm the same in both places. + ## Preserve exports from previous kernels when possible. + #old_symsets=%my_builddir/kabi/$SUBARCH/symsets-kdump.tar.gz + #[ -e $old_symsets ] || old_symsets= + # FIXME: implement + symsets=%my_builddir/symsets-$KERNELRELEASE + mkdir $symsets + find %my_builddir/{base,main,extra} -type f \ + | xargs --replace='{}' cp '{}' $symsets/ + tar c -C ${symsets%/*} ${symsets##*/} \ + | gzip -9 \ + > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz + # FIXME: check for abi changes # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ @@ -701,7 +727,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun base -f preun-base.sh @@ -740,7 +766,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun extra -f preun-extra.sh ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:05.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-pae (Version 2.6.27.3) +# spec file for package kernel-pae (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ %if %{build_flavor} == "vanilla" %define build_vanilla 1 %endif -%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks}) +%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %define symbols %(set -- kernel-pae pae $(case pae in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/pae$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -57,8 +57,8 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -97,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.3 -Obsoletes: kernel-xenpae <= 2.6.27.3 +Provides: kernel-xenpae = 2.6.27.4 +Obsoletes: kernel-xenpae <= 2.6.27.4 %endif #!BuildIgnore: xen %endif @@ -123,7 +123,7 @@ %if %build_um #Conflicts: kernel %else -Provides: kernel = 2.6.27.3-%source_rel +Provides: kernel = 2.6.27.4-%source_rel %endif Provides: k_smp4G kernel-bigsmp Obsoletes: k_smp4G kernel-bigsmp @@ -143,8 +143,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source100: config.tar.bz2 @@ -215,12 +216,12 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-pae-2.6.27.3.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.3.src.rpm." + echo "The kernel-pae-2.6.27.4.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.4.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -299,7 +300,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27.3-$RELEASE-pae +KERNELRELEASE=2.6.27.4-$RELEASE-pae EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -459,6 +460,12 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp .config %buildroot/boot/config-$KERNELRELEASE +# Figure out where the symbols that vmlinux exports are defined. +# (We need this information below as well as in find-provides; we "annotate" +# the original Module.symvers here to make sure that we are consistent in +# both places.) +%_sourcedir/built-in-where < Module.symvers > Module.symvers.split +mv Module.symvers.split Module.symvers gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz if [ $CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -469,20 +476,6 @@ %endif echo "Consistency check error: please update supported.conf." fi - # Preserve exports from previous kernels when possible. - old_symsets=%my_builddir/kabi/$SUBARCH/symsets-pae.tar.gz - [ -e $old_symsets ] || old_symsets= - # Group the exported symbols listed in symvers.gz by directory, and - # create a database of sets. - { awk '$3 != "vmlinux" { print }' Module.symvers - # Find out in which built-in.o files the exported symbols that ended - # up in vmlinux were defined. - awk '$3 == "vmlinux" { print }' Module.symvers \ - | %_sourcedir/built-in-where - } | %_sourcedir/make-symsets \ - %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets || - [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] # Also put the resulting file in $obj_dir/$SUBARCH/pae # so that kernel-source + kernel-pae is sufficient for building # modules that have modversions as well. @@ -606,6 +599,39 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + exported_by_modules() { + local module + while read module; do + %_sourcedir/list-exported-symbols $RPM_BUILD_ROOT$module + done + } + mkdir %my_builddir/{base,main,extra} + ( awk '$3 == "vmlinux" || $3 ~ /\/built-in$/ { print }' Module.symvers + exported_by_modules < %my_builddir/base-modules + ) | %_sourcedir/split-into-symsets %my_builddir/base +%if %split_packages + exported_by_modules < %my_builddir/main-modules \ + | %_sourcedir/split-into-symsets %my_builddir/main + exported_by_modules < %my_builddir/unsupported-modules \ + | %_sourcedir/split-into-symsets %my_builddir/extra +%endif + # Notes: + # - We rely on list-exported-symbols to correctly extract all exported + # symbols from modules; Module.symvers is disregarded for that. + # - We recompute the symsets in find-provides. Take care to keep the + # algorithm the same in both places. + ## Preserve exports from previous kernels when possible. + #old_symsets=%my_builddir/kabi/$SUBARCH/symsets-pae.tar.gz + #[ -e $old_symsets ] || old_symsets= + # FIXME: implement + symsets=%my_builddir/symsets-$KERNELRELEASE + mkdir $symsets + find %my_builddir/{base,main,extra} -type f \ + | xargs --replace='{}' cp '{}' $symsets/ + tar c -C ${symsets%/*} ${symsets##*/} \ + | gzip -9 \ + > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz + # FIXME: check for abi changes # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ @@ -706,7 +732,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun base -f preun-base.sh @@ -749,7 +775,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun extra -f preun-extra.sh ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:06.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:06.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ppc64 (Version 2.6.27.3) +# spec file for package kernel-ppc64 (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ %if %{build_flavor} == "vanilla" %define build_vanilla 1 %endif -%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks}) +%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %define symbols %(set -- kernel-ppc64 ppc64 $(case ppc64 in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/ppc64$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -57,8 +57,8 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -97,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.3 -Obsoletes: kernel-xenpae <= 2.6.27.3 +Provides: kernel-xenpae = 2.6.27.4 +Obsoletes: kernel-xenpae <= 2.6.27.4 %endif #!BuildIgnore: xen %endif @@ -123,7 +123,7 @@ %if %build_um #Conflicts: kernel %else -Provides: kernel = 2.6.27.3-%source_rel +Provides: kernel = 2.6.27.4-%source_rel %endif %ifarch ppc Provides: kernel-pmac64 kernel-pseries64 kernel-iseries64 @@ -148,8 +148,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source100: config.tar.bz2 @@ -227,12 +228,12 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-ppc64-2.6.27.3.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.3.src.rpm." + echo "The kernel-ppc64-2.6.27.4.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.4.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -311,7 +312,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27.3-$RELEASE-ppc64 +KERNELRELEASE=2.6.27.4-$RELEASE-ppc64 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -471,6 +472,12 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp .config %buildroot/boot/config-$KERNELRELEASE +# Figure out where the symbols that vmlinux exports are defined. +# (We need this information below as well as in find-provides; we "annotate" +# the original Module.symvers here to make sure that we are consistent in +# both places.) +%_sourcedir/built-in-where < Module.symvers > Module.symvers.split +mv Module.symvers.split Module.symvers gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz if [ $CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -481,20 +488,6 @@ %endif echo "Consistency check error: please update supported.conf." fi - # Preserve exports from previous kernels when possible. - old_symsets=%my_builddir/kabi/$SUBARCH/symsets-ppc64.tar.gz - [ -e $old_symsets ] || old_symsets= - # Group the exported symbols listed in symvers.gz by directory, and - # create a database of sets. - { awk '$3 != "vmlinux" { print }' Module.symvers - # Find out in which built-in.o files the exported symbols that ended - # up in vmlinux were defined. - awk '$3 == "vmlinux" { print }' Module.symvers \ - | %_sourcedir/built-in-where - } | %_sourcedir/make-symsets \ - %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets || - [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] # Also put the resulting file in $obj_dir/$SUBARCH/ppc64 # so that kernel-source + kernel-ppc64 is sufficient for building # modules that have modversions as well. @@ -618,6 +611,39 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + exported_by_modules() { + local module + while read module; do + %_sourcedir/list-exported-symbols $RPM_BUILD_ROOT$module + done + } + mkdir %my_builddir/{base,main,extra} + ( awk '$3 == "vmlinux" || $3 ~ /\/built-in$/ { print }' Module.symvers + exported_by_modules < %my_builddir/base-modules + ) | %_sourcedir/split-into-symsets %my_builddir/base +%if %split_packages + exported_by_modules < %my_builddir/main-modules \ + | %_sourcedir/split-into-symsets %my_builddir/main + exported_by_modules < %my_builddir/unsupported-modules \ + | %_sourcedir/split-into-symsets %my_builddir/extra +%endif + # Notes: + # - We rely on list-exported-symbols to correctly extract all exported + # symbols from modules; Module.symvers is disregarded for that. + # - We recompute the symsets in find-provides. Take care to keep the + # algorithm the same in both places. + ## Preserve exports from previous kernels when possible. + #old_symsets=%my_builddir/kabi/$SUBARCH/symsets-ppc64.tar.gz + #[ -e $old_symsets ] || old_symsets= + # FIXME: implement + symsets=%my_builddir/symsets-$KERNELRELEASE + mkdir $symsets + find %my_builddir/{base,main,extra} -type f \ + | xargs --replace='{}' cp '{}' $symsets/ + tar c -C ${symsets%/*} ${symsets##*/} \ + | gzip -9 \ + > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz + # FIXME: check for abi changes # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ @@ -725,7 +751,7 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun base -f preun-base.sh @@ -775,7 +801,7 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun extra -f preun-extra.sh ++++++ kernel-ps3.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:06.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:06.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ps3 (Version 2.6.27.3) +# spec file for package kernel-ps3 (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ %if %{build_flavor} == "vanilla" %define build_vanilla 1 %endif -%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks}) +%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %define symbols %(set -- kernel-ps3 ps3 $(case ps3 in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/ps3$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -57,8 +57,8 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -97,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.3 -Obsoletes: kernel-xenpae <= 2.6.27.3 +Provides: kernel-xenpae = 2.6.27.4 +Obsoletes: kernel-xenpae <= 2.6.27.4 %endif #!BuildIgnore: xen %endif @@ -123,7 +123,7 @@ %if %build_um #Conflicts: kernel %else -Provides: kernel = 2.6.27.3-%source_rel +Provides: kernel = 2.6.27.4-%source_rel %endif %ifarch ppc %else @@ -146,8 +146,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source100: config.tar.bz2 @@ -213,12 +214,12 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-ps3-2.6.27.3.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.3.src.rpm." + echo "The kernel-ps3-2.6.27.4.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.4.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -297,7 +298,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27.3-$RELEASE-ps3 +KERNELRELEASE=2.6.27.4-$RELEASE-ps3 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -457,6 +458,12 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp .config %buildroot/boot/config-$KERNELRELEASE +# Figure out where the symbols that vmlinux exports are defined. +# (We need this information below as well as in find-provides; we "annotate" +# the original Module.symvers here to make sure that we are consistent in +# both places.) +%_sourcedir/built-in-where < Module.symvers > Module.symvers.split +mv Module.symvers.split Module.symvers gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz if [ $CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -467,20 +474,6 @@ %endif echo "Consistency check error: please update supported.conf." fi - # Preserve exports from previous kernels when possible. - old_symsets=%my_builddir/kabi/$SUBARCH/symsets-ps3.tar.gz - [ -e $old_symsets ] || old_symsets= - # Group the exported symbols listed in symvers.gz by directory, and - # create a database of sets. - { awk '$3 != "vmlinux" { print }' Module.symvers - # Find out in which built-in.o files the exported symbols that ended - # up in vmlinux were defined. - awk '$3 == "vmlinux" { print }' Module.symvers \ - | %_sourcedir/built-in-where - } | %_sourcedir/make-symsets \ - %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets || - [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] # Also put the resulting file in $obj_dir/$SUBARCH/ps3 # so that kernel-source + kernel-ps3 is sufficient for building # modules that have modversions as well. @@ -604,6 +597,39 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + exported_by_modules() { + local module + while read module; do + %_sourcedir/list-exported-symbols $RPM_BUILD_ROOT$module + done + } + mkdir %my_builddir/{base,main,extra} + ( awk '$3 == "vmlinux" || $3 ~ /\/built-in$/ { print }' Module.symvers + exported_by_modules < %my_builddir/base-modules + ) | %_sourcedir/split-into-symsets %my_builddir/base +%if %split_packages + exported_by_modules < %my_builddir/main-modules \ + | %_sourcedir/split-into-symsets %my_builddir/main + exported_by_modules < %my_builddir/unsupported-modules \ + | %_sourcedir/split-into-symsets %my_builddir/extra +%endif + # Notes: + # - We rely on list-exported-symbols to correctly extract all exported + # symbols from modules; Module.symvers is disregarded for that. + # - We recompute the symsets in find-provides. Take care to keep the + # algorithm the same in both places. + ## Preserve exports from previous kernels when possible. + #old_symsets=%my_builddir/kabi/$SUBARCH/symsets-ps3.tar.gz + #[ -e $old_symsets ] || old_symsets= + # FIXME: implement + symsets=%my_builddir/symsets-$KERNELRELEASE + mkdir $symsets + find %my_builddir/{base,main,extra} -type f \ + | xargs --replace='{}' cp '{}' $symsets/ + tar c -C ${symsets%/*} ${symsets##*/} \ + | gzip -9 \ + > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz + # FIXME: check for abi changes # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ @@ -697,7 +723,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun base -f preun-base.sh @@ -733,7 +759,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun extra -f preun-extra.sh ++++++ kernel-rt_debug.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:07.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-rt_debug (Version 2.6.27.3) +# spec file for package kernel-rt_debug (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ %if %{build_flavor} == "vanilla" %define build_vanilla 1 %endif -%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks}) +%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %define symbols %(set -- kernel-rt_debug rt_debug $(case rt_debug in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/rt_debug$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -57,8 +57,8 @@ Name: kernel-rt_debug Summary: A Debug Version of the Kernel -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -97,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.3 -Obsoletes: kernel-xenpae <= 2.6.27.3 +Provides: kernel-xenpae = 2.6.27.4 +Obsoletes: kernel-xenpae <= 2.6.27.4 %endif #!BuildIgnore: xen %endif @@ -123,7 +123,7 @@ %if %build_um #Conflicts: kernel %else -Provides: kernel = 2.6.27.3-%source_rel +Provides: kernel = 2.6.27.4-%source_rel %endif %ifarch %ix86 %else @@ -146,8 +146,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source100: config.tar.bz2 @@ -212,12 +213,12 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-rt_debug-2.6.27.3.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.3.src.rpm." + echo "The kernel-rt_debug-2.6.27.4.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.4.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -296,7 +297,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27.3-$RELEASE-rt_debug +KERNELRELEASE=2.6.27.4-$RELEASE-rt_debug EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -456,6 +457,12 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp .config %buildroot/boot/config-$KERNELRELEASE +# Figure out where the symbols that vmlinux exports are defined. +# (We need this information below as well as in find-provides; we "annotate" +# the original Module.symvers here to make sure that we are consistent in +# both places.) +%_sourcedir/built-in-where < Module.symvers > Module.symvers.split +mv Module.symvers.split Module.symvers gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz if [ $CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -466,20 +473,6 @@ %endif echo "Consistency check error: please update supported.conf." fi - # Preserve exports from previous kernels when possible. - old_symsets=%my_builddir/kabi/$SUBARCH/symsets-rt_debug.tar.gz - [ -e $old_symsets ] || old_symsets= - # Group the exported symbols listed in symvers.gz by directory, and - # create a database of sets. - { awk '$3 != "vmlinux" { print }' Module.symvers - # Find out in which built-in.o files the exported symbols that ended - # up in vmlinux were defined. - awk '$3 == "vmlinux" { print }' Module.symvers \ - | %_sourcedir/built-in-where - } | %_sourcedir/make-symsets \ - %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets || - [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] # Also put the resulting file in $obj_dir/$SUBARCH/rt_debug # so that kernel-source + kernel-rt_debug is sufficient for building # modules that have modversions as well. @@ -603,6 +596,39 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + exported_by_modules() { + local module + while read module; do + %_sourcedir/list-exported-symbols $RPM_BUILD_ROOT$module + done + } + mkdir %my_builddir/{base,main,extra} + ( awk '$3 == "vmlinux" || $3 ~ /\/built-in$/ { print }' Module.symvers + exported_by_modules < %my_builddir/base-modules + ) | %_sourcedir/split-into-symsets %my_builddir/base +%if %split_packages + exported_by_modules < %my_builddir/main-modules \ + | %_sourcedir/split-into-symsets %my_builddir/main + exported_by_modules < %my_builddir/unsupported-modules \ + | %_sourcedir/split-into-symsets %my_builddir/extra +%endif + # Notes: + # - We rely on list-exported-symbols to correctly extract all exported + # symbols from modules; Module.symvers is disregarded for that. + # - We recompute the symsets in find-provides. Take care to keep the + # algorithm the same in both places. + ## Preserve exports from previous kernels when possible. + #old_symsets=%my_builddir/kabi/$SUBARCH/symsets-rt_debug.tar.gz + #[ -e $old_symsets ] || old_symsets= + # FIXME: implement + symsets=%my_builddir/symsets-$KERNELRELEASE + mkdir $symsets + find %my_builddir/{base,main,extra} -type f \ + | xargs --replace='{}' cp '{}' $symsets/ + tar c -C ${symsets%/*} ${symsets##*/} \ + | gzip -9 \ + > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz + # FIXME: check for abi changes # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ @@ -697,7 +723,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun base -f preun-base.sh @@ -734,7 +760,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun extra -f preun-extra.sh ++++++ kernel-rt.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:07.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:08.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-rt (Version 2.6.27.3) +# spec file for package kernel-rt (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ %if %{build_flavor} == "vanilla" %define build_vanilla 1 %endif -%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks}) +%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %define symbols %(set -- kernel-rt rt $(case rt in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/rt$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -57,8 +57,8 @@ Name: kernel-rt Summary: The Realtime Linux Kernel -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -97,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.3 -Obsoletes: kernel-xenpae <= 2.6.27.3 +Provides: kernel-xenpae = 2.6.27.4 +Obsoletes: kernel-xenpae <= 2.6.27.4 %endif #!BuildIgnore: xen %endif @@ -123,7 +123,7 @@ %if %build_um #Conflicts: kernel %else -Provides: kernel = 2.6.27.3-%source_rel +Provides: kernel = 2.6.27.4-%source_rel %endif %ifarch %ix86 %else @@ -146,8 +146,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source100: config.tar.bz2 @@ -217,12 +218,12 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-rt-2.6.27.3.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.3.src.rpm." + echo "The kernel-rt-2.6.27.4.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.4.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -301,7 +302,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27.3-$RELEASE-rt +KERNELRELEASE=2.6.27.4-$RELEASE-rt EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -461,6 +462,12 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp .config %buildroot/boot/config-$KERNELRELEASE +# Figure out where the symbols that vmlinux exports are defined. +# (We need this information below as well as in find-provides; we "annotate" +# the original Module.symvers here to make sure that we are consistent in +# both places.) +%_sourcedir/built-in-where < Module.symvers > Module.symvers.split +mv Module.symvers.split Module.symvers gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz if [ $CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -471,20 +478,6 @@ %endif echo "Consistency check error: please update supported.conf." fi - # Preserve exports from previous kernels when possible. - old_symsets=%my_builddir/kabi/$SUBARCH/symsets-rt.tar.gz - [ -e $old_symsets ] || old_symsets= - # Group the exported symbols listed in symvers.gz by directory, and - # create a database of sets. - { awk '$3 != "vmlinux" { print }' Module.symvers - # Find out in which built-in.o files the exported symbols that ended - # up in vmlinux were defined. - awk '$3 == "vmlinux" { print }' Module.symvers \ - | %_sourcedir/built-in-where - } | %_sourcedir/make-symsets \ - %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets || - [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] # Also put the resulting file in $obj_dir/$SUBARCH/rt # so that kernel-source + kernel-rt is sufficient for building # modules that have modversions as well. @@ -608,6 +601,39 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + exported_by_modules() { + local module + while read module; do + %_sourcedir/list-exported-symbols $RPM_BUILD_ROOT$module + done + } + mkdir %my_builddir/{base,main,extra} + ( awk '$3 == "vmlinux" || $3 ~ /\/built-in$/ { print }' Module.symvers + exported_by_modules < %my_builddir/base-modules + ) | %_sourcedir/split-into-symsets %my_builddir/base +%if %split_packages + exported_by_modules < %my_builddir/main-modules \ + | %_sourcedir/split-into-symsets %my_builddir/main + exported_by_modules < %my_builddir/unsupported-modules \ + | %_sourcedir/split-into-symsets %my_builddir/extra +%endif + # Notes: + # - We rely on list-exported-symbols to correctly extract all exported + # symbols from modules; Module.symvers is disregarded for that. + # - We recompute the symsets in find-provides. Take care to keep the + # algorithm the same in both places. + ## Preserve exports from previous kernels when possible. + #old_symsets=%my_builddir/kabi/$SUBARCH/symsets-rt.tar.gz + #[ -e $old_symsets ] || old_symsets= + # FIXME: implement + symsets=%my_builddir/symsets-$KERNELRELEASE + mkdir $symsets + find %my_builddir/{base,main,extra} -type f \ + | xargs --replace='{}' cp '{}' $symsets/ + tar c -C ${symsets%/*} ${symsets##*/} \ + | gzip -9 \ + > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz + # FIXME: check for abi changes # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ @@ -707,7 +733,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun base -f preun-base.sh @@ -749,7 +775,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun extra -f preun-extra.sh ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:08.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:08.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-s390 (Version 2.6.27.3) +# spec file for package kernel-s390 (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ %if %{build_flavor} == "vanilla" %define build_vanilla 1 %endif -%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks}) +%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %define symbols %(set -- kernel-s390 s390 $(case s390 in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/s390$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -57,8 +57,8 @@ Name: kernel-s390 Summary: The Standard Kernel -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -97,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.3 -Obsoletes: kernel-xenpae <= 2.6.27.3 +Provides: kernel-xenpae = 2.6.27.4 +Obsoletes: kernel-xenpae <= 2.6.27.4 %endif #!BuildIgnore: xen %endif @@ -123,7 +123,7 @@ %if %build_um #Conflicts: kernel %else -Provides: kernel = 2.6.27.3-%source_rel +Provides: kernel = 2.6.27.4-%source_rel %endif Provides: kernel-32bit k_deflt Obsoletes: kernel-32bit k_deflt @@ -143,8 +143,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source100: config.tar.bz2 @@ -208,12 +209,12 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-s390-2.6.27.3.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.3.src.rpm." + echo "The kernel-s390-2.6.27.4.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.4.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -292,7 +293,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27.3-$RELEASE-s390 +KERNELRELEASE=2.6.27.4-$RELEASE-s390 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -452,6 +453,12 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp .config %buildroot/boot/config-$KERNELRELEASE +# Figure out where the symbols that vmlinux exports are defined. +# (We need this information below as well as in find-provides; we "annotate" +# the original Module.symvers here to make sure that we are consistent in +# both places.) +%_sourcedir/built-in-where < Module.symvers > Module.symvers.split +mv Module.symvers.split Module.symvers gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz if [ $CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -462,20 +469,6 @@ %endif echo "Consistency check error: please update supported.conf." fi - # Preserve exports from previous kernels when possible. - old_symsets=%my_builddir/kabi/$SUBARCH/symsets-s390.tar.gz - [ -e $old_symsets ] || old_symsets= - # Group the exported symbols listed in symvers.gz by directory, and - # create a database of sets. - { awk '$3 != "vmlinux" { print }' Module.symvers - # Find out in which built-in.o files the exported symbols that ended - # up in vmlinux were defined. - awk '$3 == "vmlinux" { print }' Module.symvers \ - | %_sourcedir/built-in-where - } | %_sourcedir/make-symsets \ - %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets || - [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] # Also put the resulting file in $obj_dir/$SUBARCH/s390 # so that kernel-source + kernel-s390 is sufficient for building # modules that have modversions as well. @@ -599,6 +592,39 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + exported_by_modules() { + local module + while read module; do + %_sourcedir/list-exported-symbols $RPM_BUILD_ROOT$module + done + } + mkdir %my_builddir/{base,main,extra} + ( awk '$3 == "vmlinux" || $3 ~ /\/built-in$/ { print }' Module.symvers + exported_by_modules < %my_builddir/base-modules + ) | %_sourcedir/split-into-symsets %my_builddir/base +%if %split_packages + exported_by_modules < %my_builddir/main-modules \ + | %_sourcedir/split-into-symsets %my_builddir/main + exported_by_modules < %my_builddir/unsupported-modules \ + | %_sourcedir/split-into-symsets %my_builddir/extra +%endif + # Notes: + # - We rely on list-exported-symbols to correctly extract all exported + # symbols from modules; Module.symvers is disregarded for that. + # - We recompute the symsets in find-provides. Take care to keep the + # algorithm the same in both places. + ## Preserve exports from previous kernels when possible. + #old_symsets=%my_builddir/kabi/$SUBARCH/symsets-s390.tar.gz + #[ -e $old_symsets ] || old_symsets= + # FIXME: implement + symsets=%my_builddir/symsets-$KERNELRELEASE + mkdir $symsets + find %my_builddir/{base,main,extra} -type f \ + | xargs --replace='{}' cp '{}' $symsets/ + tar c -C ${symsets%/*} ${symsets##*/} \ + | gzip -9 \ + > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz + # FIXME: check for abi changes # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ @@ -692,7 +718,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun base -f preun-base.sh @@ -728,7 +754,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun extra -f preun-extra.sh ++++++ kernel-source-rt.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:09.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source-rt (Version 2.6.27.3) +# spec file for package kernel-source-rt (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,8 +29,8 @@ Name: kernel-source-rt Summary: The Linux Kernel Sources, including the real-time patches -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -42,7 +42,7 @@ %endif ExclusiveArch: %ix86 x86_64 Provides: linux -Provides: kernel-source-rt = 2.6.27.3-%source_rel +Provides: kernel-source-rt = 2.6.27.4-%source_rel %if "kernel-source-rt" == "kernel-source" Provides: linux lx_suse lx_sus22 lx_sus24 Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24 @@ -66,8 +66,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source47: extract-modaliases @@ -120,7 +121,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then @@ -137,7 +138,7 @@ while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do RELEASE=${RELEASE#[^0-9]*.} done -KERNELRELEASE=2.6.27.3-$RELEASE +KERNELRELEASE=2.6.27.4-$RELEASE case kernel-source-rt in (*-rt) variant=-rt @@ -164,7 +165,7 @@ > .patches for patch in $(< .patches); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch \ - -i %_builddir/kernel-source-rt-2.6.27.3/$patch; then + -i %_builddir/kernel-source-rt-2.6.27.4/$patch; then echo "*** Patch $patch failed ***" exit 1 fi ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:10.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 2.6.27.3) +# spec file for package kernel-source (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,8 +29,8 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -42,7 +42,7 @@ %endif ExclusiveArch: %ix86 ppc ppc64 s390 s390x ia64 x86_64 Provides: linux -Provides: kernel-source = 2.6.27.3-%source_rel +Provides: kernel-source = 2.6.27.4-%source_rel %if "kernel-source" == "kernel-source" Provides: linux lx_suse lx_sus22 lx_sus24 Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24 @@ -66,8 +66,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source47: extract-modaliases @@ -120,7 +121,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then @@ -137,7 +138,7 @@ while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do RELEASE=${RELEASE#[^0-9]*.} done -KERNELRELEASE=2.6.27.3-$RELEASE +KERNELRELEASE=2.6.27.4-$RELEASE case kernel-source in (*-rt) variant=-rt @@ -164,7 +165,7 @@ > .patches for patch in $(< .patches); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch \ - -i %_builddir/kernel-source-2.6.27.3/$patch; then + -i %_builddir/kernel-source-2.6.27.4/$patch; then echo "*** Patch $patch failed ***" exit 1 fi ++++++ kernel-syms-rt.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:10.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms-rt (Version 2.6.27.3) +# spec file for package kernel-syms-rt (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Name: kernel-syms-rt Summary: Kernel Symbol Versions (modversions) For Real-Time Kernels -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -49,7 +49,7 @@ #!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd Requires: linux -Requires: kernel-source = 2.6.27.3-%source_rel +Requires: kernel-source = 2.6.27.4-%source_rel Source11: arch-symbols Source12: guards Source21: config.conf @@ -74,7 +74,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep echo "Architecture symbol(s):" %symbols kernel-syms.spec: same change ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:11.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:11.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-trace (Version 2.6.27.3) +# spec file for package kernel-trace (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ %if %{build_flavor} == "vanilla" %define build_vanilla 1 %endif -%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks}) +%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %define symbols %(set -- kernel-trace trace $(case trace in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/trace$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -57,8 +57,8 @@ Name: kernel-trace Summary: The Realtime Linux Kernel -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -97,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.3 -Obsoletes: kernel-xenpae <= 2.6.27.3 +Provides: kernel-xenpae = 2.6.27.4 +Obsoletes: kernel-xenpae <= 2.6.27.4 %endif #!BuildIgnore: xen %endif @@ -123,7 +123,7 @@ %if %build_um #Conflicts: kernel %else -Provides: kernel = 2.6.27.3-%source_rel +Provides: kernel = 2.6.27.4-%source_rel %endif %ifarch %ix86 %else @@ -149,8 +149,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source100: config.tar.bz2 @@ -220,12 +221,12 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-trace-2.6.27.3.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.3.src.rpm." + echo "The kernel-trace-2.6.27.4.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.4.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -304,7 +305,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27.3-$RELEASE-trace +KERNELRELEASE=2.6.27.4-$RELEASE-trace EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -464,6 +465,12 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp .config %buildroot/boot/config-$KERNELRELEASE +# Figure out where the symbols that vmlinux exports are defined. +# (We need this information below as well as in find-provides; we "annotate" +# the original Module.symvers here to make sure that we are consistent in +# both places.) +%_sourcedir/built-in-where < Module.symvers > Module.symvers.split +mv Module.symvers.split Module.symvers gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz if [ $CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -474,20 +481,6 @@ %endif echo "Consistency check error: please update supported.conf." fi - # Preserve exports from previous kernels when possible. - old_symsets=%my_builddir/kabi/$SUBARCH/symsets-trace.tar.gz - [ -e $old_symsets ] || old_symsets= - # Group the exported symbols listed in symvers.gz by directory, and - # create a database of sets. - { awk '$3 != "vmlinux" { print }' Module.symvers - # Find out in which built-in.o files the exported symbols that ended - # up in vmlinux were defined. - awk '$3 == "vmlinux" { print }' Module.symvers \ - | %_sourcedir/built-in-where - } | %_sourcedir/make-symsets \ - %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets || - [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] # Also put the resulting file in $obj_dir/$SUBARCH/trace # so that kernel-source + kernel-trace is sufficient for building # modules that have modversions as well. @@ -611,6 +604,39 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + exported_by_modules() { + local module + while read module; do + %_sourcedir/list-exported-symbols $RPM_BUILD_ROOT$module + done + } + mkdir %my_builddir/{base,main,extra} + ( awk '$3 == "vmlinux" || $3 ~ /\/built-in$/ { print }' Module.symvers + exported_by_modules < %my_builddir/base-modules + ) | %_sourcedir/split-into-symsets %my_builddir/base +%if %split_packages + exported_by_modules < %my_builddir/main-modules \ + | %_sourcedir/split-into-symsets %my_builddir/main + exported_by_modules < %my_builddir/unsupported-modules \ + | %_sourcedir/split-into-symsets %my_builddir/extra +%endif + # Notes: + # - We rely on list-exported-symbols to correctly extract all exported + # symbols from modules; Module.symvers is disregarded for that. + # - We recompute the symsets in find-provides. Take care to keep the + # algorithm the same in both places. + ## Preserve exports from previous kernels when possible. + #old_symsets=%my_builddir/kabi/$SUBARCH/symsets-trace.tar.gz + #[ -e $old_symsets ] || old_symsets= + # FIXME: implement + symsets=%my_builddir/symsets-$KERNELRELEASE + mkdir $symsets + find %my_builddir/{base,main,extra} -type f \ + | xargs --replace='{}' cp '{}' $symsets/ + tar c -C ${symsets%/*} ${symsets##*/} \ + | gzip -9 \ + > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz + # FIXME: check for abi changes # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ @@ -708,7 +734,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun base -f preun-base.sh @@ -748,7 +774,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun extra -f preun-extra.sh ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:12.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-vanilla (Version 2.6.27.3) +# spec file for package kernel-vanilla (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ %if %{build_flavor} == "vanilla" %define build_vanilla 1 %endif -%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks}) +%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %define symbols %(set -- kernel-vanilla vanilla $(case vanilla in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/vanilla$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -57,8 +57,8 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -97,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.3 -Obsoletes: kernel-xenpae <= 2.6.27.3 +Provides: kernel-xenpae = 2.6.27.4 +Obsoletes: kernel-xenpae <= 2.6.27.4 %endif #!BuildIgnore: xen %endif @@ -123,7 +123,7 @@ %if %build_um #Conflicts: kernel %else -Provides: kernel = 2.6.27.3-%source_rel +Provides: kernel = 2.6.27.4-%source_rel %endif %ifarch %ix86 %else @@ -165,8 +165,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source100: config.tar.bz2 @@ -230,12 +231,12 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-vanilla-2.6.27.3.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.3.src.rpm." + echo "The kernel-vanilla-2.6.27.4.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.4.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -314,7 +315,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27.3-$RELEASE-vanilla +KERNELRELEASE=2.6.27.4-$RELEASE-vanilla EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -474,6 +475,12 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp .config %buildroot/boot/config-$KERNELRELEASE +# Figure out where the symbols that vmlinux exports are defined. +# (We need this information below as well as in find-provides; we "annotate" +# the original Module.symvers here to make sure that we are consistent in +# both places.) +%_sourcedir/built-in-where < Module.symvers > Module.symvers.split +mv Module.symvers.split Module.symvers gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz if [ $CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -484,20 +491,6 @@ %endif echo "Consistency check error: please update supported.conf." fi - # Preserve exports from previous kernels when possible. - old_symsets=%my_builddir/kabi/$SUBARCH/symsets-vanilla.tar.gz - [ -e $old_symsets ] || old_symsets= - # Group the exported symbols listed in symvers.gz by directory, and - # create a database of sets. - { awk '$3 != "vmlinux" { print }' Module.symvers - # Find out in which built-in.o files the exported symbols that ended - # up in vmlinux were defined. - awk '$3 == "vmlinux" { print }' Module.symvers \ - | %_sourcedir/built-in-where - } | %_sourcedir/make-symsets \ - %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets || - [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] # Also put the resulting file in $obj_dir/$SUBARCH/vanilla # so that kernel-source + kernel-vanilla is sufficient for building # modules that have modversions as well. @@ -621,6 +614,39 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + exported_by_modules() { + local module + while read module; do + %_sourcedir/list-exported-symbols $RPM_BUILD_ROOT$module + done + } + mkdir %my_builddir/{base,main,extra} + ( awk '$3 == "vmlinux" || $3 ~ /\/built-in$/ { print }' Module.symvers + exported_by_modules < %my_builddir/base-modules + ) | %_sourcedir/split-into-symsets %my_builddir/base +%if %split_packages + exported_by_modules < %my_builddir/main-modules \ + | %_sourcedir/split-into-symsets %my_builddir/main + exported_by_modules < %my_builddir/unsupported-modules \ + | %_sourcedir/split-into-symsets %my_builddir/extra +%endif + # Notes: + # - We rely on list-exported-symbols to correctly extract all exported + # symbols from modules; Module.symvers is disregarded for that. + # - We recompute the symsets in find-provides. Take care to keep the + # algorithm the same in both places. + ## Preserve exports from previous kernels when possible. + #old_symsets=%my_builddir/kabi/$SUBARCH/symsets-vanilla.tar.gz + #[ -e $old_symsets ] || old_symsets= + # FIXME: implement + symsets=%my_builddir/symsets-$KERNELRELEASE + mkdir $symsets + find %my_builddir/{base,main,extra} -type f \ + | xargs --replace='{}' cp '{}' $symsets/ + tar c -C ${symsets%/*} ${symsets##*/} \ + | gzip -9 \ + > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz + # FIXME: check for abi changes # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ @@ -712,7 +738,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun base -f preun-base.sh @@ -746,7 +772,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun extra -f preun-extra.sh ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:13.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:13.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-xen (Version 2.6.27.3) +# spec file for package kernel-xen (Version 2.6.27.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ %if %{build_flavor} == "vanilla" %define build_vanilla 1 %endif -%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks}) +%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,list-exported-symbols,split-into-symsets,modversions,kabi-checks}) %define symbols %(set -- kernel-xen xen $(case xen in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define subarch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/xen$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -57,8 +57,8 @@ Name: kernel-xen Summary: The Xen Kernel -Version: 2.6.27.3 -Release: 2 +Version: 2.6.27.4 +Release: 1 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -97,8 +97,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.3 -Obsoletes: kernel-xenpae <= 2.6.27.3 +Provides: kernel-xenpae = 2.6.27.4 +Obsoletes: kernel-xenpae <= 2.6.27.4 %endif #!BuildIgnore: xen %endif @@ -123,7 +123,7 @@ %if %build_um #Conflicts: kernel %else -Provides: kernel = 2.6.27.3-%source_rel +Provides: kernel = 2.6.27.4-%source_rel %endif %ifarch %ix86 %else @@ -146,8 +146,9 @@ Source38: kabi-checks Source40: build-source-timestamp Source41: built-in-where -Source42: make-symsets -Source43: find-provides +Source42: list-exported-symbols +Source43: split-into-symsets +Source44: find-provides Source45: module-renames Source46: modversions Source100: config.tar.bz2 @@ -214,12 +215,12 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-xen-2.6.27.3.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.3.src.rpm." + echo "The kernel-xen-2.6.27.4.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.4.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -298,7 +299,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.27.3-$RELEASE-xen +KERNELRELEASE=2.6.27.4-$RELEASE-xen EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -458,6 +459,12 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp .config %buildroot/boot/config-$KERNELRELEASE +# Figure out where the symbols that vmlinux exports are defined. +# (We need this information below as well as in find-provides; we "annotate" +# the original Module.symvers here to make sure that we are consistent in +# both places.) +%_sourcedir/built-in-where < Module.symvers > Module.symvers.split +mv Module.symvers.split Module.symvers gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz if [ $CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot @@ -468,20 +475,6 @@ %endif echo "Consistency check error: please update supported.conf." fi - # Preserve exports from previous kernels when possible. - old_symsets=%my_builddir/kabi/$SUBARCH/symsets-xen.tar.gz - [ -e $old_symsets ] || old_symsets= - # Group the exported symbols listed in symvers.gz by directory, and - # create a database of sets. - { awk '$3 != "vmlinux" { print }' Module.symvers - # Find out in which built-in.o files the exported symbols that ended - # up in vmlinux were defined. - awk '$3 == "vmlinux" { print }' Module.symvers \ - | %_sourcedir/built-in-where - } | %_sourcedir/make-symsets \ - %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets || - [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] # Also put the resulting file in $obj_dir/$SUBARCH/xen # so that kernel-source + kernel-xen is sufficient for building # modules that have modversions as well. @@ -605,6 +598,39 @@ find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + exported_by_modules() { + local module + while read module; do + %_sourcedir/list-exported-symbols $RPM_BUILD_ROOT$module + done + } + mkdir %my_builddir/{base,main,extra} + ( awk '$3 == "vmlinux" || $3 ~ /\/built-in$/ { print }' Module.symvers + exported_by_modules < %my_builddir/base-modules + ) | %_sourcedir/split-into-symsets %my_builddir/base +%if %split_packages + exported_by_modules < %my_builddir/main-modules \ + | %_sourcedir/split-into-symsets %my_builddir/main + exported_by_modules < %my_builddir/unsupported-modules \ + | %_sourcedir/split-into-symsets %my_builddir/extra +%endif + # Notes: + # - We rely on list-exported-symbols to correctly extract all exported + # symbols from modules; Module.symvers is disregarded for that. + # - We recompute the symsets in find-provides. Take care to keep the + # algorithm the same in both places. + ## Preserve exports from previous kernels when possible. + #old_symsets=%my_builddir/kabi/$SUBARCH/symsets-xen.tar.gz + #[ -e $old_symsets ] || old_symsets= + # FIXME: implement + symsets=%my_builddir/symsets-$KERNELRELEASE + mkdir $symsets + find %my_builddir/{base,main,extra} -type f \ + | xargs --replace='{}' cp '{}' $symsets/ + tar c -C ${symsets%/*} ${symsets##*/} \ + | gzip -9 \ + > %buildroot/boot/symsets-$KERNELRELEASE.tar.gz + # FIXME: check for abi changes # Set up some module aliases install -d -m 755 %buildroot/etc/modprobe.d/ install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/ @@ -701,7 +727,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun base -f preun-base.sh @@ -740,7 +766,7 @@ -Source Timestamp: 2008-10-24 17:40:47 +0200 +Source Timestamp: 2008-10-27 19:53:11 +0100 %preun extra -f preun-extra.sh ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:14.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:14.000000000 +0100 @@ -1 +1 @@ -2008-10-24 17:40:47 +0200 +2008-10-27 19:53:11 +0100 ++++++ built-in-where ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:14.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:14.000000000 +0100 @@ -1,5 +1,7 @@ #! /bin/bash +sourcedir=${0%/*} + # A lot of symbols are exported by the main kernel image. Find out # more precisely which built-in.o file defines them, and fill in # that information in Module.symvers. (The built-in.o files are @@ -11,22 +13,44 @@ unset LANG ${!LC_*} # Create a table of all symbol export in a built-in.o file, e.g., -# mtrr_add arch/i386/kernel/cpu/mtrr/built-in +# 0xc87c1f84 ktime_get kernel/built-in EXPORT_SYMBOL_GPL built_in_exports() { - for obj in $(find -name built-in.o -printf '%P\n'); do - nm $obj \ - | sed -nre 's:(00000000)?([0-9a-f]+) A __crc_(.*):\3\t'"${obj%.o}:p" + # a/b/c/built-in.o gets linked into a/b/built-in.o, so ensure + # that we visit sub-directories first to split up symbols as + # much as possible. + for obj in $(find -name built-in.o -printf '%d %P\n' \ + | sort -r \ + | awk '{ print $2 }'); do + $sourcedir/list-exported-symbols -n ${obj%.o} $obj done + + # We could go through the libraries as well, but those functions + # are so unlikely to change that this wouldn't help. + # (All remaining symbols will end up in the vmlinux set.) + #for archive in $(find -name '*.a'); do + # $sourcedir/list-exported-symbols -n ${archive%.a} $archive + #done +} + +# Filter out duplicates from a Module.symvers dump +unique_symbols() { + awk ' + { if ($2 in seen) + next + seen[$2] = 1 + print + } + ' } # Join together the two tables, including all lines from the first -# file that don't have a match in the second. Finally remove the -# duplicate column. -join -t $'\t' -1 2 -2 1 -a 1 \ - <(cut -f1,2,3 | sort -k2) \ - <(built_in_exports | sort -k1) \ +# file that don't have a match in the second. +# Finally, remove the duplicate columns. +join -t $'\t' -j 2 -a 1 \ + <(sort -k2) \ + <(built_in_exports | unique_symbols | sort -k2) \ | awk ' BEGIN { FS = "\t" ; OFS = "\t" } -NF == 3 { print $2, $1, $3 } -NF == 4 { print $2, $1, $4 } +NF == 7 { print $2, $1, $6, $4 } +NF == 4 { print $2, $1, $3, $4 } ' ++++++ config.tar.bz2 ++++++ ++++++ find-provides ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:17.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:17.000000000 +0100 @@ -5,15 +5,27 @@ printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/find-provides "$@" +sourcedir=${0%/*} +flavor=${1##*-} + +tmpdir=$(mktemp -dt ${0##*/}.XXXXXXXXXX) +trap "rm -rf $tmpdir" EXIT + for file in "${filelist[@]}"; do - case "$file" in - */symsets-*.tar.gz) - flavor=${file%.tar.gz} - flavor=${flavor##*-} - for symset in $(tar tfz "$file" | grep -v '/$'); do - class=${symset##*/} ; class=${class%.*} - echo "kernel($flavor:$class) = ${symset##*.}" - done + case "$file" in + */boot/symvers-*.gz) + zcat "$file" \ + | awk '$3 == "vmlinux" || $3 ~ /\/built-in$/ { print }' ;; - esac + *.ko) + $sourcedir/list-exported-symbols $file + ;; + esac +done \ +| $sourcedir/split-into-symsets $tmpdir + +shopt -s nullglob +for symset in $tmpdir/*; do + class=${symset##*/} ; class=${class%.*} + echo "kernel($flavor:$class) = ${symset##*.}" done ++++++ kabi.tar.bz2 ++++++ ++++++ list-exported-symbols ++++++ #! /bin/sh # Generate a Module.symvers-like list of symbols a module exports. usage() { echo "USAGE: ${0##*/} [-n name] objfile" >&2 exit 1 } options=`getopt -o n: -- "$@"` [ $? -eq 0 ] || usage eval set -- "$options" while :; do case "$1" in -n) opt_n=$2 shift ;; --) shift break ;; esac shift done [ $# -eq 1 ] || usage if [ -z "$opt_n" ]; then opt_n=${1%.ko} opt_n=${opt_n#*/kernel/} fi objdump -t "$1" | awk ' BEGIN { known_types["__ksymtab"] = "EXPORT_SYMBOL" known_types["__ksymtab_unused"] = "EXPORT_UNUSED_SYMBOL" known_types["__ksymtab_gpl"] = "EXPORT_SYMBOL_GPL" known_types["__ksymtab_unused_gpl"] = "EXPORT_UNUSED_SYMBOL_GPL" known_types["__ksymtab_gpl_future"] = "EXPORT_SYMBOL_GPL_FUTURE" } { if (NF < 3) next if (substr($0, index($0, " ") + 6, 1) == "d") next # debug symbol if (gsub(/^__crc_/, "", $NF)) crcs[$NF] = gensub(/^00000000(.+)/, "\\1", "", $1) else if (gsub(/^__ksymtab_/, "", $NF) && ($(NF-2) in known_types)) types[$NF] = known_types[$(NF-2)] } END { for (sym in types) { crc = (sym in crcs ? crcs[sym] : "00000000") print "0x" crc "\t" sym "\t" module "\t" types[sym] } } ' module="$opt_n" ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:26.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:26.000000000 +0100 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:26.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:26.000000000 +0100 @@ -1 +1 @@ -6000 +6144 ++++++ patches.addon.tar.bz2 ++++++ ++++++ patches.apparmor.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/add-path_permission.diff new/patches.apparmor/add-path_permission.diff --- old/patches.apparmor/add-path_permission.diff 2008-10-24 17:41:46.000000000 +0200 +++ new/patches.apparmor/add-path_permission.diff 2008-10-26 10:58:59.000000000 +0100 @@ -187,7 +187,7 @@ --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1186,6 +1186,11 @@ extern void dentry_unhash(struct dentry +@@ -1189,6 +1189,11 @@ extern void dentry_unhash(struct dentry extern int file_permission(struct file *, int); /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/d_namespace_path.diff new/patches.apparmor/d_namespace_path.diff --- old/patches.apparmor/d_namespace_path.diff 2008-08-14 19:59:13.000000000 +0200 +++ new/patches.apparmor/d_namespace_path.diff 2008-10-26 10:58:59.000000000 +0100 @@ -15,7 +15,7 @@ --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -2352,3 +2352,33 @@ void __put_mnt_ns(struct mnt_namespace * +@@ -2357,3 +2357,33 @@ void __put_mnt_ns(struct mnt_namespace * release_mounts(&umount_list); kfree(ns); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/fsetattr.diff new/patches.apparmor/fsetattr.diff --- old/patches.apparmor/fsetattr.diff 2008-10-24 17:41:46.000000000 +0200 +++ new/patches.apparmor/fsetattr.diff 2008-10-26 10:58:59.000000000 +0100 @@ -382,7 +382,7 @@ --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -359,13 +359,6 @@ struct iattr { +@@ -362,13 +362,6 @@ struct iattr { struct timespec ia_atime; struct timespec ia_mtime; struct timespec ia_ctime; @@ -396,7 +396,7 @@ }; /* -@@ -1265,6 +1258,7 @@ struct file_operations { +@@ -1268,6 +1261,7 @@ struct file_operations { #define HAVE_FOP_OPEN_EXEC int (*open_exec) (struct inode *); int (*setlease)(struct file *, long, struct file_lock **); @@ -404,7 +404,7 @@ }; struct inode_operations { -@@ -1784,6 +1778,7 @@ extern int do_remount_sb(struct super_bl +@@ -1787,6 +1781,7 @@ extern int do_remount_sb(struct super_bl extern sector_t bmap(struct inode *, sector_t); #endif extern int notify_change(struct dentry *, struct vfsmount *, struct iattr *); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/fsetattr-restore-ia_file.diff new/patches.apparmor/fsetattr-restore-ia_file.diff --- old/patches.apparmor/fsetattr-restore-ia_file.diff 2008-10-14 15:54:49.000000000 +0200 +++ new/patches.apparmor/fsetattr-restore-ia_file.diff 2008-10-26 10:58:59.000000000 +0100 @@ -38,7 +38,7 @@ error = inode_change_ok(inode, attr); --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -359,6 +359,17 @@ struct iattr { +@@ -362,6 +362,17 @@ struct iattr { struct timespec ia_atime; struct timespec ia_mtime; struct timespec ia_ctime; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/sysctl-pathname.diff new/patches.apparmor/sysctl-pathname.diff --- old/patches.apparmor/sysctl-pathname.diff 2008-10-14 15:54:49.000000000 +0200 +++ new/patches.apparmor/sysctl-pathname.diff 2008-10-26 10:58:59.000000000 +0100 @@ -27,7 +27,7 @@ void __user *newval, size_t newlen); --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -1536,6 +1536,33 @@ void register_sysctl_root(struct ctl_tab +@@ -1544,6 +1544,33 @@ void register_sysctl_root(struct ctl_tab spin_unlock(&sysctl_lock); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-link.diff new/patches.apparmor/vfs-link.diff --- old/patches.apparmor/vfs-link.diff 2008-10-24 17:41:47.000000000 +0200 +++ new/patches.apparmor/vfs-link.diff 2008-10-26 10:58:59.000000000 +0100 @@ -80,7 +80,7 @@ err = nfserrno(nfsd_sync_dir(ddir)); --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1166,7 +1166,7 @@ extern int vfs_create(struct inode *, st +@@ -1169,7 +1169,7 @@ extern int vfs_create(struct inode *, st extern int vfs_mkdir(struct inode *, struct dentry *, struct vfsmount *, int); extern int vfs_mknod(struct inode *, struct dentry *, struct vfsmount *, int, dev_t); extern int vfs_symlink(struct inode *, struct dentry *, struct vfsmount *, const char *); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-mkdir.diff new/patches.apparmor/vfs-mkdir.diff --- old/patches.apparmor/vfs-mkdir.diff 2008-10-24 17:41:47.000000000 +0200 +++ new/patches.apparmor/vfs-mkdir.diff 2008-10-26 10:58:59.000000000 +0100 @@ -115,7 +115,7 @@ } --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1163,7 +1163,7 @@ extern void unlock_super(struct super_bl +@@ -1166,7 +1166,7 @@ extern void unlock_super(struct super_bl */ extern int vfs_permission(struct nameidata *, int); extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-mknod.diff new/patches.apparmor/vfs-mknod.diff --- old/patches.apparmor/vfs-mknod.diff 2008-10-24 17:41:47.000000000 +0200 +++ new/patches.apparmor/vfs-mknod.diff 2008-10-26 10:58:59.000000000 +0100 @@ -76,7 +76,7 @@ if (host_err < 0) { --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1164,7 +1164,7 @@ extern void unlock_super(struct super_bl +@@ -1167,7 +1167,7 @@ extern void unlock_super(struct super_bl extern int vfs_permission(struct nameidata *, int); extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *); extern int vfs_mkdir(struct inode *, struct dentry *, struct vfsmount *, int); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-notify_change.diff new/patches.apparmor/vfs-notify_change.diff --- old/patches.apparmor/vfs-notify_change.diff 2008-10-24 17:41:47.000000000 +0200 +++ new/patches.apparmor/vfs-notify_change.diff 2008-10-26 10:58:59.000000000 +0100 @@ -258,7 +258,7 @@ mnt_drop_write_and_out: --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1621,8 +1621,8 @@ static inline int break_lease(struct ino +@@ -1624,8 +1624,8 @@ static inline int break_lease(struct ino /* fs/open.c */ @@ -269,7 +269,7 @@ extern long do_sys_open(int dfd, const char __user *filename, int flags, int mode); extern struct file *filp_open(const char *, int, int); -@@ -1783,7 +1783,7 @@ extern int do_remount_sb(struct super_bl +@@ -1786,7 +1786,7 @@ extern int do_remount_sb(struct super_bl #ifdef CONFIG_BLOCK extern sector_t bmap(struct inode *, sector_t); #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-rename.diff new/patches.apparmor/vfs-rename.diff --- old/patches.apparmor/vfs-rename.diff 2008-10-24 17:41:47.000000000 +0200 +++ new/patches.apparmor/vfs-rename.diff 2008-10-26 10:58:59.000000000 +0100 @@ -114,7 +114,7 @@ if (!host_err) --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1169,7 +1169,7 @@ extern int vfs_symlink(struct inode *, s +@@ -1172,7 +1172,7 @@ extern int vfs_symlink(struct inode *, s extern int vfs_link(struct dentry *, struct vfsmount *, struct inode *, struct dentry *, struct vfsmount *); extern int vfs_rmdir(struct inode *, struct dentry *, struct vfsmount *); extern int vfs_unlink(struct inode *, struct dentry *, struct vfsmount *); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-rmdir.diff new/patches.apparmor/vfs-rmdir.diff --- old/patches.apparmor/vfs-rmdir.diff 2008-10-24 17:41:47.000000000 +0200 +++ new/patches.apparmor/vfs-rmdir.diff 2008-10-26 10:58:59.000000000 +0100 @@ -112,7 +112,7 @@ out_drop: --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1167,7 +1167,7 @@ extern int vfs_mkdir(struct inode *, str +@@ -1170,7 +1170,7 @@ extern int vfs_mkdir(struct inode *, str extern int vfs_mknod(struct inode *, struct dentry *, struct vfsmount *, int, dev_t); extern int vfs_symlink(struct inode *, struct dentry *, struct vfsmount *, const char *); extern int vfs_link(struct dentry *, struct vfsmount *, struct inode *, struct dentry *, struct vfsmount *); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-symlink.diff new/patches.apparmor/vfs-symlink.diff --- old/patches.apparmor/vfs-symlink.diff 2008-10-24 17:41:47.000000000 +0200 +++ new/patches.apparmor/vfs-symlink.diff 2008-10-26 10:58:59.000000000 +0100 @@ -112,7 +112,7 @@ out: --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1165,7 +1165,7 @@ extern int vfs_permission(struct nameida +@@ -1168,7 +1168,7 @@ extern int vfs_permission(struct nameida extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *); extern int vfs_mkdir(struct inode *, struct dentry *, struct vfsmount *, int); extern int vfs_mknod(struct inode *, struct dentry *, struct vfsmount *, int, dev_t); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-unlink.diff new/patches.apparmor/vfs-unlink.diff --- old/patches.apparmor/vfs-unlink.diff 2008-10-24 17:41:47.000000000 +0200 +++ new/patches.apparmor/vfs-unlink.diff 2008-10-26 10:58:59.000000000 +0100 @@ -77,7 +77,7 @@ } --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1168,7 +1168,7 @@ extern int vfs_mknod(struct inode *, str +@@ -1171,7 +1171,7 @@ extern int vfs_mknod(struct inode *, str extern int vfs_symlink(struct inode *, struct dentry *, struct vfsmount *, const char *); extern int vfs_link(struct dentry *, struct vfsmount *, struct inode *, struct dentry *, struct vfsmount *); extern int vfs_rmdir(struct inode *, struct dentry *, struct vfsmount *); ++++++ patches.arch.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/s390-02-02-smp-sysdev.patch new/patches.arch/s390-02-02-smp-sysdev.patch --- old/patches.arch/s390-02-02-smp-sysdev.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/s390-02-02-smp-sysdev.patch 2008-10-25 18:59:38.000000000 +0200 @@ -0,0 +1,86 @@ +From: Gerald Schaefer <geraldsc(a)de.ibm.com> +Subject: kernel: sysdev class file creation +References: bnc#434333 + +Symptom: Kernel panic, data corruption if the user accesses files in + /sys/devices/system/cpu. +Problem: The sysdev class attributes where registered with sysfs_file_create + instead of sysdev_class_create_file. The show and store functions + of sysdev class files and sysfs files have a different number of + parameters. In particular the pointer to the buffer is the last + argument and therefore accesses to random memory regions happened. +Solution: Use correct function to register attributes. + +Acked-by: John Jolly <jjolly(a)suse.de> +--- + arch/s390/kernel/smp.c | 24 +++++++++--------------- + 1 file changed, 9 insertions(+), 15 deletions(-) + +Index: linux-sles11/arch/s390/kernel/smp.c +=================================================================== +--- linux-sles11.orig/arch/s390/kernel/smp.c ++++ linux-sles11/arch/s390/kernel/smp.c +@@ -1116,9 +1116,7 @@ out: + return rc; + } + +-static ssize_t __ref rescan_store(struct sys_device *dev, +- struct sysdev_attribute *attr, +- const char *buf, ++static ssize_t __ref rescan_store(struct sysdev_class *class, const char *buf, + size_t count) + { + int rc; +@@ -1126,12 +1124,10 @@ static ssize_t __ref rescan_store(struct + rc = smp_rescan_cpus(); + return rc ? rc : count; + } +-static SYSDEV_ATTR(rescan, 0200, NULL, rescan_store); ++static SYSDEV_CLASS_ATTR(rescan, 0200, NULL, rescan_store); + #endif /* CONFIG_HOTPLUG_CPU */ + +-static ssize_t dispatching_show(struct sys_device *dev, +- struct sysdev_attribute *attr, +- char *buf) ++static ssize_t dispatching_show(struct sysdev_class *class, char *buf) + { + ssize_t count; + +@@ -1141,9 +1137,8 @@ static ssize_t dispatching_show(struct s + return count; + } + +-static ssize_t dispatching_store(struct sys_device *dev, +- struct sysdev_attribute *attr, +- const char *buf, size_t count) ++static ssize_t dispatching_store(struct sysdev_class *dev, const char *buf, ++ size_t count) + { + int val, rc; + char delim; +@@ -1165,7 +1160,8 @@ out: + put_online_cpus(); + return rc ? rc : count; + } +-static SYSDEV_ATTR(dispatching, 0644, dispatching_show, dispatching_store); ++static SYSDEV_CLASS_ATTR(dispatching, 0644, dispatching_show, ++ dispatching_store); + + static int __init topology_init(void) + { +@@ -1175,13 +1171,11 @@ static int __init topology_init(void) + register_cpu_notifier(&smp_cpu_nb); + + #ifdef CONFIG_HOTPLUG_CPU +- rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj, +- &attr_rescan.attr); ++ rc = sysdev_class_create_file(&cpu_sysdev_class, &attr_rescan); + if (rc) + return rc; + #endif +- rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj, +- &attr_dispatching.attr); ++ rc = sysdev_class_create_file(&cpu_sysdev_class, &attr_dispatching); + if (rc) + return rc; + for_each_present_cpu(cpu) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/s390-02-03-zfcp.patch new/patches.arch/s390-02-03-zfcp.patch --- old/patches.arch/s390-02-03-zfcp.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/s390-02-03-zfcp.patch 2008-10-25 18:59:38.000000000 +0200 @@ -0,0 +1,87 @@ +From: Gerald Schaefer <geraldsc(a)de.ibm.com> +Subject: Fix zfcp problems that have been found +References: bnc#434333 + +Symptom: lock dependency warnings and flaws found during code review +Problem: various small zfcp problems +Solution: fix zfcp problems + - SCSI command times out on "deleted scsi device" + - fix memory leak for status_read requests + - locking for req_list + - fix error path for failed request send + +Acked-by: John Jolly <jjolly(a)suse.de> +--- + drivers/s390/scsi/zfcp_fsf.c | 23 ++++++++++------------- + drivers/s390/scsi/zfcp_scsi.c | 12 ++++-------- + 2 files changed, 14 insertions(+), 21 deletions(-) + +--- a/drivers/s390/scsi/zfcp_scsi.c 2008-10-15 16:39:08.000000000 +0200 ++++ b/drivers/s390/scsi/zfcp_scsi.c 2008-10-15 16:39:08.000000000 +0200 +@@ -26,14 +26,10 @@ char *zfcp_get_fcp_sns_info_ptr(struct f + static void zfcp_scsi_slave_destroy(struct scsi_device *sdpnt) + { + struct zfcp_unit *unit = (struct zfcp_unit *) sdpnt->hostdata; +- WARN_ON(!unit); +- if (unit) { +- atomic_clear_mask(ZFCP_STATUS_UNIT_REGISTERED, &unit->status); +- sdpnt->hostdata = NULL; +- unit->device = NULL; +- zfcp_erp_unit_failed(unit, 12, NULL); +- zfcp_unit_put(unit); +- } ++ atomic_clear_mask(ZFCP_STATUS_UNIT_REGISTERED, &unit->status); ++ unit->device = NULL; ++ zfcp_erp_unit_failed(unit, 12, NULL); ++ zfcp_unit_put(unit); + } + + static int zfcp_scsi_slave_configure(struct scsi_device *sdp) +--- a/drivers/s390/scsi/zfcp_fsf.c 2008-10-15 16:39:08.000000000 +0200 ++++ b/drivers/s390/scsi/zfcp_fsf.c 2008-10-15 16:40:11.000000000 +0200 +@@ -685,6 +685,7 @@ static struct zfcp_fsf_req *zfcp_fsf_all + if (!req) + return NULL; + memset(req, 0, sizeof(*req)); ++ req->pool = pool; + return req; + } + +@@ -771,28 +772,24 @@ static struct zfcp_fsf_req *zfcp_fsf_req + static int zfcp_fsf_req_send(struct zfcp_fsf_req *req) + { + struct zfcp_adapter *adapter = req->adapter; +- struct zfcp_qdio_queue *req_q = &adapter->req_q; ++ unsigned long flags; + int idx; + + /* put allocated FSF request into hash table */ +- spin_lock(&adapter->req_list_lock); ++ spin_lock_irqsave(&adapter->req_list_lock, flags); + idx = zfcp_reqlist_hash(req->req_id); + list_add_tail(&req->list, &adapter->req_list[idx]); +- spin_unlock(&adapter->req_list_lock); ++ spin_unlock_irqrestore(&adapter->req_list_lock, flags); + +- req->qdio_outb_usage = atomic_read(&req_q->count); ++ req->qdio_outb_usage = atomic_read(&adapter->req_q.count); + req->issued = get_clock(); + if (zfcp_qdio_send(req)) { +- /* Queues are down..... */ + del_timer(&req->timer); +- spin_lock(&adapter->req_list_lock); +- zfcp_reqlist_remove(adapter, req); +- spin_unlock(&adapter->req_list_lock); +- /* undo changes in request queue made for this request */ +- atomic_add(req->sbal_number, &req_q->count); +- req_q->first -= req->sbal_number; +- req_q->first += QDIO_MAX_BUFFERS_PER_Q; +- req_q->first %= QDIO_MAX_BUFFERS_PER_Q; /* wrap */ ++ spin_lock_irqsave(&adapter->req_list_lock, flags); ++ /* lookup request again, list might have changed */ ++ if (zfcp_reqlist_find_safe(adapter, req)) ++ zfcp_reqlist_remove(adapter, req); ++ spin_unlock_irqrestore(&adapter->req_list_lock, flags); + zfcp_erp_adapter_reopen(adapter, 0, 116, req); + return -EIO; + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/s390-02-04-qeth-mac.patch new/patches.arch/s390-02-04-qeth-mac.patch --- old/patches.arch/s390-02-04-qeth-mac.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/s390-02-04-qeth-mac.patch 2008-10-25 18:59:38.000000000 +0200 @@ -0,0 +1,31 @@ +From: Gerald Schaefer <geraldsc(a)de.ibm.com> +Subject: qeth: use firmware MAC-address for layer2 hsi-devices +References: bnc#434333 + +Symptom: Real HiperSocket devices in layer2 show random MAC-address. +Problem: Usability +Solution: Use firmware MAC-address + +Signed-off-by: Ursula Braun <ursula.braun(a)de.ibm.com> +Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com> + +Acked-by: John Jolly <jjolly(a)suse.de> +--- + + drivers/s390/net/qeth_l2_main.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: linux-sles11/drivers/s390/net/qeth_l2_main.c +=================================================================== +--- linux-sles11.orig/drivers/s390/net/qeth_l2_main.c ++++ linux-sles11/drivers/s390/net/qeth_l2_main.c +@@ -562,7 +562,8 @@ static int qeth_l2_request_initial_mac(s + "device %s: x%x\n", CARD_BUS_ID(card), rc); + } + +- if (card->info.guestlan) { ++ if ((card->info.type == QETH_CARD_TYPE_IQD) || ++ (card->info.guestlan)) { + rc = qeth_setadpparms_change_macaddr(card); + if (rc) { + QETH_DBF_MESSAGE(2, "couldn't get MAC address on " diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/s390-02-05-qeth-recovery.patch new/patches.arch/s390-02-05-qeth-recovery.patch --- old/patches.arch/s390-02-05-qeth-recovery.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/s390-02-05-qeth-recovery.patch 2008-10-25 18:59:38.000000000 +0200 @@ -0,0 +1,133 @@ +From: Gerald Schaefer <geraldsc(a)de.ibm.com> +Subject: qeth: qeth recovery fails +References: bnc#434333 + +Symptom: Device is not functional after a recovery +Problem: The handling of the IFF flags changed in 2.6.27 code +Solution: Do not touch IFF_UP flag during qeth recovery, but invoke + dev_close() in case of failing recovery. + Cancel outstanding control commands in case of Data Checks or + Channel Checks. + Do not invoke qeth_l2_del_all_mc() in case of a hard stop to speed + up removal of qeth devices. + +Signed-off-by: Ursula Braun <ursula.braun(a)de.ibm.com> +Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com> + +Acked-by: John Jolly <jjolly(a)suse.de> +--- + + drivers/s390/net/qeth_core_main.c | 4 +++- + drivers/s390/net/qeth_l2_main.c | 11 +++++++---- + drivers/s390/net/qeth_l3_main.c | 8 +++++--- + 3 files changed, 15 insertions(+), 8 deletions(-) + +Index: linux-sles11/drivers/s390/net/qeth_core_main.c +=================================================================== +--- linux-sles11.orig/drivers/s390/net/qeth_core_main.c ++++ linux-sles11/drivers/s390/net/qeth_core_main.c +@@ -767,7 +767,7 @@ static int qeth_get_problem(struct ccw_d + if (sense[SENSE_COMMAND_REJECT_BYTE] & + SENSE_COMMAND_REJECT_FLAG) { + QETH_DBF_TEXT(TRACE, 2, "CMDREJi"); +- return 0; ++ return 1; + } + if ((sense[2] == 0xaf) && (sense[3] == 0xfe)) { + QETH_DBF_TEXT(TRACE, 2, "AFFE"); +@@ -895,6 +895,7 @@ static void qeth_irq(struct ccw_device * + } + rc = qeth_get_problem(cdev, irb); + if (rc) { ++ qeth_clear_ipacmd_list(card); + qeth_schedule_recovery(card); + goto out; + } +@@ -4160,6 +4161,7 @@ static void qeth_core_remove_device(stru + unsigned long flags; + struct qeth_card *card = dev_get_drvdata(&gdev->dev); + ++ QETH_DBF_TEXT(SETUP, 2, "removedv"); + if (card->discipline.ccwgdriver) { + card->discipline.ccwgdriver->remove(gdev); + qeth_core_free_discipline(card); +Index: linux-sles11/drivers/s390/net/qeth_l2_main.c +=================================================================== +--- linux-sles11.orig/drivers/s390/net/qeth_l2_main.c ++++ linux-sles11/drivers/s390/net/qeth_l2_main.c +@@ -397,7 +397,8 @@ static int qeth_l2_stop_card(struct qeth + } + if (card->state == CARD_STATE_SOFTSETUP) { + qeth_l2_process_vlans(card, 1); +- qeth_l2_del_all_mc(card); ++ if (!card->use_hard_stop) ++ qeth_l2_del_all_mc(card); + qeth_clear_ipacmd_list(card); + card->state = CARD_STATE_HARDSETUP; + } +@@ -829,7 +830,6 @@ static int qeth_l2_open(struct net_devic + } + card->data.state = CH_STATE_UP; + card->state = CARD_STATE_UP; +- card->dev->flags |= IFF_UP; + netif_start_queue(dev); + + if (!card->lan_online && netif_carrier_ok(dev)) +@@ -844,7 +844,6 @@ static int qeth_l2_stop(struct net_devic + + QETH_DBF_TEXT(TRACE, 4, "qethstop"); + netif_tx_disable(dev); +- card->dev->flags &= ~IFF_UP; + if (card->state == CARD_STATE_UP) + card->state = CARD_STATE_SOFTSETUP; + return 0; +@@ -1136,9 +1135,13 @@ static int qeth_l2_recover(void *ptr) + if (!rc) + dev_info(&card->gdev->dev, + "Device successfully recovered!\n"); +- else ++ else { ++ rtnl_lock(); ++ dev_close(card->dev); ++ rtnl_unlock(); + dev_warn(&card->gdev->dev, "The qeth device driver " + "failed to recover an error on the device\n"); ++ } + return 0; + } + +Index: linux-sles11/drivers/s390/net/qeth_l3_main.c +=================================================================== +--- linux-sles11.orig/drivers/s390/net/qeth_l3_main.c ++++ linux-sles11/drivers/s390/net/qeth_l3_main.c +@@ -2804,7 +2804,6 @@ static int qeth_l3_open(struct net_devic + return -ENODEV; + card->data.state = CH_STATE_UP; + card->state = CARD_STATE_UP; +- card->dev->flags |= IFF_UP; + netif_start_queue(dev); + + if (!card->lan_online && netif_carrier_ok(dev)) +@@ -2818,7 +2817,6 @@ static int qeth_l3_stop(struct net_devic + + QETH_DBF_TEXT(TRACE, 4, "qethstop"); + netif_tx_disable(dev); +- card->dev->flags &= ~IFF_UP; + if (card->state == CARD_STATE_UP) + card->state = CARD_STATE_SOFTSETUP; + return 0; +@@ -3222,9 +3220,13 @@ static int qeth_l3_recover(void *ptr) + if (!rc) + dev_info(&card->gdev->dev, + "Device successfully recovered!\n"); +- else ++ else { ++ rtnl_lock(); ++ dev_close(card->dev); ++ rtnl_unlock(); + dev_warn(&card->gdev->dev, "The qeth device driver " + "failed to recover an error on the device\n"); ++ } + return 0; + } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/s390-02-06-qeth-offset.patch new/patches.arch/s390-02-06-qeth-offset.patch --- old/patches.arch/s390-02-06-qeth-offset.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/s390-02-06-qeth-offset.patch 2008-10-25 18:59:38.000000000 +0200 @@ -0,0 +1,38 @@ +From: Gerald Schaefer <geraldsc(a)de.ibm.com> +Subject: qeth: fix offset error in non prealloc header path +References: bnc#434333,LTC#48840 + +Symptom: bad or no VSWITCH/guest lan network traffic +Problem: Offset error in the non prealloc header path +Solution: For the non preallocated qeth header code path we should not + change the header length. + +Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com> + +Acked-by: John Jolly <jjolly(a)suse.de> +--- + + drivers/s390/net/qeth_core_main.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: linux-sles11/drivers/s390/net/qeth_core_main.c +=================================================================== +--- linux-sles11.orig/drivers/s390/net/qeth_core_main.c ++++ linux-sles11/drivers/s390/net/qeth_core_main.c +@@ -3034,7 +3034,7 @@ static inline void __qeth_fill_buffer(st + struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill, + int offset) + { +- int length = skb->len - offset; ++ int length = skb->len; + int length_here; + int element; + char *data; +@@ -3046,6 +3046,7 @@ static inline void __qeth_fill_buffer(st + + if (offset >= 0) { + data = skb->data + offset; ++ length -= offset; + first_lap = 0; + } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/s390-02-07-qeth-ipv6check.patch new/patches.arch/s390-02-07-qeth-ipv6check.patch --- old/patches.arch/s390-02-07-qeth-ipv6check.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/s390-02-07-qeth-ipv6check.patch 2008-10-25 18:59:38.000000000 +0200 @@ -0,0 +1,42 @@ +From: Gerald Schaefer <geraldsc(a)de.ibm.com> +Subject: qeth: remove unnecessary support ckeck in sysfs route6 +References: bnc#434333 + +Symptom: route6 attribute can not be set in initial device condition +Problem: Usability +Solution: Remove this check improves usability because you do not have to + set the device online to initially set ipv6 routing option. + +Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com> + +Acked-by: John Jolly <jjolly(a)suse.de> +--- + + drivers/s390/net/qeth_l3_sys.c | 7 ------- + 1 file changed, 7 deletions(-) + +Index: linux-sles11/drivers/s390/net/qeth_l3_sys.c +=================================================================== +--- linux-sles11.orig/drivers/s390/net/qeth_l3_sys.c ++++ linux-sles11/drivers/s390/net/qeth_l3_sys.c +@@ -121,9 +121,6 @@ static ssize_t qeth_l3_dev_route6_show(s + if (!card) + return -EINVAL; + +- if (!qeth_is_supported(card, IPA_IPV6)) +- return sprintf(buf, "%s\n", "n/a"); +- + return qeth_l3_dev_route_show(card, &card->options.route6, buf); + } + +@@ -135,10 +132,6 @@ static ssize_t qeth_l3_dev_route6_store( + if (!card) + return -EINVAL; + +- if (!qeth_is_supported(card, IPA_IPV6)) { +- return -EOPNOTSUPP; +- } +- + return qeth_l3_dev_route_store(card, &card->options.route6, + QETH_PROT_IPV6, buf, count); + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/s390-02-08-qeth-panic.patch new/patches.arch/s390-02-08-qeth-panic.patch --- old/patches.arch/s390-02-08-qeth-panic.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/s390-02-08-qeth-panic.patch 2008-10-25 18:59:38.000000000 +0200 @@ -0,0 +1,43 @@ +From: Gerald Schaefer <geraldsc(a)de.ibm.com> +Subject: qeth: avoid skb_under_panic for malformatted inbound data +References: bnc#434333 + +Symptom: kernel dump +Problem: malformatted inbound packets due to hardware problems +Solution: make the qeth driver more robust in case of malformatted inbound + packets due to hardware problems, an additional check for + OSN-card-type is added for OSN-type packets. + +Signed-off-by: Ursula Braun <ursula.braun(a)de.ibm.com> + +Acked-by: John Jolly <jjolly(a)suse.de> +--- + + drivers/s390/net/qeth_l2_main.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +Index: linux-sles11/drivers/s390/net/qeth_l2_main.c +=================================================================== +--- linux-sles11.orig/drivers/s390/net/qeth_l2_main.c ++++ linux-sles11/drivers/s390/net/qeth_l2_main.c +@@ -453,12 +453,15 @@ static void qeth_l2_process_inbound_buff + netif_rx(skb); + break; + case QETH_HEADER_TYPE_OSN: +- skb_push(skb, sizeof(struct qeth_hdr)); +- skb_copy_to_linear_data(skb, hdr, ++ if (card->info.type == QETH_CARD_TYPE_OSN) { ++ skb_push(skb, sizeof(struct qeth_hdr)); ++ skb_copy_to_linear_data(skb, hdr, + sizeof(struct qeth_hdr)); +- len = skb->len; +- card->osn_info.data_cb(skb); +- break; ++ len = skb->len; ++ card->osn_info.data_cb(skb); ++ break; ++ } ++ /* else unknown */ + default: + dev_kfree_skb_any(skb); + QETH_DBF_TEXT(TRACE, 3, "inbunkno"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/s390-02-09-tape-lock.patch new/patches.arch/s390-02-09-tape-lock.patch --- old/patches.arch/s390-02-09-tape-lock.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/s390-02-09-tape-lock.patch 2008-10-25 18:59:38.000000000 +0200 @@ -0,0 +1,87 @@ +From: Gerald Schaefer <geraldsc(a)de.ibm.com> +Subject: tape device driver: improve locking +References: bnc#434333 + +Symptom: 1. message "Badness at include/linux/blkdev.h" + 2. lockdep message "INFO: inconsistent lock state" +Problem: 1. Tape block device driver does not hold request queue lock + when completing request via __blk_end_request. + 2. During open() processing tape device driver receives + interrupt while holding the tape device lock. +Solution: 1. Use blk_end_request rather than __blk_end_request + 2. Use spin_lock_irq to disable interrupts rather than spin_lock. + +Acked-by: John Jolly <jjolly(a)suse.de> +--- + drivers/s390/char/tape_block.c | 6 ++++-- + drivers/s390/char/tape_core.c | 8 ++++---- + 2 files changed, 8 insertions(+), 6 deletions(-) + +Index: temp_orig/drivers/s390/char/tape_block.c +=================================================================== +--- temp_orig.orig/drivers/s390/char/tape_block.c ++++ temp_orig/drivers/s390/char/tape_block.c +@@ -76,7 +76,7 @@ tapeblock_trigger_requeue(struct tape_de + static void + tapeblock_end_request(struct request *req, int error) + { +- if (__blk_end_request(req, error, blk_rq_bytes(req))) ++ if (blk_end_request(req, error, blk_rq_bytes(req))) + BUG(); + } + +@@ -166,7 +166,7 @@ tapeblock_requeue(struct work_struct *wo + nr_queued++; + spin_unlock(get_ccwdev_lock(device->cdev)); + +- spin_lock(&device->blk_data.request_queue_lock); ++ spin_lock_irq(&device->blk_data.request_queue_lock); + while ( + !blk_queue_plugged(queue) && + elv_next_request(queue) && +@@ -176,7 +176,9 @@ tapeblock_requeue(struct work_struct *wo + if (rq_data_dir(req) == WRITE) { + DBF_EVENT(1, "TBLOCK: Rejecting write request\n"); + blkdev_dequeue_request(req); ++ spin_unlock_irq(&device->blk_data.request_queue_lock); + tapeblock_end_request(req, -EIO); ++ spin_lock_irq(&device->blk_data.request_queue_lock); + continue; + } + blkdev_dequeue_request(req); +Index: temp_orig/drivers/s390/char/tape_core.c +=================================================================== +--- temp_orig.orig/drivers/s390/char/tape_core.c ++++ temp_orig/drivers/s390/char/tape_core.c +@@ -1199,7 +1199,7 @@ tape_open(struct tape_device *device) + { + int rc; + +- spin_lock(get_ccwdev_lock(device->cdev)); ++ spin_lock_irq(get_ccwdev_lock(device->cdev)); + if (device->tape_state == TS_NOT_OPER) { + DBF_EVENT(6, "TAPE:nodev\n"); + rc = -ENODEV; +@@ -1217,7 +1217,7 @@ tape_open(struct tape_device *device) + tape_state_set(device, TS_IN_USE); + rc = 0; + } +- spin_unlock(get_ccwdev_lock(device->cdev)); ++ spin_unlock_irq(get_ccwdev_lock(device->cdev)); + return rc; + } + +@@ -1227,11 +1227,11 @@ tape_open(struct tape_device *device) + int + tape_release(struct tape_device *device) + { +- spin_lock(get_ccwdev_lock(device->cdev)); ++ spin_lock_irq(get_ccwdev_lock(device->cdev)); + if (device->tape_state == TS_IN_USE) + tape_state_set(device, TS_UNUSED); + module_put(device->discipline->owner); +- spin_unlock(get_ccwdev_lock(device->cdev)); ++ spin_unlock_irq(get_ccwdev_lock(device->cdev)); + return 0; + } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86_uv_early_detect.patch new/patches.arch/x86_uv_early_detect.patch --- old/patches.arch/x86_uv_early_detect.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/x86_uv_early_detect.patch 2008-10-27 14:13:29.000000000 +0100 @@ -0,0 +1,212 @@ +From: Jack Steiner <steiner(a)sgi.com> +Subject: Delete hacks that were necessary while waiting for x2apic code. +References: bnc#429984 +Patch-Mainline: should be in 2.6.28 + +Bug fixes related to mapping UV memory MMRs. + +Fix large APIC ids in SRAT. + +Use the correct memory allocator. Originally, uv_system_init was +called early & used the boot memory allocation. Community restructuring +move the call later - use kmalloc. + +These fixes were posted as: + http://marc.info/?l=linux-kernel&m=122217746109578&w=2 + http://marc.info/?l=linux-kernel&m=122234718018066&w=2 + http://marc.info/?l=linux-kernel&m=122480249023345&w=2 + http://lkml.org/lkml/2008/7/18/384 + +The fixes were commited to linux-2.6 with: + d2f904bb9a1ba88a58a03612abd8c6c54bdaf73a genx2apic_uv_x.c + 8da077d6f31da291ee3a7dd559671cb8ca48cbe2 genx2apic_uv_x.c + 2e42060c19cb79adacc48beb5e9ec5361df976a2 srat_64.c + +The last fix (http://lkml.org/lkml/2008/7/18/384) has not yet been accepted into +linux-2.6. I'll post the commit id when it is available. + +Signed-off-by: Thomas Renninger <trenn(a)suse.de> + +--- + arch/x86/kernel/genx2apic_uv_x.c | 58 +++++++++++++++++++-------------------- + arch/x86/mm/srat_64.c | 2 - + 2 files changed, 30 insertions(+), 30 deletions(-) + +Index: linux/arch/x86/kernel/genx2apic_uv_x.c +=================================================================== +--- linux.orig/arch/x86/kernel/genx2apic_uv_x.c 2008-10-24 13:10:30.000000000 -0500 ++++ linux/arch/x86/kernel/genx2apic_uv_x.c 2008-10-24 13:35:17.000000000 -0500 +@@ -17,7 +17,6 @@ + #include <linux/ctype.h> + #include <linux/init.h> + #include <linux/sched.h> +-#include <linux/bootmem.h> + #include <linux/module.h> + #include <linux/hardirq.h> + #include <asm/idle.h> +@@ -205,12 +204,10 @@ static unsigned int phys_pkg_id(int inde + return uv_read_apic_id() >> index_msb; + } + +-#ifdef ZZZ /* Needs x2apic patch */ + static void uv_send_IPI_self(int vector) + { + apic_write(APIC_SELF_IPI, vector); + } +-#endif + + struct genapic apic_x2apic_uv_x = { + .name = "UV large system", +@@ -224,7 +221,7 @@ struct genapic apic_x2apic_uv_x = { + .send_IPI_all = uv_send_IPI_all, + .send_IPI_allbutself = uv_send_IPI_allbutself, + .send_IPI_mask = uv_send_IPI_mask, +- /* ZZZ.send_IPI_self = uv_send_IPI_self, */ ++ .send_IPI_self = uv_send_IPI_self, + .cpu_mask_to_apicid = uv_cpu_mask_to_apicid, + .phys_pkg_id = phys_pkg_id, /* Fixme ZZZ */ + .get_apic_id = get_apic_id, +@@ -289,12 +286,13 @@ static __init void map_low_mmrs(void) + + enum map_type {map_wb, map_uc}; + +-static __init void map_high(char *id, unsigned long base, int shift, enum map_type map_type) ++static __init void map_high(char *id, unsigned long base, int shift, ++ int max_pnode, enum map_type map_type) + { + unsigned long bytes, paddr; + + paddr = base << shift; +- bytes = (1UL << shift); ++ bytes = (1UL << shift) * (max_pnode + 1); + printk(KERN_INFO "UV: Map %s_HI 0x%lx - 0x%lx\n", id, paddr, + paddr + bytes); + if (map_type == map_uc) +@@ -310,7 +308,7 @@ static __init void map_gru_high(int max_ + + gru.v = uv_read_local_mmr(UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR); + if (gru.s.enable) +- map_high("GRU", gru.s.base, shift, map_wb); ++ map_high("GRU", gru.s.base, shift, max_pnode, map_wb); + } + + static __init void map_config_high(int max_pnode) +@@ -320,7 +318,7 @@ static __init void map_config_high(int m + + cfg.v = uv_read_local_mmr(UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR); + if (cfg.s.enable) +- map_high("CONFIG", cfg.s.base, shift, map_uc); ++ map_high("CONFIG", cfg.s.base, shift, max_pnode, map_uc); + } + + static __init void map_mmr_high(int max_pnode) +@@ -330,7 +328,7 @@ static __init void map_mmr_high(int max_ + + mmr.v = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR); + if (mmr.s.enable) +- map_high("MMR", mmr.s.base, shift, map_uc); ++ map_high("MMR", mmr.s.base, shift, max_pnode, map_uc); + } + + static __init void map_mmioh_high(int max_pnode) +@@ -340,7 +338,7 @@ static __init void map_mmioh_high(int ma + + mmioh.v = uv_read_local_mmr(UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR); + if (mmioh.s.enable) +- map_high("MMIOH", mmioh.s.base, shift, map_uc); ++ map_high("MMIOH", mmioh.s.base, shift, max_pnode, map_uc); + } + + static __init void uv_rtc_init(void) +@@ -379,7 +377,22 @@ static void uv_display_heartbeat(void) + } + #endif + +-static bool uv_system_inited; ++/* ++ * Called on each cpu to initialize the per_cpu UV data area. ++ * ZZZ hotplug not supported yet ++ */ ++void __cpuinit uv_cpu_init(void) ++{ ++ /* CPU 0 initilization will be done via uv_system_init. */ ++ if (!uv_blade_info) ++ return; ++ ++ uv_blade_info[uv_numa_blade_id()].nr_online_cpus++; ++ ++ if (get_uv_system_type() == UV_NON_UNIQUE_APIC) ++ set_x2apic_extra_bits(uv_hub_info->pnode); ++} ++ + + void __init uv_system_init(void) + { +@@ -406,16 +419,16 @@ void __init uv_system_init(void) + printk(KERN_DEBUG "UV: Found %d blades\n", uv_num_possible_blades()); + + bytes = sizeof(struct uv_blade_info) * uv_num_possible_blades(); +- uv_blade_info = alloc_bootmem_pages(bytes); ++ uv_blade_info = kmalloc(bytes, GFP_KERNEL); + + get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size); + + bytes = sizeof(uv_node_to_blade[0]) * num_possible_nodes(); +- uv_node_to_blade = alloc_bootmem_pages(bytes); ++ uv_node_to_blade = kmalloc(bytes, GFP_KERNEL); + memset(uv_node_to_blade, 255, bytes); + + bytes = sizeof(uv_cpu_to_blade[0]) * num_possible_cpus(); +- uv_cpu_to_blade = alloc_bootmem_pages(bytes); ++ uv_cpu_to_blade = kmalloc(bytes, GFP_KERNEL); + memset(uv_cpu_to_blade, 255, bytes); + + blade = 0; +@@ -474,11 +487,12 @@ void __init uv_system_init(void) + map_mmr_high(max_pnode); + map_config_high(max_pnode); + map_mmioh_high(max_pnode); +- uv_system_inited = true; + + /* enable post-smp_cpus_done processing */ + smp_cpus_done_system = uv_start_system; + ++ uv_cpu_init(); ++ + #ifdef CONFIG_CLOCKSOURCE_WATCHDOG + /* enable heartbeat display callback */ + display_heartbeat = uv_display_heartbeat; +@@ -489,20 +503,6 @@ void __init uv_system_init(void) + } + + /* +- * Called on each cpu to initialize the per_cpu UV data area. +- * ZZZ hotplug not supported yet +- */ +-void __cpuinit uv_cpu_init(void) +-{ +- BUG_ON(!uv_system_inited); +- +- uv_blade_info[uv_numa_blade_id()].nr_online_cpus++; +- +- if (get_uv_system_type() == UV_NON_UNIQUE_APIC) +- set_x2apic_extra_bits(uv_hub_info->pnode); +-} +- +-/* + * Illuminate "activity" LED when CPU is going "active", + * extinguish when going "idle". + */ +Index: linux/arch/x86/mm/srat_64.c +=================================================================== +--- linux.orig/arch/x86/mm/srat_64.c 2008-10-24 13:10:30.000000000 -0500 ++++ linux/arch/x86/mm/srat_64.c 2008-10-24 13:35:12.000000000 -0500 +@@ -138,7 +138,7 @@ acpi_numa_processor_affinity_init(struct + return; + } + +- if (is_uv_system()) ++ if (get_uv_system_type() >= UV_X2APIC) + apic_id = (pa->apic_id << 8) | pa->local_sapic_eid; + else + apic_id = pa->apic_id; ++++++ patches.drivers.tar.bz2 ++++++ ++++ 14394 lines of diff (skipped) ++++++ patches.fixes.tar.bz2 ++++++ ++++ 2628 lines of diff (skipped) ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 1900 lines of diff (skipped) ++++++ patches.rpmify.tar.bz2 ++++++ ++++++ patches.rt.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ ++++ 4506 lines of diff (skipped) ++++++ patches.trace.tar.bz2 ++++++ ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ ++++ 44241 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.j11846/_old 2008-10-28 00:13:40.000000000 +0100 +++ /var/tmp/diff_new_pack.j11846/_new 2008-10-28 00:13:40.000000000 +0100 @@ -30,7 +30,7 @@ patches.kernel.org/patch-2.6.27.1 patches.kernel.org/patch-2.6.27.1-2 patches.kernel.org/patch-2.6.27.2-3 - patches.kernel.org/patch-2.6.27.4-rc2 + patches.kernel.org/patch-2.6.27.3-4 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -247,6 +247,14 @@ patches.arch/s390-01-06-zfcp-cleanup-v2.patch patches.arch/s390-02-01-xpram.patch + patches.arch/s390-02-02-smp-sysdev.patch + patches.arch/s390-02-03-zfcp.patch + patches.arch/s390-02-04-qeth-mac.patch + patches.arch/s390-02-05-qeth-recovery.patch + patches.arch/s390-02-06-qeth-offset.patch + patches.arch/s390-02-07-qeth-ipv6check.patch + patches.arch/s390-02-08-qeth-panic.patch + patches.arch/s390-02-09-tape-lock.patch ######################################################## # VM/FS patches @@ -632,6 +640,10 @@ patches.drivers/sgi-uv-led patches.drivers/sgi-ioc4-request-submodules + # This one is more related to x2APIC patches, but adjusted by SGI to cleanly + # patch on-top of sgi-uv-led -> I don't do the extra work and keep it here + patches.arch/x86_uv_early_detect.patch + patches.fixes/cxgb3_fix_race_in_EEH # Add support for Montevina hardware; series mainlined 2.6.26 @@ -645,7 +657,7 @@ ######################################################## # Storage ######################################################## -+2.6.26-teheo patches.drivers/libata-add-waits-for-govault + patches.drivers/libata-add-waits-for-govault patches.drivers/libata-unlock-hpa-by-default patches.drivers/libata-prefer-over-ide @@ -787,6 +799,7 @@ ######################################################## patches.fixes/md-Allow-metadata_version-to-be-updated-for-externa.patch patches.fixes/md-Don-t-try-to-set-an-array-to-read-auto-if-it-i.patch + patches.kernel.org/touch_mnt_namespace-when-the-mount-flags-change.patch ########################################################## @@ -863,7 +876,6 @@ patches.suse/kdb-x86 patches.suse/kdb-ia64 patches.suse/kdb-serial-8250 - patches.fixes/kdb-kdump.diff ######################################################## # Other patches for debugging @@ -873,9 +885,13 @@ patches.suse/no-frame-pointer-select patches.arch/x86_64-unwind-annotations - # dump_after_notifier_table sysctl for Teradata - # and others (bnc#436678) + ######################################################## + # Kdump + ######################################################## + patches.fixes/kdb-kdump.diff + patches.fixes/kdb-oops-panic.diff patches.suse/kdump-dump_after_notifier.patch + patches.fixes/hpwdt-kdump.diff ######################################################## # cgroups ++++++ split-into-symsets ++++++ #! /bin/bash usage() { echo "Usage: ${0##*/} {dir} < Module.symvers" exit $1 } [ $# -eq 1 ] || usage 1 dir=$1 tmpdir=$(mktemp -dt ${0##*/}.XXXXXXXXXX) trap "rm -rf $tmpdir" EXIT split_into_sets() { local dir=$1 awk ' { set = gensub(/\/[^\/]+$/, "", "", $3) sets[set] = sets[set] $0 "\n" } END { for (set in sets) { filename = gensub(/\//, "_", "g", set) printf "%s", sets[set] > dir "/" filename } } ' dir="$dir" } sort -k2 \ | split_into_sets "$tmpdir" shopt -s nullglob set -- $tmpdir/* if [ $# -ne 0 ]; then md5sum "$@" \ | while read md5sum set; do cp $set $dir/${set##*/}.${md5sum:0:16} done fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package kdebase4-workspace checked in at Tue Oct 28 00:07:36 CET 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-10-27 17:27:52.000000000 +0100 +++ /d/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-10-28 00:06:39.819170000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 27 17:19:46 CET 2008 - stbinner(a)suse.de + +- backport of battery plasmoid popup + +------------------------------------------------------------------- kdebase4-workspace.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.j17795/_old 2008-10-28 00:06:52.000000000 +0100 +++ /var/tmp/diff_new_pack.j17795/_new 2008-10-28 00:06:52.000000000 +0100 @@ -29,7 +29,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.1.2 -Release: 6 +Release: 7 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -66,6 +66,8 @@ /usr/share/wallpapers %changelog +* Mon Oct 27 2008 stbinner(a)suse.de +- backport of battery plasmoid popup * Mon Oct 27 2008 wstephenson(a)suse.de - More fixes to Solid/Control from upstream * Mon Oct 27 2008 stbinner(a)suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.j17795/_old 2008-10-28 00:06:52.000000000 +0100 +++ /var/tmp/diff_new_pack.j17795/_new 2008-10-28 00:06:52.000000000 +0100 @@ -37,7 +37,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.1.2 -Release: 6 +Release: 7 Source0: kdebase-workspace-%version.tar.bz2 Source1: rediff-plasma.sh Source2: titlebar_decor.png @@ -761,6 +761,8 @@ /usr/share/kde4/servicetypes/plasma-wallpaper.desktop %changelog +* Mon Oct 27 2008 stbinner(a)suse.de +- backport of battery plasmoid popup * Mon Oct 27 2008 wstephenson(a)suse.de - More fixes to Solid/Control from upstream * Mon Oct 27 2008 stbinner(a)suse.de ++++++ plasma.diff ++++++ ++++ 1650 lines (skipped) ++++ between KDE/kdebase4-workspace/plasma.diff ++++ and /d/STABLE/kdebase4-workspace/plasma.diff ++++++ solid.diff ++++++ --- /var/tmp/diff_new_pack.j17795/_old 2008-10-28 00:06:57.000000000 +0100 +++ /var/tmp/diff_new_pack.j17795/_new 2008-10-28 00:06:57.000000000 +0100 @@ -3132,25 +3132,6 @@ +}; + +#endif // NETWORKSERIALINTERFACE_P_H -diff -urN workspace.old//solid/networkmanager-0.7/solid_networkmanager07.desktop workspace/solid/networkmanager-0.7/solid_networkmanager07.desktop ---- workspace.old//solid/networkmanager-0.7/solid_networkmanager07.desktop 2008-10-21 08:50:36.000000000 +0200 -+++ solid/networkmanager-0.7/solid_networkmanager07.desktop 2008-09-30 08:09:47.000000000 +0200 -@@ -14,7 +14,6 @@ - Name[mk]=Менаџер на мрежи 0.7 - Name[ml]=ശൃംഖലാനടത്തിപ്പുകാരന്‍ 0.7 - Name[mr]=संजाळव्यवस्थपाक 0.7 --Name[nb]=Nettverksstyring 0.7 - Name[nds]=Nettwark-Pleger 0.7 - Name[nn]=Nettverkshandsaming 0.7 - Name[pa]=ਨੈੱਟਵਰਕਮੈਨੇਜਰ 0.7 -@@ -55,7 +54,6 @@ - Comment[lv]=Tīkla pārvaldība, lietojot NetworkManager dēmonu, 0.7 versiju - Comment[ml]=NetworkManager പതിപ്പു് 0.7 ഡെമണ്‍ ഉപയോഗിക്കുന്ന നെറ്റ്‌വര്‍ക്ക് മാനേജ്മെന്റ് - Comment[mr]=संजाळव्यवस्थापक डीमन, आवृत्ती 0.7 चा वापर करणारे संजाळ व्यवस्थापन --Comment[nb]=Nettverksstyring med nissen NetworkManager versjon 0.7 - Comment[nds]=Nettwarkpleeg mit den NetworkManager-Dämoon, Verschoon 0.7 - Comment[nl]=Netwerkbeheer via de NetworkManager-daemon, versie 0.7 - Comment[nn]=Nettverkshandtering med NetworkManager-tenesta, versjon 0.7 diff -urN workspace.old//solid/networkmanager-0.7/wirednetworkinterface.cpp workspace/solid/networkmanager-0.7/wirednetworkinterface.cpp --- workspace.old//solid/networkmanager-0.7/wirednetworkinterface.cpp 2008-06-08 18:00:35.000000000 +0200 +++ solid/networkmanager-0.7/wirednetworkinterface.cpp 2008-10-20 23:04:52.000000000 +0200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-openSUSE
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package kdebase4-openSUSE checked in at Tue Oct 28 00:05:54 CET 2008. -------- --- KDE/kdebase4-openSUSE/kdebase4-openSUSE.changes 2008-10-23 11:03:03.000000000 +0200 +++ /d/STABLE/kdebase4-openSUSE/kdebase4-openSUSE.changes 2008-10-27 17:53:34.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Oct 27 17:47:33 CET 2008 - stbinner(a)suse.de + +- translation update +- default to expandable folders in Dolphin's details view +- no breadcrumb navigation in Dolphin and file dialogs by default + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.M29156/_old 2008-10-28 00:05:31.000000000 +0100 +++ /var/tmp/diff_new_pack.M29156/_new 2008-10-28 00:05:31.000000000 +0100 @@ -26,7 +26,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 11.1 -Release: 57 +Release: 58 Source0: kdebase4-openSUSE-%{version}.tar.bz2 Requires: kdebase4-workspace Provides: kdebase4-SuSE = 11.0 @@ -276,6 +276,10 @@ /usr/share/kde4/apps/kdm/pics %changelog +* Mon Oct 27 2008 stbinner(a)suse.de +- translation update +- default to expandable folders in Dolphin's details view +- no breadcrumb navigation in Dolphin and file dialogs by default * Thu Oct 23 2008 llunak(a)suse.cz - Use 11.1 splash (bnc#434784) * Thu Oct 16 2008 stbinner(a)suse.de @@ -315,7 +319,7 @@ - translation updates * Wed May 28 2008 dmueller(a)suse.de - opt-in kde3->kde4 config migration (bnc#372170) -* Tue May 27 2008 dmueller(a)suse.de +* Mon May 26 2008 dmueller(a)suse.de - fix context menu of sysinfo:/ media urls * Mon May 26 2008 stbinner(a)suse.de - put new default windeco color also in branding package ++++++ kdebase4-openSUSE-11.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase4-openSUSE/branding/root/etc/kde4/share/config/dolphinrc new/kdebase4-openSUSE/branding/root/etc/kde4/share/config/dolphinrc --- old/kdebase4-openSUSE/branding/root/etc/kde4/share/config/dolphinrc 1970-01-01 01:00:00.000000000 +0100 +++ new/kdebase4-openSUSE/branding/root/etc/kde4/share/config/dolphinrc 2008-10-27 17:35:38.000000000 +0100 @@ -0,0 +1,5 @@ +[General] +EditableUrl=true + +[DetailsMode] +ExpandableFolders=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase4-openSUSE/branding/root/usr/share/kde4/config/SuSE/default/kdeglobals new/kdebase4-openSUSE/branding/root/usr/share/kde4/config/SuSE/default/kdeglobals --- old/kdebase4-openSUSE/branding/root/usr/share/kde4/config/SuSE/default/kdeglobals 2008-07-15 14:43:54.000000000 +0200 +++ new/kdebase4-openSUSE/branding/root/usr/share/kde4/config/SuSE/default/kdeglobals 2008-10-27 17:35:38.000000000 +0100 @@ -21,3 +21,6 @@ [KDE] ChangeCursor=true + +[KFileDialog Settings] +Breadcrumb Navigation=false diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase4-openSUSE/po/hu/kde4-openSUSE.po new/kdebase4-openSUSE/po/hu/kde4-openSUSE.po --- old/kdebase4-openSUSE/po/hu/kde4-openSUSE.po 2008-10-22 10:02:07.000000000 +0200 +++ new/kdebase4-openSUSE/po/hu/kde4-openSUSE.po 2008-10-27 17:25:57.000000000 +0100 @@ -1,14 +1,14 @@ # translation of kde4-openSUSE.po to Hungarian -# translation of kde4-openSUSE.hu.po to # Ervin Novak <enovak(a)novell.com>, 2008. # Kalman Kemenczy <kkemenczy(a)novell.com>, 2008. +# translation of kde4-openSUSE.hu.po to msgid "" msgstr "" "Project-Id-Version: kde4-openSUSE\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-07-27 16:23+0200\n" -"PO-Revision-Date: 2008-05-22 11:02+0200\n" -"Last-Translator: <enovak(a)novell.com>\n" +"PO-Revision-Date: 2008-10-27 17:10+0100\n" +"Last-Translator: Ervin Novak <enovak(a)novell.com>\n" "Language-Team: Hungarian <hu(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,30 +29,29 @@ "A new window manager is running.\n" "It is still recommended to restart this KDE session to make sure all running applications adjust for this change." msgstr "" +"Egy új ablakkezelő fut.\n" +"Ajánlott a jelenlegi KDE munkamenet újraindítása, hogy biztosan minden alkalmazás észlelje a változtatást." # 30654 AttribValues/label #: componentchooserwm.cpp:104 -#, fuzzy msgid "Window Manager Replaced" -msgstr "Ablakkezelő" +msgstr "Ablakkezelő lecserélve" #: componentchooserwm.cpp:140 msgid "Your running window manager will be now replaced with the configured one." -msgstr "" +msgstr "A futó ablakkezelő most le lesz cserélve a beállítottra." #: componentchooserwm.cpp:149 -#, fuzzy msgid "Config Window Manager Change" -msgstr "Ablakkezelő kiválasztása" +msgstr "Ablakkezelő cseréjének beállítása" #: componentchooserwm.cpp:151 -#, fuzzy msgid "&Accept Change" msgstr "&Elfogadás" #: componentchooserwm.cpp:152 msgid "&Revert to Previous" -msgstr "" +msgstr "&Visszaállítás" #: componentchooserwm.cpp:154 msgid "" @@ -60,68 +59,70 @@ "Please check it has started properly and confirm the change.\n" "The launch will be automatically reverted in 20 seconds." msgstr "" +"A beállított ablakkezelő elindítva.\n" +"Kérem ellenőrizze, hogy megfelelően elindult-e, és igazolja a változást.\n" +"A módosítás 20 másodperc múlva automatikusan visszaáll." #: componentchooserwm.cpp:169 msgid "The running window manager has been reverted to the default KDE window manager KWin." -msgstr "" +msgstr "A futó ablakkezelő visszaállítva a KWin alapértelmezett KDE ablakkezelőre." #: componentchooserwm.cpp:176 msgid "" "The new window manager has failed to start.\n" "The running window manager has been reverted to the default KDE window manager KWin." msgstr "" +"Az új ablakkezelő indulása sikertelen.\n" +"A futó ablakkezelő visszaállítva a KWin alapértelmezett KDE ablakkezelőre." # %s is either BOOTP or DHCP #: componentchooserwm.cpp:297 -#, fuzzy msgid "Running the configuration tool failed" -msgstr "A(z) %s konfiguráció nem sikerült." +msgstr "A beállítóeszköz futtatása sikertelen" #: ktimerdialog.cpp:166 -#, fuzzy, kde-format +#, kde-format msgid "1 second remaining:" msgid_plural "%1 seconds remaining:" -msgstr[0] "%1:%2 h van hátra" -msgstr[1] "%1:%2 h van hátra" +msgstr[0] "1 másodperc van hátra:" +msgstr[1] "%1 másodperc van hátra:" # 30654 AttribValues/label #. i18n: tag string #. i18n: file wmconfig_ui.ui line 41 #: rc.cpp:80 -#, fuzzy msgid "Use a different &window manager:" -msgstr "Alapértelmezett ablakkezelő:" +msgstr "Más a&blakkezelő használata:" #. i18n: tag string #. i18n: file wmconfig_ui.ui line 48 #: rc.cpp:83 msgid "&Use the default KDE window manager (KWin)" -msgstr "" +msgstr "Az &alapértelmezett KDE ablakkezelő (KWin) használata" #. i18n: tag string #. i18n: file wmconfig_ui.ui line 76 #: rc.cpp:86 -#, fuzzy msgid "Configure" -msgstr "Nincs beállítva" +msgstr "Beállítás" #. i18n: tag string #. i18n: file wmconfig_ui.ui line 85 #: rc.cpp:89 msgid "Note: Most window managers have their own configuration and do not follow KDE settings." -msgstr "" +msgstr "Megjegyzés: a legtöbb ablakkezelő saját beállítással rendelkezik, és nem vonatkoznak rá a KDE beállításai." #. i18n: tag string #. i18n: file ./xcursor/themepage.ui line 31 #: rc.cpp:137 msgid "Select the cursor theme you want to use (hover preview to test cursor):" -msgstr "" +msgstr "Válassza ki a használni kívánt kurzortémát (vigye fölé a kurzort az előnézethez):" #. i18n: tag string #. i18n: file ./xcursor/themepage.ui line 45 #: rc.cpp:143 msgid "Install New Theme..." -msgstr "" +msgstr "Új téma telepítése..." #: advanced.cpp:93 main.cpp:199 msgid "" @@ -129,92 +130,91 @@ "\n" "Check your X configuration. You may also consider changing advanced options, especially changing the compositing type." msgstr "" +"Sikertelen az asztali effektek aktiválása az adott beállításokkal. A beállítások visszaállításra kerülnek az előző értékükre.\n" +"\n" +"Ellenőrizze az X konfigurációját. Megpróbálhatja a szakértői beállítások módosítását is, különösen a compositing típusát." #: main.cpp:157 main.cpp:163 -#, fuzzy msgid "No Effect" -msgstr "Munkaasztal-effektusok" +msgstr "Nincs effekt" #. i18n: tag string #. i18n: file advanced.ui line 43 #: rc.cpp:12 rc.cpp:141 msgid "Keep window thumbnails" -msgstr "" +msgstr "Tartsa meg az ablakok előnézetét" #. i18n: tag string #. i18n: file advanced.ui line 56 #: rc.cpp:18 rc.cpp:147 msgid "Only for shown windows" -msgstr "" +msgstr "Csak a mutatott ablakokhoz" #. i18n: tag string #. i18n: file advanced.ui line 72 #: rc.cpp:24 rc.cpp:153 msgid "Enabling this option allows compositing to be activated even if some of the internal checks fail. Doing so may make the whole desktop unusable and its use is not recommened. Use only if KWin refuses to activate compositing on a system that should be capable of compositing.\n" -msgstr "" +msgstr "A beállítás engedélyezése lehetővé teszi a compositing engedélyezését akkor is, ha a belső ellenőrzések némelyike sikertelen. Ez teljesen használhatatlanná teheti a munkaasztalt, és nem javasolt a használata. Csak akkor használja, ha a KWin nem engedélyezné a compositing-et egy olyan rendszeren, amely egyébként képes lenne rá.\n" #. i18n: tag string #. i18n: file advanced.ui line 75 #: rc.cpp:28 rc.cpp:157 -#, fuzzy msgid "Disable functionality checks" -msgstr "Értesítések letiltása" +msgstr "Funkcionalitás ellenőrzésének kikapcsolása" #. i18n: tag string #. i18n: file main.ui line 75 #: rc.cpp:88 rc.cpp:217 msgid "Effect for window switching" -msgstr "" +msgstr "Az ablakváltás effektje" #. i18n: tag string #. i18n: file main.ui line 88 #: rc.cpp:91 rc.cpp:220 msgid "Effect for desktop switching" -msgstr "" +msgstr "A munkaasztal-váltás effektje" #. i18n: tag string #. i18n: file main.ui line 112 #: rc.cpp:97 rc.cpp:226 -#, fuzzy msgid "Instant" -msgstr "Telepítés" +msgstr "Azonnali" #. i18n: tag string #. i18n: file main.ui line 117 #: rc.cpp:100 rc.cpp:229 msgid "Very fast" -msgstr "" +msgstr "Nagyon gyors" #. i18n: tag string #. i18n: file main.ui line 122 #: rc.cpp:103 rc.cpp:232 msgid "Fast" -msgstr "" +msgstr "Gyors" #. i18n: tag string #. i18n: file main.ui line 132 #: rc.cpp:109 rc.cpp:238 msgid "Slow" -msgstr "" +msgstr "Lassú" #. i18n: tag string #. i18n: file main.ui line 137 #: rc.cpp:112 rc.cpp:241 msgid "Very slow" -msgstr "" +msgstr "Nagyon lassú" #. i18n: tag string #. i18n: file main.ui line 142 #: rc.cpp:115 rc.cpp:244 msgid "Extremely slow" -msgstr "" +msgstr "Extrém lassú" #. i18n: tag string #. i18n: file main.ui line 150 #: rc.cpp:118 rc.cpp:247 -#, fuzzy msgid "Animation speed" -msgstr "Animáció" +msgstr "Animáció sebessége" #: kdmshutdown.cpp:525 kdmshutdown.cpp:542 msgid "&Suspend Computer" @@ -242,30 +242,33 @@ "The configured virtual size of your X server is insufficient for this setup. This configuration needs to be adjusted.\n" "Do you wish to run a tool to adjust the configuration?" msgstr "" +"Elégtelen virtuális méret a teljes képernyőméreten.\n" +"Az X kiszolgálón konfigurált virtuális méret elégtelen ehhez a beállításhoz. A beállítást módosítani kell.\n" +"El szeretné indítani a beállítóeszközt?" #: randrconfig.cpp:285 msgid "Configuration has been adjusted. Please restart your session for this change to take effect." -msgstr "" +msgstr "A konfiguráció beállításra került. Kérem indítsa újra a munkamenetet, hogy a változások érvényesüljenek." #: randrconfig.cpp:288 msgid "Changing configuration failed. Please adjust your xorg.conf manually." -msgstr "" +msgstr "A konfiguráció módosítása sikertelen. Kérem végezze el az xorg.conf manuális módosítását." #. i18n: tag string #. i18n: file randrconfigbase.ui line 37 #: rc.cpp:60 msgid "Identify Outputs" -msgstr "" +msgstr "Kimenetek azonosítása" #: presentwindows_config.cpp:57 presentwindows.cpp:63 #: effects/presentwindows_config.cpp:57 effects/presentwindows.cpp:63 msgid "Toggle Present Windows (All desktops)" -msgstr "" +msgstr "Jelenlegi ablakok rögzítése (minden munkaasztal)" #: presentwindows_config.cpp:62 presentwindows.cpp:59 #: effects/presentwindows_config.cpp:62 effects/presentwindows.cpp:59 msgid "Toggle Present Windows (Current desktop)" -msgstr "" +msgstr "Jelenlegi ablakok rögzítése (aktuális munkaasztal)" #: cylinder_config.cpp:53 cube_config.cpp:53 sphere_config.cpp:53 #: effects/cube_config.cpp:53 effects/cylinder_config.cpp:53 @@ -276,9 +279,8 @@ #: cylinder_config.cpp:71 cube_config.cpp:71 sphere_config.cpp:71 cube.cpp:88 #: effects/cube_config.cpp:71 effects/cube.cpp:88 #: effects/cylinder_config.cpp:71 effects/sphere_config.cpp:71 -#, fuzzy msgid "Desktop Cube" -msgstr "Munkaasztal száma" +msgstr "Munkaasztal kocka" #. i18n: tag string #. i18n: file cube_config.ui line 40 @@ -293,9 +295,8 @@ #. i18n: tag string #. i18n: file ./cylinder_config.ui line 40 #: rc.cpp:33 rc.cpp:132 rc.cpp:467 rc.cpp:632 rc.cpp:778 rc.cpp:949 -#, fuzzy msgid "Background Color:" -msgstr "Hátté_r:" +msgstr "Háttérszín:" #. i18n: tag string #. i18n: file cube_config.ui line 53 @@ -310,9 +311,8 @@ #. i18n: tag string #. i18n: file ./cylinder_config.ui line 53 #: rc.cpp:36 rc.cpp:135 rc.cpp:470 rc.cpp:635 rc.cpp:781 rc.cpp:952 -#, fuzzy msgid "Wallpaper:" -msgstr "Háttér" +msgstr "Háttérkép:" #. i18n: tag string #. i18n: file cube_config.ui line 69 @@ -332,7 +332,6 @@ #. i18n: file ./cylinder_config.ui line 69 #: rc.cpp:39 rc.cpp:138 rc.cpp:389 rc.cpp:473 rc.cpp:638 rc.cpp:784 rc.cpp:904 #: rc.cpp:955 -#, fuzzy msgid "Activation" msgstr "Aktiválás" @@ -350,9 +349,8 @@ #. i18n: tag string #. i18n: file ./cylinder_config.ui line 75 #: rc.cpp:42 rc.cpp:141 rc.cpp:476 rc.cpp:641 rc.cpp:787 rc.cpp:958 -#, fuzzy msgid "Screen edge:" -msgstr "Képernyő" +msgstr "Képernyő sarka:" #. i18n: tag string #. i18n: file cube_config.ui line 107 @@ -367,9 +365,8 @@ #. i18n: tag string #. i18n: file ./cylinder_config.ui line 107 #: rc.cpp:48 rc.cpp:147 rc.cpp:482 rc.cpp:647 rc.cpp:793 rc.cpp:964 -#, fuzzy msgid "Display desktop name" -msgstr "Munkaasztal neve" +msgstr "Munkaasztal nevének megjelenítése" #. i18n: tag string #. i18n: file cube_config.ui line 114 @@ -380,9 +377,8 @@ #. i18n: tag string #. i18n: file ./cylinder_config.ui line 114 #: rc.cpp:51 rc.cpp:150 rc.cpp:796 rc.cpp:967 -#, fuzzy msgid "Reflection" -msgstr "kiválasztás" +msgstr "Tükröződés" #. i18n: tag string #. i18n: file cube_config.ui line 121 @@ -398,7 +394,7 @@ #. i18n: file ./cylinder_config.ui line 121 #: rc.cpp:54 rc.cpp:153 rc.cpp:485 rc.cpp:650 rc.cpp:799 rc.cpp:970 msgid "Rotation duration:" -msgstr "" +msgstr "Forgatás időtartama:" #. i18n: tag string #. i18n: file cube_config.ui line 169 @@ -414,7 +410,7 @@ #. i18n: file ./cylinder_config.ui line 169 #: rc.cpp:63 rc.cpp:162 rc.cpp:494 rc.cpp:659 rc.cpp:808 rc.cpp:979 msgid "Opacity" -msgstr "" +msgstr "Áttetszőség" #. i18n: tag string #. i18n: file cube_config.ui line 275 @@ -430,7 +426,7 @@ #. i18n: file ./cylinder_config.ui line 275 #: rc.cpp:79 rc.cpp:178 rc.cpp:510 rc.cpp:675 rc.cpp:824 rc.cpp:995 msgid "Caps" -msgstr "" +msgstr "Fedelek" #. i18n: tag string #. i18n: file cube_config.ui line 281 @@ -445,9 +441,8 @@ #. i18n: tag string #. i18n: file ./cylinder_config.ui line 281 #: rc.cpp:82 rc.cpp:181 rc.cpp:513 rc.cpp:678 rc.cpp:827 rc.cpp:998 -#, fuzzy msgid "Show caps" -msgstr "&Módosítások megjelenítése" +msgstr "Fedelek megjelenítése" # /tmp/xapi:335 /tmp/xapi:345 #. i18n: tag string @@ -463,9 +458,8 @@ #. i18n: tag string #. i18n: file ./cylinder_config.ui line 288 #: rc.cpp:85 rc.cpp:184 rc.cpp:516 rc.cpp:681 rc.cpp:830 rc.cpp:1001 -#, fuzzy msgid "Cap Color:" -msgstr "Színek" +msgstr "Fedél színe:" #. i18n: tag string #. i18n: file cube_config.ui line 301 @@ -480,9 +474,8 @@ #. i18n: tag string #. i18n: file ./cylinder_config.ui line 301 #: rc.cpp:88 rc.cpp:187 rc.cpp:519 rc.cpp:684 rc.cpp:833 rc.cpp:1004 -#, fuzzy msgid "Display image on caps" -msgstr "Ablak &ikonjainak megjelenítése" +msgstr "Kép megjelenítése a fedélen" #. i18n: tag string #. i18n: file cube_config.ui line 311 @@ -498,7 +491,7 @@ #. i18n: file ./cylinder_config.ui line 311 #: rc.cpp:91 rc.cpp:190 rc.cpp:531 rc.cpp:696 rc.cpp:836 rc.cpp:1007 msgid "Zoom" -msgstr "" +msgstr "Nagyítás" #. i18n: tag string #. i18n: file cube_config.ui line 317 @@ -514,7 +507,7 @@ #. i18n: file ./cylinder_config.ui line 317 #: rc.cpp:94 rc.cpp:193 rc.cpp:534 rc.cpp:699 rc.cpp:839 rc.cpp:1010 msgid "Define how far away the object should appear" -msgstr "" +msgstr "Az objektum távolságának meghatározása" #. i18n: tag string #. i18n: file cube_config.ui line 344 @@ -530,7 +523,7 @@ #. i18n: file ./cylinder_config.ui line 344 #: rc.cpp:97 rc.cpp:196 rc.cpp:537 rc.cpp:702 rc.cpp:842 rc.cpp:1013 msgid "Near" -msgstr "" +msgstr "Közel" #. i18n: tag string #. i18n: file cube_config.ui line 364 @@ -545,9 +538,8 @@ #. i18n: tag string #. i18n: file ./cylinder_config.ui line 364 #: rc.cpp:100 rc.cpp:199 rc.cpp:540 rc.cpp:705 rc.cpp:845 rc.cpp:1016 -#, fuzzy msgid "Far" -msgstr "farszi" +msgstr "Távol" #. i18n: tag string #. i18n: file cube_config.ui line 376 @@ -562,18 +554,16 @@ #. i18n: tag string #. i18n: file ./cylinder_config.ui line 376 #: rc.cpp:103 rc.cpp:202 rc.cpp:543 rc.cpp:708 rc.cpp:848 rc.cpp:1019 -#, fuzzy msgid "Additional options" -msgstr "További elrendezések" +msgstr "További lehetőségek" #. i18n: tag string #. i18n: file cube_config.ui line 385 #. i18n: tag string #. i18n: file ./cube_config.ui line 385 #: rc.cpp:106 rc.cpp:851 -#, fuzzy msgid "Show cube when desktop changed" -msgstr "&Ikonok megjelenítése a munkaasztalon" +msgstr "Kocka megjelenítése az asztalváltáskor" #. i18n: tag string #. i18n: file cube_config.ui line 393 @@ -584,6 +574,8 @@ "Cube appears on all screens in a multi screen setup.\n" "If not set cube will appear on only one screen and scaled so that all screens fit on that screen." msgstr "" +"A kocka minden képernyőn megjelenik egy többképernyős konfigurációban.\n" +"Ha nincs beállítva, a kocka csak egy kijelzőn jelenik meg, és olyan méretben, hogy minden képernyő elférjen azon a kijelzőn." #. i18n: tag string #. i18n: file cube_config.ui line 396 @@ -591,7 +583,7 @@ #. i18n: file ./cube_config.ui line 396 #: rc.cpp:113 rc.cpp:858 msgid "Span cube on all screens in multi screen setup" -msgstr "" +msgstr "Kocka átívelése minden kijelzőn többképernyős konfigurációban" #. i18n: tag string #. i18n: file cube_config.ui line 404 @@ -602,6 +594,8 @@ "Cube is deactivated after rotating the cube with the mouse.\n" "Otherwise cube will stay in the position." msgstr "" +"A kocka inaktív lesz az egérrel történő forgatása után.\n" +"Enélkül az adott pozícióban maradna." #. i18n: tag string #. i18n: file cube_config.ui line 407 @@ -617,7 +611,7 @@ #. i18n: file ./cylinder_config.ui line 386 #: rc.cpp:120 rc.cpp:209 rc.cpp:550 rc.cpp:715 rc.cpp:865 rc.cpp:1026 msgid "Close after mouse dragging" -msgstr "" +msgstr "Bezárás egérrel mozgatás után" #. i18n: tag string #. i18n: file cube_config.ui line 414 @@ -633,7 +627,7 @@ #. i18n: file ./cylinder_config.ui line 393 #: rc.cpp:123 rc.cpp:212 rc.cpp:553 rc.cpp:718 rc.cpp:868 rc.cpp:1029 msgid "Use for walk through desktop list" -msgstr "" +msgstr "Használja a munkaasztalok listájának léptetésére" #. i18n: tag string #. i18n: file cylinder_config.ui line 383 @@ -644,6 +638,8 @@ "Cylinder is deactivated after rotating the cylinder with the mouse.\n" "Otherwise cylinder will stay in the position." msgstr "" +"A henger inaktív lesz az egérrel történő forgatása után.\n" +"Enélkül az adott pozícióban maradna." #. i18n: tag string #. i18n: file presentwindows_config.ui line 22 @@ -651,16 +647,15 @@ #. i18n: file ./presentwindows_config.ui line 22 #: rc.cpp:359 rc.cpp:874 msgid "Rearrange &duration:" -msgstr "" +msgstr "Újrarendezés i&dőtartama:" #. i18n: tag string #. i18n: file presentwindows_config.ui line 51 #. i18n: tag string #. i18n: file ./presentwindows_config.ui line 51 #: rc.cpp:368 rc.cpp:883 -#, fuzzy msgid "Display window &titles" -msgstr "Ablak &ikonjainak megjelenítése" +msgstr "Ablakok címsorának megjelení&tése" #. i18n: tag string #. i18n: file presentwindows_config.ui line 65 @@ -668,16 +663,15 @@ #. i18n: file ./presentwindows_config.ui line 65 #: rc.cpp:374 rc.cpp:889 msgid "Use for window &switching" -msgstr "" +msgstr "Ablakok váltá&sa" #. i18n: tag string #. i18n: file presentwindows_config.ui line 72 #. i18n: tag string #. i18n: file ./presentwindows_config.ui line 72 #: rc.cpp:377 rc.cpp:892 -#, fuzzy msgid "Layout mode:" -msgstr "Elrendezés" +msgstr "Elrendezés módja:" #. i18n: tag string #. i18n: file presentwindows_config.ui line 83 @@ -685,7 +679,7 @@ #. i18n: file ./presentwindows_config.ui line 83 #: rc.cpp:380 rc.cpp:895 msgid "Natural" -msgstr "" +msgstr "Természetes" #. i18n: tag string #. i18n: file presentwindows_config.ui line 88 @@ -693,7 +687,7 @@ #. i18n: file ./presentwindows_config.ui line 88 #: rc.cpp:383 rc.cpp:898 msgid "Regular grid" -msgstr "" +msgstr "Szabályos rács" #. i18n: tag string #. i18n: file presentwindows_config.ui line 93 @@ -701,7 +695,7 @@ #. i18n: file ./presentwindows_config.ui line 93 #: rc.cpp:386 rc.cpp:901 msgid "Flexible grid" -msgstr "" +msgstr "Rugalmas rács" #. i18n: tag string #. i18n: file presentwindows_config.ui line 120 @@ -709,7 +703,7 @@ #. i18n: file ./presentwindows_config.ui line 120 #: rc.cpp:392 rc.cpp:907 msgid "Active screen &edge (Current desktop):" -msgstr "" +msgstr "Aktív képernyő szél&e (aktuális munkaasztal):" #. i18n: tag string #. i18n: file presentwindows_config.ui line 133 @@ -717,16 +711,15 @@ #. i18n: file ./presentwindows_config.ui line 133 #: rc.cpp:395 rc.cpp:910 msgid "Active screen &edge (All desktops):" -msgstr "" +msgstr "Aktív képernyő szél&e (minden munkaaszatl):" #. i18n: tag string #. i18n: file presentwindows_config.ui line 149 #. i18n: tag string #. i18n: file ./presentwindows_config.ui line 149 #: rc.cpp:398 rc.cpp:913 -#, fuzzy msgid "Natural Layout Settings" -msgstr "Kézi beállítások" +msgstr "Természetes kiosztás beállítása" #. i18n: tag string #. i18n: file presentwindows_config.ui line 155 @@ -734,7 +727,7 @@ #. i18n: file ./presentwindows_config.ui line 155 #: rc.cpp:401 rc.cpp:916 msgid "Fill &gaps" -msgstr "" +msgstr "Rése&k kitöltése" #. i18n: tag string #. i18n: file presentwindows_config.ui line 177 @@ -742,7 +735,7 @@ #. i18n: file ./presentwindows_config.ui line 177 #: rc.cpp:404 rc.cpp:919 msgid "Faster" -msgstr "" +msgstr "Gyorsabb" #. i18n: tag string #. i18n: file presentwindows_config.ui line 221 @@ -750,16 +743,15 @@ #. i18n: file ./presentwindows_config.ui line 221 #: rc.cpp:407 rc.cpp:922 msgid "Nicer" -msgstr "" +msgstr "Szebb" #. i18n: tag string #. i18n: file sphere_config.ui line 307 #. i18n: tag string #. i18n: file ./sphere_config.ui line 307 #: rc.cpp:522 rc.cpp:687 -#, fuzzy msgid "Cap deformation:" -msgstr "CPU adatok " +msgstr "Fedél deformációja:" #. i18n: tag string #. i18n: file sphere_config.ui line 340 @@ -767,7 +759,7 @@ #. i18n: file ./sphere_config.ui line 340 #: rc.cpp:525 rc.cpp:690 msgid "Sphere" -msgstr "" +msgstr "Gömb" #. i18n: tag string #. i18n: file sphere_config.ui line 360 @@ -775,7 +767,7 @@ #. i18n: file ./sphere_config.ui line 360 #: rc.cpp:528 rc.cpp:693 msgid "Plane" -msgstr "" +msgstr "Sík" #. i18n: tag string #. i18n: file sphere_config.ui line 446 @@ -786,6 +778,8 @@ "Sphere is deactivated after rotating the sphere with the mouse.\n" "Otherwise sphere will stay in the position." msgstr "" +"A gömb inaktív lesz az egérrel történő forgatása után.\n" +"Enélkül az adott pozícióban maradna." #: composite.cpp:466 msgid "Empty" @@ -798,6 +792,9 @@ "If this was only a temporary problem, you can resume using the '%1' shortcut.\n" "You can also disable functionality checks in advanced compositing settings." msgstr "" +"A compositing túl lassú volt, ezért felfüggesztésre került.\n" +"Ha csak ideiglenes probléma volt, továbbra is használhatja a '%1' hivatkozással.\n" +"Lehetőség van a funkcionalitási ellenőrzések kikapcsolására is a haladó beállításokban." #: core/leavemodel.cpp:83 msgid "Save Session" @@ -824,7 +821,6 @@ msgstr "Új alkalmazások" #: simpleapplet/simpleapplet.cpp:281 -#, fuzzy msgctxt "@item:inlistbox Format:" msgid "Name (Description)" msgstr "Név (Leírás)" @@ -860,7 +856,7 @@ #: kio/kfileitem.cpp:927 #, kde-format msgid " (Points to %1)" -msgstr "(Ide mutat: %1)" +msgstr " (Ide mutat: %1)" #: kmixprefdlg.cpp:84 msgid "Disable automatic startup on login" @@ -886,204 +882,3 @@ msgid "Unable to Send Message on Account '%1'" msgstr "Az üzenet elküldése sikertelen a következő azonosítónak: '%1'" -#~ msgid "Failed to set system date/time/timezone." -#~ msgstr "A rendszeridő/dátum/időzóna beállítása sikertelen." - -#~ msgid "Date/Time Error" -#~ msgstr "Dátum/idő hiba." - -#~ msgid "KWin (KDE default)" -#~ msgstr "KWIN (KDE alapértelmezett)" - -#~ msgid "File Already Exists" -#~ msgstr "A fájl már létezik" - -#~ msgid "Do you really want to delete this file?" -#~ msgstr "Valóban le akarja törölni ezt a fájlt?" - -#~ msgid "Log out in 1 second." -#~ msgid_plural "Log out in %1 seconds." -#~ msgstr[0] "Kilépés 1 másodperc múlva." -#~ msgstr[1] "Kilépés %1 másodperc múlva." - -#~ msgid "Turn off computer in 1 second." -#~ msgid_plural "Turn off computer in %1 seconds." -#~ msgstr[0] "Számítógép kikapcsolása 1 másodperc múlva." -#~ msgstr[1] "Számítógép kikapcsolása %1 másodperc múlva." - -#~ msgid "Reboot computer in 1 second." -#~ msgid_plural "Reboot computer in %1 seconds." -#~ msgstr[0] "Számítógép újraindítása %1 másodperc múlva." -#~ msgstr[1] "Számítógép újraindítása %1 másodperc múlva." - -#~ msgid "When enabled, this option makes the window titlebar use same colors as window contents, instead of using system titlebar colors." -#~ msgstr "Ha engedélyezi ezt a beállítást, az ablakkeret címsora az ablak tartalmának megfelelő színű lesz ahelyett, hogy a rendszer címsor-színeit használná." - -#~ msgid "Blend titlebar colors with window contents" -#~ msgstr "A címsor színének keverése az ablak tartalmával" - -#~ msgid "Ozone" -#~ msgstr "Ózon" - -#~ msgid "Enable shadow" -#~ msgstr "Árnyék engedélyezése" - -# /tmp/xapi:105 -#~ msgid "Add Panel" -#~ msgstr "Panel hozzáadása" - -#~ msgid "Leave..." -#~ msgstr "Kijelentkezés..." - -#~ msgid "Image" -#~ msgstr "Kép" - -#~ msgid "Author:" -#~ msgstr "Szerző:" - -#~ msgid "E-Mail:" -#~ msgstr "E-Mail:" - -#~ msgid "License:" -#~ msgstr "Licenc:" - -#~ msgid "hh 'Hours' mm 'Mins' ss 'Secs'" -#~ msgstr "hh 'óra' mm 'perc' ss 'másodperc'" - -#~ msgid "Desktop Theme" -#~ msgstr "Munkaasztal témája" - -#~ msgid "Theme:" -#~ msgstr "Téma:" - -#~ msgid "Desktop Icons" -#~ msgstr "Munkaasztal ikonok" - -#~ msgid "<font color=\"%1\">Recently plugged devices:</font>" -#~ msgstr "<font color=\"%1\">Mostanában használt eszközök:</font>" - -#~ msgid "Show &seconds" -#~ msgstr "Má&sodpercek megjelenítése" - -#~ msgid "All Applications" -#~ msgstr "Minden alkalmazás" - -#~ msgid "User <b>%1</b> on <b>%2</b>" -#~ msgstr "Felhasználó: <b>%1</b> gép: <b>%2</b>" - -#~ msgid "%1 = %2" -#~ msgstr "%1 = %2" - -#~ msgid "Show Application Launcher" -#~ msgstr "Alkalmazásindító megjelenítése" - -#~ msgid "Menu Editor" -#~ msgstr "Menüszerkesztő" - -#~ msgid "Switch to Classic Menu Style" -#~ msgstr "Átváltás KDE stílusú menüre" - -#~ msgid "Switch to Kickoff Menu Style" -#~ msgstr "Átváltás SUSE stílusú menüre" - -# MM -#~ msgid "Standard" -#~ msgstr "Szabványos" - -#~ msgid "Format:" -#~ msgstr "Formátum:" - -#~ msgid "Name Only" -#~ msgstr "Csak név" - -#~ msgid "Description Only" -#~ msgstr "Csak leírás" - -#~ msgid "Description (Name)" -#~ msgstr "Leírás (Név)" - -#~ msgid "Swap Button Order" -#~ msgstr "Gombsorrend megfordítása" - -# /tmp/xapi:281 -#~ msgid "Displayed text:" -#~ msgstr "Megjelenített szöveg:" - -#~ msgid "Remove this Panel" -#~ msgstr "Panel eltávolítása" - -#~ msgid "transform-move" -#~ msgstr "átalakít-mozgat" - -#~ msgid "Start Move of %1" -#~ msgstr "%1 mozgatásának indítása" - -#~ msgid "Stop Move of %1" -#~ msgstr "%1 mozgatásának leállítása" - -#~ msgid "Do you really want to remove this panel?" -#~ msgstr "Biztosan el szeretné távolítani ezt a panelt?" - -#~ msgid "Remove Panel" -#~ msgstr "Panel eltávolítása" - -#~ msgid "Show only tasks from the current screen" -#~ msgstr "Csak az aktuális munkaasztal ablakai látszódjanak" - -#~ msgid "Plasma Dashboard" -#~ msgstr "Plazma műszerfal" - -#~ msgid "An application is attempting to perform an action that requires privileges. Authentication as the super user is required to perform this action." -#~ msgstr "Egy alkalmazás olyan műveletet próbál végrehajtani, amely jogosultságokat igényel. A művelet végrehajtásához hitelesítés szükséges az adminisztrátori jogosultságokkal rendelkező felhasználóval." - -#~ msgid "An application is attempting to perform an action that requires privileges. Authentication is required to perform this action." -#~ msgstr "Egy alkalmazás olyan műveletet próbál végrehajtani, amely jogosultságokat igényel. A művelet végrehajtásához hitelesítés szükséges." - -#~ msgid "Password for root" -#~ msgstr "Root jelszó" - -#~ msgid "Password for user(%1)" -#~ msgstr "Felhasználó jelszava(%1)" - -# password dialog title -#~ msgid "Password" -#~ msgstr "Jelszó" - -#~ msgid "PolicyKit-kde" -#~ msgstr "PolicyKit-kde" - -#~ msgid "(c) 2005-2007, TUBITAK - UEKAE" -#~ msgstr "(c) 2005-2007, TUBITAK - UEKAE" - -#~ msgid "Gökçen Eraslan" -#~ msgstr "Gökçen Eraslan" - -#~ msgid "KDE 3 Code" -#~ msgstr "KDE 3 kód" - -#~ msgid "Dirk Müller" -#~ msgstr "Dirk Müller" - -#~ msgid "Author" -#~ msgstr "Szerző" - -#~ msgid "Authentication Required" -#~ msgstr "Hitelesítés szükséges" - -#~ msgid "Lock Icon Here" -#~ msgstr "Ikon lezárása itt" - -#~ msgid "<h3><b>Header is here! </b></h3>" -#~ msgstr "<h3><b>Itt a fejléc! </b></h3>" - -#~ msgid "Remember authorization" -#~ msgstr "Hitelesítés megjegyzése" - -#~ msgid "For this session only" -#~ msgstr "Csak erre a munkamenetre" - -#~ msgid "Select a user..." -#~ msgstr "Felhasználó kiválasztása..." - -#~ msgid "Select User..." -#~ msgstr "Felhasználó kiválasztása..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase4-openSUSE/po/hu/kio_sysinfo.po new/kdebase4-openSUSE/po/hu/kio_sysinfo.po --- old/kdebase4-openSUSE/po/hu/kio_sysinfo.po 2007-08-15 17:32:58.000000000 +0200 +++ new/kdebase4-openSUSE/po/hu/kio_sysinfo.po 2008-10-27 14:12:27.000000000 +0100 @@ -9,20 +9,20 @@ # Sári Gábor <saga(a)tux.hu>, 2000. # Steve Varadi <svaradi(a)usa.com>, 2000. # Zoltán Levárdy <pogacsa(a)programmer.net>, 1999. -# Kalman Kemenczy <kkemenczy(a)novell.com>, 2006, 2007. +# Kalman Kemenczy <kkemenczy(a)novell.com>, 2006, 2007, 2008. msgid "" msgstr "" "Project-Id-Version: kio_sysinfo\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-01 12:10+0200\n" -"PO-Revision-Date: 2007-08-15 17:10+0200\n" +"PO-Revision-Date: 2008-10-27 11:54+0100\n" "Last-Translator: Kalman Kemenczy <kkemenczy(a)novell.com>\n" "Language-Team: <hu(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ksysinfopart.cpp:72 msgid "KSysinfo" @@ -97,7 +97,7 @@ #: sysinfo.cpp:170 msgid "Driver:" -msgstr "Meghajtóprogram:" +msgstr "Illesztőprogram:" #: sysinfo.cpp:177 msgid "Getting OS information...." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase4-openSUSE/po/zh_CN/kde4-openSUSE.po new/kdebase4-openSUSE/po/zh_CN/kde4-openSUSE.po --- old/kdebase4-openSUSE/po/zh_CN/kde4-openSUSE.po 2008-10-18 09:22:32.000000000 +0200 +++ new/kdebase4-openSUSE/po/zh_CN/kde4-openSUSE.po 2008-10-26 12:27:10.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-08-18 14:46+0200\n" -"PO-Revision-Date: 2008-10-18 15:19+0800\n" +"PO-Revision-Date: 2008-10-26 19:10+0800\n" "Last-Translator: Eric Shan <ericalways(a)gmail.com>\n" "Language-Team: Simplified Chinese\n" "MIME-Version: 1.0\n" @@ -31,6 +31,8 @@ "A new window manager is running.\n" "It is still recommended to restart this KDE session to make sure all running applications adjust for this change." msgstr "" +"新的窗口管理器正在运行。\n" +"推荐重新登录 KDE，保证所有运行的程序适应这个变化。" #: componentchooserwm.cpp:104 msgid "Window Manager Replaced" @@ -58,16 +60,21 @@ "Please check it has started properly and confirm the change.\n" "The launch will be automatically reverted in 20 seconds." msgstr "" +"已经启动所配置的窗口管理器。\n" +"请检查启动是否正常并确认此变更。\n" +"20秒后将自动复原。" #: componentchooserwm.cpp:169 msgid "The running window manager has been reverted to the default KDE window manager KWin." -msgstr "" +msgstr "窗口管理器已经复原，现在运行的是 KDE 默认的窗口管理器 Kwin。" #: componentchooserwm.cpp:176 msgid "" "The new window manager has failed to start.\n" "The running window manager has been reverted to the default KDE window manager KWin." msgstr "" +"启动新的窗口管理器失败。\n" +"现在运行的是 KDE 默认的窗口管理器 Kwin。" # %s is either BOOTP or DHCP #: componentchooserwm.cpp:297 @@ -140,7 +147,7 @@ #. i18n: file advanced.ui line 56 #: rc.cpp:18 rc.cpp:147 msgid "Only for shown windows" -msgstr "" +msgstr "仅对显示的窗口" #. i18n: tag string #. i18n: file advanced.ui line 72 @@ -237,7 +244,7 @@ #: randrconfig.cpp:285 msgid "Configuration has been adjusted. Please restart your session for this change to take effect." -msgstr "" +msgstr "配置已经调整。请重新登录使之生效。" #: randrconfig.cpp:288 msgid "Changing configuration failed. Please adjust your xorg.conf manually." @@ -494,7 +501,7 @@ #. i18n: file ./cylinder_config.ui line 317 #: rc.cpp:94 rc.cpp:193 rc.cpp:534 rc.cpp:699 rc.cpp:839 rc.cpp:1010 msgid "Define how far away the object should appear" -msgstr "" +msgstr "设置物体看起来有多远" #. i18n: tag string #. i18n: file cube_config.ui line 344 @@ -594,7 +601,7 @@ #. i18n: file ./cylinder_config.ui line 386 #: rc.cpp:120 rc.cpp:209 rc.cpp:550 rc.cpp:715 rc.cpp:865 rc.cpp:1026 msgid "Close after mouse dragging" -msgstr "" +msgstr "鼠标拖动后关闭" #. i18n: tag string #. i18n: file cube_config.ui line 414 @@ -610,7 +617,7 @@ #. i18n: file ./cylinder_config.ui line 393 #: rc.cpp:123 rc.cpp:212 rc.cpp:553 rc.cpp:718 rc.cpp:868 rc.cpp:1029 msgid "Use for walk through desktop list" -msgstr "" +msgstr "用来遍历桌面列表" #. i18n: tag string #. i18n: file cylinder_config.ui line 383 @@ -644,7 +651,7 @@ #. i18n: file ./presentwindows_config.ui line 65 #: rc.cpp:374 rc.cpp:889 msgid "Use for window &switching" -msgstr "" +msgstr "用来切换窗口(&S)" #. i18n: tag string #. i18n: file presentwindows_config.ui line 72 @@ -660,7 +667,7 @@ #. i18n: file ./presentwindows_config.ui line 83 #: rc.cpp:380 rc.cpp:895 msgid "Natural" -msgstr "" +msgstr "自然" #. i18n: tag string #. i18n: file presentwindows_config.ui line 88 @@ -684,7 +691,7 @@ #. i18n: file ./presentwindows_config.ui line 120 #: rc.cpp:392 rc.cpp:907 msgid "Active screen &edge (Current desktop):" -msgstr "" +msgstr "激活屏幕边缘（当前桌面）(&E)：" #. i18n: tag string #. i18n: file presentwindows_config.ui line 133 @@ -692,7 +699,7 @@ #. i18n: file ./presentwindows_config.ui line 133 #: rc.cpp:395 rc.cpp:910 msgid "Active screen &edge (All desktops):" -msgstr "" +msgstr "激活屏幕边缘（所有桌面）(&E)：" #. i18n: tag string #. i18n: file presentwindows_config.ui line 149 @@ -708,7 +715,7 @@ #. i18n: file ./presentwindows_config.ui line 155 #: rc.cpp:401 rc.cpp:916 msgid "Fill &gaps" -msgstr "" +msgstr "填充空白(&G)" #. i18n: tag string #. i18n: file presentwindows_config.ui line 177 @@ -716,7 +723,7 @@ #. i18n: file ./presentwindows_config.ui line 177 #: rc.cpp:404 rc.cpp:919 msgid "Faster" -msgstr "" +msgstr "更快" #. i18n: tag string #. i18n: file presentwindows_config.ui line 221 @@ -724,7 +731,7 @@ #. i18n: file ./presentwindows_config.ui line 221 #: rc.cpp:407 rc.cpp:922 msgid "Nicer" -msgstr "" +msgstr "更好" #. i18n: tag string #. i18n: file sphere_config.ui line 307 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit infiniband-diags
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package infiniband-diags checked in at Tue Oct 28 00:05:22 CET 2008. -------- --- infiniband-diags/infiniband-diags.changes 2008-09-11 14:30:08.000000000 +0200 +++ /d/STABLE/infiniband-diags/infiniband-diags.changes 2008-10-27 23:26:42.698262000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 27 23:26:24 CET 2008 - jjolly(a)suse.de + +- Updated to version from the OFED 1.4 rc3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ infiniband-diags.spec ++++++ --- /var/tmp/diff_new_pack.S15730/_old 2008-10-28 00:04:54.000000000 +0100 +++ /var/tmp/diff_new_pack.S15730/_new 2008-10-28 00:04:55.000000000 +0100 @@ -21,7 +21,7 @@ Name: infiniband-diags Summary: OpenIB InfiniBand Diagnostic Tools Version: 1.4.1 -Release: 1 +Release: 4 License: BSD 3-Clause; GPL v2 or later Group: Productivity/Networking/Diagnostic Source0: %{name}-%{version}.tar.bz2 @@ -64,6 +64,8 @@ %{perl_vendorarch}/IBswcountlimits.pm %changelog +* Tue Oct 28 2008 jjolly(a)suse.de +- Updated to version from the OFED 1.4 rc3 * Thu Sep 11 2008 jjolly(a)suse.de - Updated to 1.4.1 from the OFED 1.4 RC1 * Wed Mar 05 2008 jjolly(a)suse.de ++++++ infiniband-diags-1.4.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/infiniband-diags.spec new/infiniband-diags-1.4.1/infiniband-diags.spec --- old/infiniband-diags-1.4.1/infiniband-diags.spec 2008-09-08 13:55:24.000000000 +0200 +++ new/infiniband-diags-1.4.1/infiniband-diags.spec 2008-10-19 14:05:19.000000000 +0200 @@ -1,11 +1,11 @@ -%define RELEASE @RELEASE@ +%define RELEASE 1.ofed1.4.rc3 %define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools Name: infiniband-diags Version: 1.4.1 -Release: 1.ofed1.4.rc1 +Release: 1.ofed1.4.rc3 License: GPLv2 or BSD Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/man/ibclearcounters.8 new/infiniband-diags-1.4.1/man/ibclearcounters.8 --- old/infiniband-diags-1.4.1/man/ibclearcounters.8 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/man/ibclearcounters.8 2008-10-19 14:04:35.000000000 +0200 @@ -5,8 +5,7 @@ .SH SYNOPSIS .B ibclearcounters -[\-h] [\-N | \-nocolor] [<topology-file> | \-C ca_name -\-P ca_port \-t(imeout) timeout_ms] +[\-h] [<topology-file> | \-C ca_name \-P ca_port \-t(imeout) timeout_ms] .SH DESCRIPTION .PP @@ -15,8 +14,6 @@ .SH OPTIONS .PP -\-N | \-nocolor use mono rather than color mode -.PP \-C <ca_name> use the specified ca_name. .PP \-P <ca_port> use the specified ca_port. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/man/ibnetdiscover.8 new/infiniband-diags-1.4.1/man/ibnetdiscover.8 --- old/infiniband-diags-1.4.1/man/ibnetdiscover.8 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/man/ibnetdiscover.8 2008-10-19 14:04:35.000000000 +0200 @@ -68,20 +68,6 @@ .PP \-V show the version info. -# Addressing flags -.PP -\-D use directed path address arguments. The path - is a comma separated list of out ports. - Examples: - "0" # self port - "0,1,2,1,4" # out via port 1, then out via port 2, ... -.PP -\-G use GUID address argument. In most cases, it is the Port GUID. - Example: - "0x08f1040023" -.PP -\-s <smlid> use 'smlid' as the target lid for SM/SA queries. - # Other common flags: .PP \-C <ca_name> use the specified ca_name. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/man/ibtracert.8 new/infiniband-diags-1.4.1/man/ibtracert.8 --- old/infiniband-diags-1.4.1/man/ibtracert.8 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/man/ibtracert.8 2008-10-19 14:04:35.000000000 +0200 @@ -43,8 +43,6 @@ \-d raise the IB debugging level. May be used several times (-ddd or -d -d -d). .PP -\-e show send and receive errors (timeouts and others) -.PP \-h show the usage message .PP \-v increase the application verbosity level. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/man/perfquery.8 new/infiniband-diags-1.4.1/man/perfquery.8 --- old/infiniband-diags-1.4.1/man/perfquery.8 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/man/perfquery.8 2008-10-19 14:04:35.000000000 +0200 @@ -5,7 +5,7 @@ .SH SYNOPSIS .B perfquery -[\-d(ebug)] [\-G(uid)] [-e(xtended)] [-a(ll_ports)] [-r(eset_after_read)] [-R(eset_only)] [\-C ca_name] [\-P ca_port] [\-t(imeout) timeout_ms] [\-V(ersion)] [\-h(elp)] [<lid|guid> [[port] [reset_mask]]] +[\-d(ebug)] [\-G(uid)] [-e(xtended)] [-a(ll_ports)] [-l(oop_ports)] [-r(eset_after_read)] [-R(eset_only)] [\-C ca_name] [\-P ca_port] [\-t(imeout) timeout_ms] [\-V(ersion)] [\-h(elp)] [<lid|guid> [[port] [reset_mask]]] .SH DESCRIPTION .PP @@ -18,6 +18,8 @@ that represent Data (e.g. PortXmitData and PortRcvData) indicate octets divided by 4 rather than just octets. +Note: Inputting a port of 255 indicates an operation be performed on all ports. + .SH OPTIONS .PP @@ -27,8 +29,15 @@ Note that extended port counters attribute is optional. .TP \fB\-a\fR, \fB\-\-all_ports\fR -show aggregated counters for all ports of the destination lid. -Note all ports support is optional. +show aggregated counters for all ports of the destination lid +or reset all counters for all ports. If the destination lid +does not support the AllPortSelect flag, all ports will be +iterated through to emulate AllPortSelect behavior. +.TP +\fB\-l\fR, \fB\-\-loop_ports\fR +If all ports are selected by the user (either through the +\fB\-a\fR option or port 255) iterate through each port +rather than doing than aggregate operation. .TP \fB\-r\fR, \fB\-\-reset_after_read\fR reset counters after read diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/scripts/ibclearcounters.in new/infiniband-diags-1.4.1/scripts/ibclearcounters.in --- old/infiniband-diags-1.4.1/scripts/ibclearcounters.in 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/scripts/ibclearcounters.in 2008-10-19 14:04:35.000000000 +0200 @@ -3,7 +3,7 @@ IBPATH=${IBPATH:-@IBSCRIPTPATH@} function usage() { - echo Usage: `basename $0` "[-h] [-N | -nocolor] [<topology-file>" \ + echo Usage: `basename $0` "[-h] [<topology-file>" \ "| -C ca_name -P ca_port -t(imeout) timeout_ms]" exit -1 } @@ -26,9 +26,6 @@ -h) usage ;; - -N|-nocolor) - gflags=-N - ;; -P | -C | -t | -timeout) case $2 in -*) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/scripts/ibclearerrors.in new/infiniband-diags-1.4.1/scripts/ibclearerrors.in --- old/infiniband-diags-1.4.1/scripts/ibclearerrors.in 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/scripts/ibclearerrors.in 2008-10-19 14:04:35.000000000 +0200 @@ -65,6 +65,12 @@ rv=$? echo "$text" | awk ' +function clear_all_errors(lid, port) +{ + if (system("'$IBPATH'/perfquery'"$ca_info"' '$gflags' -R -a " lid " " port " 0x0fff")) + nodeerr++ +} + function clear_errors(lid, port) { if (system("'$IBPATH'/perfquery'"$ca_info"' '$gflags' -R " lid " " port " 0x0fff")) @@ -79,7 +85,7 @@ lid = substr($0, index($0, "port 0 lid ") + 11) lid = substr(lid, 1, index(lid, " ") - 1) - clear_errors(lid, 255) + clear_all_errors(lid, 255) } /^\[/ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/scripts/ibprintswitch.pl new/infiniband-diags-1.4.1/scripts/ibprintswitch.pl --- old/infiniband-diags-1.4.1/scripts/ibprintswitch.pl 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/scripts/ibprintswitch.pl 2008-10-19 14:04:35.000000000 +0200 @@ -1,5 +1,6 @@ #!/usr/bin/perl # +# Copyright (c) 2008 Voltaire, Inc. All rights reserved. # Copyright (c) 2006 The Regents of the University of California. # # Produced at Lawrence Livermore National Laboratory. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/scripts/ibqueryerrors.pl new/infiniband-diags-1.4.1/scripts/ibqueryerrors.pl --- old/infiniband-diags-1.4.1/scripts/ibqueryerrors.pl 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/scripts/ibqueryerrors.pl 2008-10-19 14:04:35.000000000 +0200 @@ -1,5 +1,6 @@ #!/usr/bin/perl # +# Copyright (c) 2008 Voltaire, Inc. All rights reserved. # Copyright (c) 2006 The Regents of the University of California. # # Produced at Lawrence Livermore National Laboratory. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/scripts/ibswportwatch.pl new/infiniband-diags-1.4.1/scripts/ibswportwatch.pl --- old/infiniband-diags-1.4.1/scripts/ibswportwatch.pl 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/scripts/ibswportwatch.pl 2008-10-19 14:04:35.000000000 +0200 @@ -1,5 +1,6 @@ #!/usr/bin/perl # +# Copyright (c) 2008 Voltaire, Inc. All rights reserved. # Copyright (c) 2006 The Regents of the University of California. # # Produced at Lawrence Livermore National Laboratory. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/src/ibaddr.c new/infiniband-diags-1.4.1/src/ibaddr.c --- old/infiniband-diags-1.4.1/src/ibaddr.c 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/src/ibaddr.c 2008-10-19 14:04:35.000000000 +0200 @@ -97,7 +97,7 @@ else basename++; - fprintf(stderr, "Usage: %s [-d(ebug) -D(irect) -G(uid) -l(id_show) -g(id_show) -C ca_name -P ca_port " + fprintf(stderr, "Usage: %s [-d(ebug) -D(irect) -G(uid) -l(id_show) -g(id_show) -s(m_port) sm_lid -C ca_name -P ca_port " "-t(imeout) timeout_ms -V(ersion) -h(elp)] [<lid|dr_path|guid>]\n", basename); fprintf(stderr, "\tExamples:\n"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/src/ibnetdiscover.c new/infiniband-diags-1.4.1/src/ibnetdiscover.c --- old/infiniband-diags-1.4.1/src/ibnetdiscover.c 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/src/ibnetdiscover.c 2008-10-19 14:04:35.000000000 +0200 @@ -424,7 +424,7 @@ if (get_port(&port_buf, i, path) < 0) { IBWARN("can't reach node %s port %d", portid2str(path), i); - return 0; + continue; } port = find_port(node, &port_buf); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/src/ibping.c new/infiniband-diags-1.4.1/src/ibping.c --- old/infiniband-diags-1.4.1/src/ibping.c 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/src/ibping.c 2008-10-19 14:04:35.000000000 +0200 @@ -174,7 +174,7 @@ printf("\n--- %s (%s) ibping statistics ---\n", last_host, portid2str(&portid)); printf("%" PRIu64 " packets transmitted, %" PRIu64 " received, %" PRIu64 "%% packet loss, time %" PRIu64 " ms\n", ntrans, replied, - (lost != 0) ? lost * 100ull / ntrans : 0ull, total_time / 1000ull); + (lost != 0) ? lost * 100 / ntrans : 0, total_time / 1000); printf("rtt min/avg/max = %" PRIu64 ".%03" PRIu64 "/%" PRIu64 ".%03" PRIu64 "/%" PRIu64 ".%03" PRIu64 " ms\n", minrtt == ~0ull ? 0 : minrtt/1000, minrtt == ~0ull ? 0 : minrtt%1000, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/src/ibsysstat.c new/infiniband-diags-1.4.1/src/ibsysstat.c --- old/infiniband-diags-1.4.1/src/ibsysstat.c 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/src/ibsysstat.c 2008-10-19 14:04:35.000000000 +0200 @@ -100,8 +100,10 @@ for (i = 0; i < host_ncpu && sz > 0; i++) { n = snprintf(s, sz, "cpu %d: model %s MHZ %s\n", i, cpus[i].model, cpus[i].mhz); - if (n >= sz) + if (n >= sz) { + IBWARN("cpuinfo truncated"); break; + } sz -= n; s += n; } @@ -187,14 +189,16 @@ FILE *f; int ncpu = 0; - if (!(f = fopen("/proc/cpuinfo", "r"))) - return -1; + if (!(f = fopen("/proc/cpuinfo", "r"))) { + IBWARN("couldn't open /proc/cpuinfo"); + return 0; + } while (fgets(line, sizeof(line) - 1, f)) { if (!strncmp(line, "processor\t", 10)) { ncpu++; if (ncpu > MAX_CPUS) - return ncpu; + return MAX_CPUS; continue; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/src/ibtracert.c new/infiniband-diags-1.4.1/src/ibtracert.c --- old/infiniband-diags-1.4.1/src/ibtracert.c 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/src/ibtracert.c 2008-10-19 14:04:35.000000000 +0200 @@ -673,6 +673,20 @@ free(nodename); } +static int resolve_lid(ib_portid_t *portid, const void *srcport) +{ + uint8_t portinfo[64]; + uint16_t lid; + + if (!smp_query_via(portinfo, portid, IB_ATTR_PORT_INFO, 0, 0, srcport)) + return -1; + mad_decode_field(portinfo, IB_PORT_LID_F, &lid); + + ib_portid_set(portid, lid, 0, 0); + + return 0; +} + static void usage(void) { @@ -806,6 +820,15 @@ if (ib_resolve_portid_str(&dest_portid, argv[1], dest_type, sm_id) < 0) IBERROR("can't resolve destination port %s", argv[1]); + if (dest_type == IB_DEST_DRPATH) { + if (resolve_lid(&src_portid, NULL) < 0) + IBERROR("cannot resolve lid for port \'%s\'", + portid2str(&src_portid)); + if (resolve_lid(&dest_portid, NULL) < 0) + IBERROR("cannot resolve lid for port \'%s\'", + portid2str(&dest_portid)); + } + if (dest_portid.lid == 0 || src_portid.lid == 0) { IBWARN("bad src/dest lid"); usage(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/src/perfquery.c new/infiniband-diags-1.4.1/src/perfquery.c --- old/infiniband-diags-1.4.1/src/perfquery.c 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/src/perfquery.c 2008-10-19 14:04:35.000000000 +0200 @@ -49,10 +49,49 @@ #include "ibdiag_common.h" +struct perf_count { + uint32_t portselect; + uint32_t counterselect; + uint32_t symbolerrors; + uint32_t linkrecovers; + uint32_t linkdowned; + uint32_t rcverrors; + uint32_t rcvremotephyerrors; + uint32_t rcvswrelayerrors; + uint32_t xmtdiscards; + uint32_t xmtconstrainterrors; + uint32_t rcvconstrainterrors; + uint32_t linkintegrityerrors; + uint32_t excbufoverrunerrors; + uint32_t vl15dropped; + uint32_t xmtdata; + uint32_t rcvdata; + uint32_t xmtpkts; + uint32_t rcvpkts; +}; + +struct perf_count_ext { + uint32_t portselect; + uint32_t counterselect; + uint64_t portxmitdata; + uint64_t portrcvdata; + uint64_t portxmitpkts; + uint64_t portrcvpkts; + uint64_t portunicastxmitpkts; + uint64_t portunicastrcvpkts; + uint64_t portmulticastxmitpkits; + uint64_t portmulticastrcvpkts; +}; + static uint8_t pc[1024]; +struct perf_count perf_count = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; +struct perf_count_ext perf_count_ext = {0,0,0,0,0,0,0,0,0,0}; + char *argv0 = "perfquery"; +#define ALL_PORTS 0xFF + static void usage(void) { @@ -63,7 +102,7 @@ else basename++; - fprintf(stderr, "Usage: %s [-d(ebug) -G(uid) -a(ll_ports) -r(eset_after_read) -C ca_name -P ca_port " + fprintf(stderr, "Usage: %s [-d(ebug) -G(uid) -a(ll_ports) -l(oop_ports) -r(eset_after_read) -C ca_name -P ca_port " "-R(eset_only) -t(imeout) timeout_ms -V(ersion) -h(elp)] [<lid|guid> [[port] [reset_mask]]]\n", basename); fprintf(stderr, "\tExamples:\n"); @@ -81,6 +120,216 @@ exit(-1); } +/* Notes: IB semantics is to cap counters if count has exceeded limits. + * Therefore we must check for overflows and cap the counters if necessary. + * + * mad_decode_field and mad_encode_field assume 32 bit integers passed in + * for fields < 32 bits in length. + */ + +static void aggregate_4bit(uint32_t *dest, uint32_t val) +{ + if ((((*dest) + val) < (*dest)) + || ((*dest) + val) > 0xf) + (*dest) = 0xf; + else + (*dest) = (*dest) + val; +} + +static void aggregate_8bit(uint32_t *dest, uint32_t val) +{ + if ((((*dest) + val) < (*dest)) + || ((*dest) + val) > 0xff) + (*dest) = 0xff; + else + (*dest) = (*dest) + val; +} + +static void aggregate_16bit(uint32_t *dest, uint32_t val) +{ + if ((((*dest) + val) < (*dest)) + || ((*dest) + val) > 0xffff) + (*dest) = 0xffff; + else + (*dest) = (*dest) + val; +} + +static void aggregate_32bit(uint32_t *dest, uint32_t val) +{ + if (((*dest) + val) < (*dest)) + (*dest) = 0xffffffff; + else + (*dest) = (*dest) + val; +} + +static void aggregate_64bit(uint64_t *dest, uint64_t val) +{ + if (((*dest) + val) < (*dest)) + (*dest) = 0xffffffffffffffffULL; + else + (*dest) = (*dest) + val; +} + +static void aggregate_perfcounters(void) +{ + uint32_t val; + + mad_decode_field(pc, IB_PC_PORT_SELECT_F, &val); + perf_count.portselect = val; + mad_decode_field(pc, IB_PC_COUNTER_SELECT_F, &val); + perf_count.counterselect = val; + mad_decode_field(pc, IB_PC_ERR_SYM_F, &val); + aggregate_16bit(&perf_count.symbolerrors, val); + mad_decode_field(pc, IB_PC_LINK_RECOVERS_F, &val); + aggregate_8bit(&perf_count.linkrecovers, val); + mad_decode_field(pc, IB_PC_LINK_DOWNED_F, &val); + aggregate_8bit(&perf_count.linkdowned, val); + mad_decode_field(pc, IB_PC_ERR_RCV_F, &val); + aggregate_16bit(&perf_count.rcverrors, val); + mad_decode_field(pc, IB_PC_ERR_PHYSRCV_F, &val); + aggregate_16bit(&perf_count.rcvremotephyerrors, val); + mad_decode_field(pc, IB_PC_ERR_SWITCH_REL_F, &val); + aggregate_16bit(&perf_count.rcvswrelayerrors, val); + mad_decode_field(pc, IB_PC_XMT_DISCARDS_F, &val); + aggregate_16bit(&perf_count.xmtdiscards, val); + mad_decode_field(pc, IB_PC_ERR_XMTCONSTR_F, &val); + aggregate_8bit(&perf_count.xmtconstrainterrors, val); + mad_decode_field(pc, IB_PC_ERR_RCVCONSTR_F, &val); + aggregate_8bit(&perf_count.rcvconstrainterrors, val); + mad_decode_field(pc, IB_PC_ERR_LOCALINTEG_F, &val); + aggregate_4bit(&perf_count.linkintegrityerrors, val); + mad_decode_field(pc, IB_PC_ERR_EXCESS_OVR_F, &val); + aggregate_4bit(&perf_count.excbufoverrunerrors, val); + mad_decode_field(pc, IB_PC_VL15_DROPPED_F, &val); + aggregate_16bit(&perf_count.vl15dropped, val); + mad_decode_field(pc, IB_PC_XMT_BYTES_F, &val); + aggregate_32bit(&perf_count.xmtdata, val); + mad_decode_field(pc, IB_PC_RCV_BYTES_F, &val); + aggregate_32bit(&perf_count.rcvdata, val); + mad_decode_field(pc, IB_PC_XMT_PKTS_F, &val); + aggregate_32bit(&perf_count.xmtpkts, val); + mad_decode_field(pc, IB_PC_RCV_PKTS_F, &val); + aggregate_32bit(&perf_count.rcvpkts, val); +} + +static void output_aggregate_perfcounters(ib_portid_t *portid) +{ + char buf[1024]; + uint32_t val = ALL_PORTS; + + /* set port_select to 255 to emulate AllPortSelect */ + mad_encode_field(pc, IB_PC_PORT_SELECT_F, &val); + mad_encode_field(pc, IB_PC_COUNTER_SELECT_F, &perf_count.counterselect); + mad_encode_field(pc, IB_PC_ERR_SYM_F, &perf_count.symbolerrors); + mad_encode_field(pc, IB_PC_LINK_RECOVERS_F, &perf_count.linkrecovers); + mad_encode_field(pc, IB_PC_LINK_DOWNED_F, &perf_count.linkdowned); + mad_encode_field(pc, IB_PC_ERR_RCV_F, &perf_count.rcverrors); + mad_encode_field(pc, IB_PC_ERR_PHYSRCV_F, &perf_count.rcvremotephyerrors); + mad_encode_field(pc, IB_PC_ERR_SWITCH_REL_F, &perf_count.rcvswrelayerrors); + mad_encode_field(pc, IB_PC_XMT_DISCARDS_F, &perf_count.xmtdiscards); + mad_encode_field(pc, IB_PC_ERR_XMTCONSTR_F, &perf_count.xmtconstrainterrors); + mad_encode_field(pc, IB_PC_ERR_RCVCONSTR_F, &perf_count.rcvconstrainterrors); + mad_encode_field(pc, IB_PC_ERR_LOCALINTEG_F, &perf_count.linkintegrityerrors); + mad_encode_field(pc, IB_PC_ERR_EXCESS_OVR_F, &perf_count.excbufoverrunerrors); + mad_encode_field(pc, IB_PC_VL15_DROPPED_F, &perf_count.vl15dropped); + mad_encode_field(pc, IB_PC_XMT_BYTES_F, &perf_count.xmtdata); + mad_encode_field(pc, IB_PC_RCV_BYTES_F, &perf_count.rcvdata); + mad_encode_field(pc, IB_PC_XMT_PKTS_F, &perf_count.xmtpkts); + mad_encode_field(pc, IB_PC_RCV_PKTS_F, &perf_count.rcvpkts); + + mad_dump_perfcounters(buf, sizeof buf, pc, sizeof pc); + + printf("# Port counters: %s port %d\n%s", portid2str(portid), ALL_PORTS, buf); +} + +static void aggregate_perfcounters_ext(void) +{ + uint32_t val; + uint64_t val64; + + mad_decode_field(pc, IB_PC_EXT_PORT_SELECT_F, &val); + perf_count_ext.portselect = val; + mad_decode_field(pc, IB_PC_EXT_COUNTER_SELECT_F, &val); + perf_count_ext.counterselect = val; + mad_decode_field(pc, IB_PC_EXT_XMT_BYTES_F, &val64); + aggregate_64bit(&perf_count_ext.portxmitdata, val64); + mad_decode_field(pc, IB_PC_EXT_RCV_BYTES_F, &val64); + aggregate_64bit(&perf_count_ext.portrcvdata, val64); + mad_decode_field(pc, IB_PC_EXT_XMT_PKTS_F, &val64); + aggregate_64bit(&perf_count_ext.portxmitpkts, val64); + mad_decode_field(pc, IB_PC_EXT_RCV_PKTS_F, &val64); + aggregate_64bit(&perf_count_ext.portrcvpkts, val64); + mad_decode_field(pc, IB_PC_EXT_XMT_UPKTS_F, &val64); + aggregate_64bit(&perf_count_ext.portunicastxmitpkts, val64); + mad_decode_field(pc, IB_PC_EXT_RCV_UPKTS_F, &val64); + aggregate_64bit(&perf_count_ext.portunicastrcvpkts, val64); + mad_decode_field(pc, IB_PC_EXT_XMT_MPKTS_F, &val64); + aggregate_64bit(&perf_count_ext.portmulticastxmitpkits, val64); + mad_decode_field(pc, IB_PC_EXT_RCV_MPKTS_F, &val64); + aggregate_64bit(&perf_count_ext.portmulticastrcvpkts, val64); +} + +static void output_aggregate_perfcounters_ext(ib_portid_t *portid) +{ + char buf[1024]; + uint32_t val = ALL_PORTS; + + /* set port_select to 255 to emulate AllPortSelect */ + mad_encode_field(pc, IB_PC_EXT_PORT_SELECT_F, &val); + mad_encode_field(pc, IB_PC_EXT_COUNTER_SELECT_F, &perf_count_ext.counterselect); + mad_encode_field(pc, IB_PC_EXT_XMT_BYTES_F, &perf_count_ext.portxmitdata); + mad_encode_field(pc, IB_PC_EXT_RCV_BYTES_F, &perf_count_ext.portrcvdata); + mad_encode_field(pc, IB_PC_EXT_XMT_PKTS_F, &perf_count_ext.portxmitpkts); + mad_encode_field(pc, IB_PC_EXT_RCV_PKTS_F, &perf_count_ext.portrcvpkts); + mad_encode_field(pc, IB_PC_EXT_XMT_UPKTS_F, &perf_count_ext.portunicastxmitpkts); + mad_encode_field(pc, IB_PC_EXT_RCV_UPKTS_F, &perf_count_ext.portunicastrcvpkts); + mad_encode_field(pc, IB_PC_EXT_XMT_MPKTS_F, &perf_count_ext.portmulticastxmitpkits); + mad_encode_field(pc, IB_PC_EXT_RCV_MPKTS_F, &perf_count_ext.portmulticastrcvpkts); + + mad_dump_perfcounters_ext(buf, sizeof buf, pc, sizeof pc); + + printf("# Port counters: %s port %d\n%s", portid2str(portid), ALL_PORTS, buf); +} + +static void dump_perfcounters(int extended, int timeout, uint16_t cap_mask, ib_portid_t *portid, + int port, int aggregate) +{ + char buf[1024]; + + if (extended != 1) { + if (!port_performance_query(pc, portid, port, timeout)) + IBERROR("perfquery"); + if (aggregate) + aggregate_perfcounters(); + else + mad_dump_perfcounters(buf, sizeof buf, pc, sizeof pc); + } else { + if (!(cap_mask & 0x200)) /* 1.2 errata: bit 9 is extended counter support */ + IBWARN("PerfMgt ClassPortInfo 0x%x extended counters not indicated\n", cap_mask); + + if (!port_performance_ext_query(pc, portid, port, timeout)) + IBERROR("perfextquery"); + if (aggregate) + aggregate_perfcounters_ext(); + else + mad_dump_perfcounters_ext(buf, sizeof buf, pc, sizeof pc); + } + + if (!aggregate) + printf("# Port counters: %s port %d\n%s", portid2str(portid), port, buf); +} + +static void reset_counters(int extended, int timeout, int mask, ib_portid_t *portid, int port) +{ + if (extended != 1) { + if (!port_performance_reset(pc, portid, port, mask, timeout)) + IBERROR("perf reset"); + } else { + if (!port_performance_ext_reset(pc, portid, port, mask, timeout)) + IBERROR("perf ext reset"); + } +} + int main(int argc, char **argv) { @@ -90,20 +339,23 @@ extern int ibdebug; int dest_type = IB_DEST_LID; int timeout = 0; /* use default */ - int mask = 0xffff, all = 0; + int mask = 0xffff, all_ports = 0; int reset = 0, reset_only = 0; int port = 0; - char buf[1024]; int udebug = 0; char *ca = 0; int ca_port = 0; int extended = 0; uint16_t cap_mask; - int allports = 0; - int node_type, num_ports; + int all_ports_loop = 0; + int loop_ports = 0; + int node_type, num_ports = 0; uint8_t data[IB_SMP_DATA_SIZE]; + int start_port = 1; + int enhancedport0; + int i; - static char const str_opts[] = "C:P:s:t:dGearRVhu"; + static char const str_opts[] = "C:P:s:t:dGealrRVhu"; static const struct option long_opts[] = { { "C", 1, 0, 'C'}, { "P", 1, 0, 'P'}, @@ -111,6 +363,7 @@ { "Guid", 0, 0, 'G'}, { "extended", 0, 0, 'e'}, { "all_ports", 0, 0, 'a'}, + { "loop_ports", 0, 0, 'l'}, { "reset_after_read", 0, 0, 'r'}, { "Reset_only", 0, 0, 'R'}, { "sm_portid", 1, 0, 's'}, @@ -138,8 +391,11 @@ extended = 1; break; case 'a': - all++; - port = 0xff; + all_ports++; + port = ALL_PORTS; + break; + case 'l': + loop_ports++; break; case 'd': ibdebug++; @@ -197,70 +453,60 @@ /* ClassPortInfo should be supported as part of libibmad */ memcpy(&cap_mask, pc+2, sizeof(cap_mask)); /* CapabilityMask */ cap_mask = ntohs(cap_mask); - if (!(cap_mask & 0x100)) /* bit 8 is AllPortSelect */ - if (port == 255) { - allports = 1; - IBWARN("AllPortSelect not supported"); - } - - if (allports == 1) { - - /* - * Simulate all ports support in PMA - * Determine node type, number of (physical) ports, - * and, if switch, whether SP0 is enhanced - * to determine first and last port to query - */ + if (!(cap_mask & 0x100)) { /* bit 8 is AllPortSelect */ + if (!all_ports && port == ALL_PORTS) + IBERROR("AllPortSelect not supported"); + if (all_ports) + all_ports_loop = 1; + } - /* For now, support single port CAs */ + if (all_ports_loop || (loop_ports && (all_ports || port == ALL_PORTS))) { if (smp_query(data, &portid, IB_ATTR_NODE_INFO, 0, 0) < 0) IBERROR("smp query nodeinfo failed"); node_type = mad_get_field(data, 0, IB_NODE_TYPE_F); - if (node_type != IB_NODE_CA) /* NodeType other than CA ? */ - IBERROR("smp query nodeinfo: Node type not CA"); mad_decode_field(data, IB_NODE_NPORTS_F, &num_ports); - if (num_ports != 1) - IBERROR("smp query nodeinfo: %d ports; only 1 supported currently", num_ports); - port = num_ports; + if (!num_ports) + IBERROR("smp query nodeinfo: num ports invalid"); + + if (node_type == IB_NODE_SWITCH) { + if (smp_query(data, &portid, IB_ATTR_SWITCH_INFO, 0, 0) < 0) + IBERROR("smp query nodeinfo failed"); + enhancedport0 = mad_get_field(data, 0, IB_SW_ENHANCED_PORT0_F); + if (enhancedport0) + start_port = 0; + } + if (all_ports_loop && !loop_ports) + IBWARN("Emulating AllPortSelect by iterating through all ports"); } if (reset_only) goto do_reset; - if (extended != 1) { - if (!port_performance_query(pc, &portid, port, timeout)) - IBERROR("perfquery"); - - if (allports == 1) - pc[1] = 255; /* fake PortSelect */ - - mad_dump_perfcounters(buf, sizeof buf, pc, sizeof pc); - } else { - if (!(cap_mask & 0x200)) /* 1.2 errata: bit 9 is extended counter support */ - IBWARN("PerfMgt ClassPortInfo 0x%x extended counters not indicated\n", cap_mask); - - if (!port_performance_ext_query(pc, &portid, port, timeout)) - IBERROR("perfextquery"); - - if (allports == 1) - pc[1] = 255; /* fake PortSelect */ - - mad_dump_perfcounters_ext(buf, sizeof buf, pc, sizeof pc); + if (all_ports_loop || (loop_ports && (all_ports || port == ALL_PORTS))) { + for (i = start_port; i <= num_ports; i++) + dump_perfcounters(extended, timeout, cap_mask, &portid, i, + (all_ports_loop && !loop_ports)); + if (all_ports_loop && !loop_ports) { + if (extended != 1) + output_aggregate_perfcounters(&portid); + else + output_aggregate_perfcounters_ext(&portid); + } } - - printf("# Port counters: %s port %d\n%s", portid2str(&portid), port, buf); + else + dump_perfcounters(extended, timeout, cap_mask, &portid, port, 0); if (!reset) exit(0); do_reset: - if (extended != 1) { - if (!port_performance_reset(pc, &portid, port, mask, timeout)) - IBERROR("perf reset"); - } else { - if (!port_performance_ext_reset(pc, &portid, port, mask, timeout)) - IBERROR("perf ext reset"); + + if (all_ports_loop || (loop_ports && (all_ports || port == ALL_PORTS))) { + for (i = start_port; i <= num_ports; i++) + reset_counters(extended, timeout, mask, &portid, i); } + else + reset_counters(extended, timeout, mask, &portid, port); exit(0); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/infiniband-diags-1.4.1/src/saquery.c new/infiniband-diags-1.4.1/src/saquery.c --- old/infiniband-diags-1.4.1/src/saquery.c 2008-09-08 13:54:40.000000000 +0200 +++ new/infiniband-diags-1.4.1/src/saquery.c 2008-10-19 14:04:35.000000000 +0200 @@ -634,6 +634,21 @@ printf("\n"); } +static void dump_one_lft_record(void *data) +{ + ib_lft_record_t *lftr = data; + unsigned block = cl_ntoh16(lftr->block_num); + int i; + printf("LFT Record dump:\n" + "\t\tLID........................%u\n" + "\t\tBlock......................%u\n" + "\t\tLFT:\n", + cl_ntoh16(lftr->lid), block); + for (i = 0; i < 64 ; i++) + printf("\t\t%u\t%u\n", block*64 + i, lftr->lft[i]); + printf("\n"); +} + static void dump_results(osmv_query_res_t *r, void (*dump_func)(void *)) { int i; @@ -1251,6 +1266,41 @@ return status; } +static int +print_lft_records(const struct query_cmd *q, osm_bind_handle_t bind_handle, + int argc, char *argv[]) +{ + ib_lft_record_t lftr; + ib_net64_t comp_mask = 0; + int lid = 0, block = -1; + ib_api_status_t status; + + if (argc > 0) + parse_lid_and_ports(bind_handle, argv[0], + &lid, &block, NULL); + + memset(&lftr, 0, sizeof(lftr)); + + if (lid > 0) { + lftr.lid = cl_hton16(lid); + comp_mask |= IB_LFTR_COMPMASK_LID; + } + if (block >= 0) { + lftr.block_num = cl_hton16(block); + comp_mask |= IB_LFTR_COMPMASK_BLOCK; + } + + status = get_any_records(bind_handle, IB_MAD_ATTR_LFT_RECORD, 0, + comp_mask, &lftr, + ib_get_attr_offset(sizeof(lftr)), 0); + if (status != IB_SUCCESS) + return status; + + dump_results(&result, dump_one_lft_record); + return_mad(); + return status; +} + static osm_bind_handle_t get_bind_handle(void) { @@ -1344,6 +1394,8 @@ { "ServiceRecord", "SR", IB_MAD_ATTR_SERVICE_RECORD, }, { "PathRecord", "PR", IB_MAD_ATTR_PATH_RECORD, }, { "MCMemberRecord", "MCMR", IB_MAD_ATTR_MCMEMBER_RECORD, }, + { "LFTRecord", "LFTR", IB_MAD_ATTR_LFT_RECORD, "[[lid]/[block]]", + print_lft_records }, { 0 } }; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ibsim
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package ibsim checked in at Tue Oct 28 00:04:40 CET 2008. -------- --- ibsim/ibsim.changes 2008-09-10 15:21:32.000000000 +0200 +++ /d/STABLE/ibsim/ibsim.changes 2008-10-27 20:31:13.870882000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 27 20:30:36 CET 2008 - jjolly(a)suse.de + +- Updated to version from OFED 1.4 rc3 +- bzipped source tarball + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ibsim-0.4.tar.gz New: ---- ibsim-0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibsim.spec ++++++ --- /var/tmp/diff_new_pack.AG3722/_old 2008-10-28 00:04:22.000000000 +0100 +++ /var/tmp/diff_new_pack.AG3722/_new 2008-10-28 00:04:22.000000000 +0100 @@ -21,11 +21,11 @@ Name: ibsim Version: 0.4 -Release: 1 +Release: 4 License: BSD 3-Clause; GPL v2 or later Group: Productivity/Networking/Diagnostic BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: http://www.openfabrics.org/downloads/ibsim-0.4.tar.gz +Source: http://www.openfabrics.org/downloads/ibsim-0.4.tar.bz2 Url: http://www.openfabrics.org BuildRequires: libibcommon-devel libibmad-devel libibumad-devel @@ -59,5 +59,8 @@ %doc README COPYING TODO net-examples scripts %changelog +* Mon Oct 27 2008 jjolly(a)suse.de +- Updated to version from OFED 1.4 rc3 +- bzipped source tarball * Wed Sep 10 2008 jjolly(a)suse.de - Recreated the package for SLES11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ib-bonding
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package ib-bonding checked in at Tue Oct 28 00:04:13 CET 2008. -------- --- ib-bonding/ib-bonding.changes 2007-11-30 03:16:00.000000000 +0100 +++ /d/STABLE/ib-bonding/ib-bonding.changes 2008-10-27 20:27:47.149819000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 27 20:27:26 CET 2008 - jjolly(a)suse.de + +- Update to version from OFED 1.4 rc3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ib-bonding.spec ++++++ --- /var/tmp/diff_new_pack.d26926/_old 2008-10-28 00:03:57.000000000 +0100 +++ /var/tmp/diff_new_pack.d26926/_new 2008-10-28 00:03:57.000000000 +0100 @@ -1,20 +1,28 @@ # # spec file for package ib-bonding (Version 0.9.0) # -# Copyright (c) 2007 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. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: ib-bonding Url: http://www.openfabrics.org Summary: infiniband bonding tool Version: 0.9.0 -Release: 45 +Release: 137 Source0: %{name}-%{version}.tar.bz2 Source1: README Source2: conf.sysconfig @@ -58,17 +66,19 @@ /var/adm/fillup-templates/sysconfig.infiniband-%name %changelog -* Fri Nov 30 2007 - ro(a)suse.de +* Mon Oct 27 2008 jjolly(a)suse.de +- Update to version from OFED 1.4 rc3 +* Fri Nov 30 2007 ro(a)suse.de - drop the kmp package, all patches are in kernel now -* Thu Aug 09 2007 - ro(a)suse.de +* Thu Aug 09 2007 ro(a)suse.de - build using source from kernel and patches/fixes on top -* Mon Jul 23 2007 - hvogel(a)suse.de +* Mon Jul 23 2007 hvogel(a)suse.de - Fix sysconfig filename -* Thu Jul 12 2007 - hvogel(a)suse.de +* Thu Jul 12 2007 hvogel(a)suse.de - move the kernel modules to the right directory -* Thu Jul 12 2007 - hvogel(a)suse.de +* Thu Jul 12 2007 hvogel(a)suse.de - Add GPL v2 LICENSE files [#291345] -* Wed Jul 11 2007 - hvogel(a)suse.de +* Wed Jul 11 2007 hvogel(a)suse.de - Put configuration into the infiniband sysconfig file -* Wed Jul 11 2007 - hvogel(a)suse.de +* Wed Jul 11 2007 hvogel(a)suse.de - Initial Package, Version 0.9.0 ++++++ ib-bonding-0.9.0.tar.bz2 ++++++ ++++ 21344 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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