openSUSE Commits

Download

commit@lists.opensuse.org

August 2009

1 participants
1215 discussions

commit kdevplatform for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package kdevplatform for openSUSE:Factory checked in at Sat Aug 1 11:35:57 CEST 2009. -------- --- KDE/kdevplatform/kdevplatform.changes 2009-06-28 16:47:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdevplatform/kdevplatform.changes 2009-07-31 23:01:07.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 31 22:59:52 CEST 2009 - beineri(a)opensuse.org + +- fix build with boost 1.39.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fix-build.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevplatform.spec ++++++ --- /var/tmp/diff_new_pack.rpYyNj/_old 2009-08-01 11:26:43.000000000 +0200 +++ /var/tmp/diff_new_pack.rpYyNj/_new 2009-08-01 11:26:43.000000000 +0200 @@ -24,8 +24,9 @@ Summary: Base Package for Integrated Development Environments Url: http://www.kdevelop.org Version: 0.9.94 -Release: 1 +Release: 2 Source0: kdevplatform-%version.tar.bz2 +Patch: fix-build.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Requires: libkdevplatform0 = %{version} @@ -53,6 +54,7 @@ %prep %setup -q +%patch %build %cmake_kde4 -d build ++++++ fix-build.diff ++++++ Index: plugins/classbrowser/CMakeLists.txt =================================================================== --- plugins/classbrowser/CMakeLists.txt (revision 995561) +++ plugins/classbrowser/CMakeLists.txt (revision 995562) @@ -7,9 +7,9 @@ # workaround a boost bug in 1.37 and 1.38 that causes link failure when exceptions are disabled # see https://svn.boost.org/trac/boost/ticket/2947 for details -if( ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_PATCH_VERSION} VERSION_EQUAL 1.37.0 OR ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_PATCH_VERSION} VERSION_EQUAL 1.38.0 ) +if( ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_PATCH_VERSION} VERSION_GREATER 1.36.1 ) add_definitions( ${KDE4_ENABLE_EXCEPTIONS} ) -endif( ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_PATCH_VERSION} VERSION_EQUAL 1.37.0 OR ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_PATCH_VERSION} VERSION_EQUAL 1.38.0 ) +endif( ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_PATCH_VERSION} VERSION_GREATER 1.36.1 ) add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9512 ) Index: plugins/CMakeLists.txt =================================================================== --- plugins/CMakeLists.txt (revision 995562) +++ plugins/CMakeLists.txt (revision 995563) @@ -14,6 +14,7 @@ add_subdirectory(sourceformatter) add_subdirectory(documentswitcher) +set(Boost_ADDITIONAL_VERSION 1.39.0 1.39) macro_optional_find_package( Boost 1.35.0 ) macro_log_feature( Boost_FOUND "Boost" "Boost libraries for enabling the classbrowser" "http://www.boost.org" FALSE "1.35.0" "The boost libraries are needed to build the Class Browser" ) if(Boost_FOUND) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnome-bluetooth for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package gnome-bluetooth for openSUSE:Factory checked in at Sat Aug 1 11:26:27 CEST 2009. -------- --- GNOME/gnome-bluetooth/gnome-bluetooth.changes 2009-05-07 05:07:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-bluetooth/gnome-bluetooth.changes 2009-07-31 21:23:08.000000000 +0200 @@ -1,0 +2,91 @@ +Fri Jul 31 21:22:44 CEST 2009 - vuntz(a)novell.com + +- Remove Obsoletes for libgnome-bluetooth2 and libgnome-bluetooth6. + +------------------------------------------------------------------- +Wed Jul 29 17:19:44 CEST 2009 - dominique-obs(a)leuenberger.net + +- Update to version 2.27.8: + + All: + - A number of UI strings changes + + Applet: + - Make "Connect" in the menu for devices appear correctly after + pairing + - Filter for paired ObexFTP devices in the browse menu item + + Preferences: + - Add link to help + + Wizard: + - Fix crash when selecting a device where the name hasn't been + resolved yet + + Library: + - Add introspection support + - Export device and adapter models for easy enumeration + - Fix broken filtering for device category + - Fix possible crasher in spinner widget + - Ellipsise names in the chooser widget + - A number of API documentation fixes +- Rename libgnome-bluetooth6 to libgnome-bluetooth7 because of + soname change. +- Have libgnome-bluetooth7 Obsoletes libgnome-bluetooth6. + +------------------------------------------------------------------- +Sun Jun 28 01:33:35 CEST 2009 - captain.magnus(a)opensuse.org + +- Update to version 2.27.7.1: + + When deleting a device, pass it through the plugins + to delete any other associations + + Add a test program + + Add Geoclue GPS setup plugin + + Fix pairing some fixed PIN devices, and misc fixes +- Create subpackage plugins-geoclue + +------------------------------------------------------------------- +Wed Jun 17 15:29:05 CEST 2009 - vuntz(a)novell.com + +- Update to version 2.27.6: + + Applet: + - Use a better tooltip for the applet + - Add "Send File" and "Browse files" menu item for devices that + support it + - Add menu items to call the preferences for mice and keyboards + - Fix assertions when removing a device, and pairing it again + without the applet being restarted + - Don't show "Connect" for devices without input or audio + capabilities + - Support notification-daemon without any support for actions, + as used in Ubuntu + - Pass the device name to bluetooth-sendto + - Rework UI of all the pairing helper dialogues + + Preferences: + - Fix the adapter page not showing up when restarting + bluetoothd + - Add --dump debug option, to dump a list of all known devices + and their properties + + Send-to: + - Fix warning when sending an empty file + - Remove use of red labels on errors + - Remove obex-data-server support, and require obexd + - Try harder to get a device name + + Wizard: + - Fix handling for devices that use random passkeys, but can't + handle 6 digits (such as Sony CMT-DH5BT) + - Add Simple Pairing support + - Try harder to connect to devices after pairing them, fixes + the Microsoft Wireless Notebook Presenter Mouse 8000 not + working straight after pairing + - Allow skipping name resolution when we would be using a fixed + passkey + - Don't allow stepping back in the middle of pairing + - Add more instructions on the front page + - Many many UI changes + + Library: + - Allow getting arbitrary data from the backend for + BluetoothChooser users + - Only export the supported symbols in the library + - Add plugin support, so third-party applications can be setup, + for a particular device, from the preferences or the wizard + - Replace the search button with a "Searching" label and spinner +- Rename libgnome-bluetooth2 to libgnome-bluetooth6, and have it + Obsoletes libgnome-bluetooth2 <= 2.27.5. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-bluetooth-2.27.5.tar.bz2 New: ---- gnome-bluetooth-2.27.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-bluetooth.spec ++++++ --- /var/tmp/diff_new_pack.urfi31/_old 2009-08-01 11:24:14.000000000 +0200 +++ /var/tmp/diff_new_pack.urfi31/_new 2009-08-01 11:24:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gnome-bluetooth (Version 2.27.5) +# spec file for package gnome-bluetooth (Version 2.27.8) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,11 @@ Name: gnome-bluetooth BuildRequires: fdupes BuildRequires: gconf2-devel +# FIXME: fails to build with it as of 2.27.8 +# BuildRequires: gir-repository BuildRequires: gnome-doc-utils-devel +# FIXME: fails to build with it as of 2.27.8 +# BuildRequires: gobject-introspection-devel BuildRequires: hal-devel BuildRequires: intltool BuildRequires: libnotify-devel @@ -30,7 +34,7 @@ BuildRequires: update-desktop-files License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.27.5 +Version: 2.27.8 Release: 1 Summary: GNOME Bluetooth graphical utilities Url: http://usefulinc.com/software/gnome-bluetooth/ @@ -95,13 +99,13 @@ Anders Carlsson <andersca(a)gnu.org> James Henstridge <james(a)daa.com.au> -%package -n libgnome-bluetooth2 +%package -n libgnome-bluetooth7 License: GPL v2 or later Summary: GNOME Bluetooth graphical utilities Group: System/GUI/GNOME Obsoletes: libgnomebt1 <= 0.12 -%description -n libgnome-bluetooth2 +%description -n libgnome-bluetooth7 The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. @@ -121,6 +125,16 @@ Anders Carlsson <andersca(a)gnu.org> James Henstridge <james(a)daa.com.au> +%package plugins-geoclue +License: GPL v2 or later +Summary: GNOME Bluetooth Support +Group: System/GUI/GNOME +Requires: %{name} = %{version} + +%description plugins-geoclue +The gnome-bluetooth package contains graphical utilities to setup, +monitor and use Bluetooth devices. + %lang_package %prep %setup -q @@ -135,7 +149,7 @@ %install %makeinstall -rm $RPM_BUILD_ROOT/%{_libdir}/libgnome-bluetooth.la +find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file bluetooth-properties -G "Configure Bluetooth settings" -N "Bluetooth Properties" %suse_update_desktop_file bluetooth-applet -G "Bluetooth Manager applet" %find_lang %{name}2 @@ -147,13 +161,14 @@ rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre + %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun -%post -n libgnome-bluetooth2 -p /sbin/ldconfig +%post -n libgnome-bluetooth7 -p /sbin/ldconfig -%postun -n libgnome-bluetooth2 -p /sbin/ldconfig +%postun -n libgnome-bluetooth7 -p /sbin/ldconfig %files -f %{name}.schemas_list %defattr(-, root, root) @@ -164,10 +179,15 @@ %{_datadir}/gnome-bluetooth %{_datadir}/icons/hicolor/*/*/bluetooth* %{_mandir}/man1/bluetooth-* +# Own the plugin directory, but exclude the plugin library itself +%dir %{_libdir}/gnome-bluetooth +%dir %{_libdir}/gnome-bluetooth/plugins +# Exclude files which are in another package +%exclude %{_libdir}/gnome-bluetooth/plugins/libgbtgeoclue.so %files lang -f %{name}2.lang -%files -n libgnome-bluetooth2 +%files -n libgnome-bluetooth7 %defattr(-,root,root,-) %{_libdir}/libgnome-bluetooth.so.* @@ -178,4 +198,8 @@ %{_libdir}/pkgconfig/gnome-bluetooth-1.0.pc %{_datadir}/gtk-doc/html/gnome-bluetooth +%files plugins-geoclue +%defattr(-,root,root,-) +%{_libdir}/gnome-bluetooth/plugins/libgbtgeoclue.so + %changelog ++++++ gnome-bluetooth-2.27.5.tar.bz2 -> gnome-bluetooth-2.27.8.tar.bz2 ++++++ ++++ 132943 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 attr for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package attr for openSUSE:Factory checked in at Sat Aug 1 11:23:28 CEST 2009. -------- --- attr/attr.changes 2009-02-13 08:29:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/attr/attr.changes 2009-08-01 04:29:51.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Aug 1 04:23:29 CEST 2009 - bphilips(a)novell.com + +- Version bump to 2.4.44 + - Stop quoting nonprintable characters in the getfattr output + - More license updates + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- attr-add-make-test-target-and-use-make-to-run-tests.patch attr-fix-walk_tree_recursive-for-the-walk_tree_dereference-case.patch attr-move-ext2-3-tests-into-seperate-test-file.patch attr-tests-for-path-recursion-with-l-p-r.patch attr-various-improvements-for-test-run.patch attr_2.4.43-1.tar.gz New: ---- attr-2.4.44.src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attr.spec ++++++ --- /var/tmp/diff_new_pack.lDXDgq/_old 2009-08-01 11:22:09.000000000 +0200 +++ /var/tmp/diff_new_pack.lDXDgq/_new 2009-08-01 11:22:09.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package attr (Version 2.4.43) +# spec file for package attr (Version 2.4.44) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,17 +22,12 @@ Group: System/Filesystems AutoReqProv: on Summary: Commands for Manipulating Extended Attributes -Version: 2.4.43 -Release: 4 -Source: %{name}_%{version}-1.tar.gz +Version: 2.4.44 +Release: 1 +Source: %{name}-%{version}.src.tar.gz Source1: xattr.conf Patch0: builddefs.in.diff -Patch1: attr-move-ext2-3-tests-into-seperate-test-file.patch -Patch2: attr-various-improvements-for-test-run.patch -Patch3: attr-add-make-test-target-and-use-make-to-run-tests.patch -Patch4: attr-tests-for-path-recursion-with-l-p-r.patch -Patch5: attr-fix-walk_tree_recursive-for-the-walk_tree_dereference-case.patch -Url: ftp://oss.sgi.com/projects/xfs/cmd_tars +Url: http://download.savannah.gnu.org/releases-noredirect/attr/ BuildRoot: %{_tmppath}/%{name}-%{version}-build License: GPL v2 or later Conflicts: xfsdump < 2.0.0 @@ -51,7 +46,7 @@ SGI %package -n libattr -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Summary: A dynamic library for filesystem extended attribute support AutoReqProv: on # bug437293 @@ -73,7 +68,7 @@ SGI %package -n libattr-devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Summary: Include Files and Libraries mandatory for Development AutoReqProv: on Group: Development/Libraries/C and C++ @@ -101,11 +96,6 @@ %prep %setup %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build export OPTIMIZER="$RPM_OPT_FLAGS -fPIC" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 acl for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package acl for openSUSE:Factory checked in at Sat Aug 1 11:21:47 CEST 2009. -------- --- acl/acl.changes 2009-02-14 02:32:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/acl/acl.changes 2009-08-01 04:29:43.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Aug 1 04:26:07 CEST 2009 - bphilips(a)novell.com + +- Version bump to 2.2.48 + - Document the new flags comments + - Include the S_ISUID, S_ISGID, S_ISVTX flags in the getfacl output, and restore them with "setfacl --restore=file". + - Make sure that getfacl -R only calls stat(2) on symlinks when it needs to + - Stop quoting nonprintable characters in the getfacl output + - Avoid unnecessary but destructive chown calls + - Clarify license notice + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- acl-2.2.47.src.tar.bz2 acl-Return-error-status-on-setfacl-failures.patch acl-add-getfacl-r-l-p-tests.patch acl-add-make-test-target-and-use-make-to-run-tests.patch acl-add-short-option-support-to-the-acl-commands.patch acl-fix-setfacl-for-long-utf8-filenames.patch acl-minor-fix-to-cp.test.patch acl-move-nfs-tests-to-their-own-folder.patch acl-move-root-tests-to-their-own-folder.patch acl-various-improvements-for-test-run.patch null-pointer-access.diff walk-tree-fix-for-deref.patch New: ---- acl-2.2.48.src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acl.spec ++++++ --- /var/tmp/diff_new_pack.yT9A63/_old 2009-08-01 11:20:31.000000000 +0200 +++ /var/tmp/diff_new_pack.yT9A63/_new 2009-08-01 11:20:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package acl (Version 2.2.47) +# spec file for package acl (Version 2.2.48) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,22 +23,11 @@ Group: System/Filesystems AutoReqProv: on Summary: Commands for Manipulating POSIX Access Control Lists -Version: 2.2.47 -Release: 31 -Source: %name-%version.src.tar.bz2 +Version: 2.2.48 +Release: 1 +Source: %name-%version.src.tar.gz Patch0: builddefs.in.diff -Patch1: walk-tree-fix-for-deref.patch -Patch2: null-pointer-access.diff -Patch3: acl-add-make-test-target-and-use-make-to-run-tests.patch -Patch4: acl-various-improvements-for-test-run.patch -Patch5: acl-move-root-tests-to-their-own-folder.patch -Patch6: acl-move-nfs-tests-to-their-own-folder.patch -Patch7: acl-minor-fix-to-cp.test.patch -Patch8: acl-add-getfacl-r-l-p-tests.patch -Patch9: acl-fix-setfacl-for-long-utf8-filenames.patch -Patch10: acl-Return-error-status-on-setfacl-failures.patch -Patch11: acl-add-short-option-support-to-the-acl-commands.patch -Url: ftp://oss.sgi.com/projects/xfs/cmd_tars +Url: http://download.savannah.gnu.org/releases-noredirect/acl/ License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,15 +35,13 @@ getfacl and setfacl commands for retrieving and setting POSIX access control lists. - - Authors: -------- Andreas Gruenbacher <a.gruenbacher(a)computer.org> SGI %package -n libacl -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Summary: A dynamic library for accessing POSIX Access Control Lists Group: System/Libraries # bug437293 @@ -68,15 +55,13 @@ POSIX 1003.1e draft standard 17 functions for manipulating access control lists. - - Authors: -------- Andreas Gruenbacher <a.gruenbacher(a)computer.org> SGI %package -n libacl-devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Summary: Include Files and Libraries mandatory for Development AutoReqProv: on Group: Development/Libraries/C and C++ @@ -93,8 +78,6 @@ This package contains all necessary include files and libraries needed to develop applications that require these. - - Authors: -------- SGI @@ -102,17 +85,6 @@ %prep %setup -n acl-%version %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 %build export OPTIMIZER="$RPM_OPT_FLAGS -fPIC" @@ -162,6 +134,7 @@ %dir %attr(755,root,root) /usr/share/doc/packages/acl %doc %attr(644,root,root) /usr/share/doc/packages/acl/CHANGES.gz %doc %attr(644,root,root) /usr/share/doc/packages/acl/COPYING +%doc %attr(644,root,root) /usr/share/doc/packages/acl/COPYING.LGPL %doc %attr(644,root,root) /usr/share/doc/packages/acl/PORTING %doc %attr(644,root,root) /usr/share/doc/packages/acl/README %doc %attr(644,root,root) %{_mandir}/man1/chacl.1.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Sat Aug 1 11:17:14 CEST 2009. -------- --- kernel-source/kernel-debug.changes 2009-07-20 20:40:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2009-07-30 04:06:58.000000000 +0200 @@ -1,0 +2,227 @@ +Wed Jul 29 16:00:59 CEST 2009 - tiwai(a)suse.de + +- Update config files: revert to CONFIG_SND=m and enabled again + CONFIG_SND_DEBUG=y + +------------------------------------------------------------------- +Tue Jul 28 12:23:12 CEST 2009 - mmarek(a)suse.cz + +- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc. + +------------------------------------------------------------------- +Tue Jul 28 11:21:11 CEST 2009 - mmarek(a)suse.cz + +- Update config files: disable CONFIG_FB_UDL on ia64. + +------------------------------------------------------------------- +Tue Jul 28 09:54:55 CEST 2009 - jbeulich(a)novell.com + +- config.conf: Remove duplicate i386/desktop entry. + +------------------------------------------------------------------- +Tue Jul 28 01:03:23 CEST 2009 - tiwai(a)suse.de + +- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555: + ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244). + +------------------------------------------------------------------- +Mon Jul 27 23:57:31 CEST 2009 - tiwai(a)suse.de + +- patches.drivers/alsa-pcm-*: ALSA PCM fixes +- Fix/enhancement patches backported from ALSA tree + * patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max: + ALSA: Add new TLV types for dBwith min/max (for usb). + * patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935). + * patches.drivers/alsa-hda-*: More HD-audio fixes + * patches.drivers/alsa-ice-*: ICE17xx fixes + * patches.drivers/alsa-midi-*: MIDI fixes + * patches.drivers/alsa-usb-*: USB-audio/MIDI fixes +- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks, + patches.drivers/alsa-ca0106-capture-bufsize-fix, + patches.drivers/alsa-ctxfi +- Update config files. + +------------------------------------------------------------------- +Mon Jul 27 17:06:11 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop + config-subst from the package. + +------------------------------------------------------------------- +Mon Jul 27 13:43:01 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo + subpackage with vmlinux.debug to fix build with new rpm. This + works for ix86 and x86_64, other archs might need further fixes. + +------------------------------------------------------------------- +Mon Jul 27 03:04:23 CEST 2009 - jeffm(a)suse.de + +- patches.rpmify/rtl8192su-build-fix: more ia64 fixes + +------------------------------------------------------------------- +Mon Jul 27 01:47:21 CEST 2009 - jeffm(a)suse.de + +- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes. + +------------------------------------------------------------------- +Mon Jul 27 01:45:37 CEST 2009 - jeffm(a)suse.de + +- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes. + +------------------------------------------------------------------- +Sun Jul 26 00:42:40 CEST 2009 - jeffm(a)suse.de + +- config.conf: Re-enabled trace flavor. + +------------------------------------------------------------------- +Fri Jul 24 21:23:54 CEST 2009 - jeffm(a)suse.de + +- Update config files: Disabled optimize for size on i386 and x86_64 + across all flavors. + +------------------------------------------------------------------- +Fri Jul 24 21:21:08 CEST 2009 - jeffm(a)suse.de + +- Update to 2.6.31-rc4. + +------------------------------------------------------------------- +Thu Jul 23 12:56:16 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition, + make %symbols a variable and only use it for selecting patches. + Also drop the RT symbol as there are not rt patches currently. + +------------------------------------------------------------------- +Thu Jul 23 11:58:25 CEST 2009 - mmarek(a)suse.cz + +- Change the s390(x) config layout so that each arch has its own + subdirectory, as it is done for other archs. s390/vanilla is a + symlink to s390x/vanilla. + +------------------------------------------------------------------- +Thu Jul 23 11:21:38 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common + macros to kernel-spec-macros. + +------------------------------------------------------------------- +Wed Jul 22 18:58:38 CEST 2009 - tiwai(a)suse.de + +- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 - + Fix the max capture buffer size (bnc#521890). + +------------------------------------------------------------------- +Wed Jul 22 17:28:36 CEST 2009 - tiwai(a)suse.de + +- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support + (FATE#306935). +- Update config files. + +------------------------------------------------------------------- +Wed Jul 22 13:08:35 CEST 2009 - trenn(a)suse.de + +These are mainline: +- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch: + Delete. +- patches.drivers/cpufreq_add_idle_microaccounting_6.patch: + Delete. +- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete. +- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch: + Delete. +- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch: + Delete. +- patches.drivers/cpufreq_parameterize_down_differential_4.patch: + Delete. + +------------------------------------------------------------------- +Wed Jul 22 12:57:54 CEST 2009 - trenn(a)suse.de + +These are mainline: +- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch: + Delete. +- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete. + +------------------------------------------------------------------- +Tue Jul 21 15:38:37 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: remove double-slash from include2/asm + symlink. + +------------------------------------------------------------------- +Tue Jul 21 12:09:42 CEST 2009 - mmarek(a)suse.cz + +- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from + the kernel-syms package. These flavor are often excluded in KMPs, + so excluding them from kernel-syms reduces useless build + dependencies. KMPs can buildrequire kernel-$flavor-devel + explicitely if desired. + +------------------------------------------------------------------- +Tue Jul 21 11:57:00 CEST 2009 - mmarek(a)suse.cz + +Delete obsolete apparmor patches. + +- patches.apparmor/add-path_permission.diff: Delete. +- patches.apparmor/add-security_path_permission: Delete. +- patches.apparmor/apparmor-2.6.25.diff: Delete. +- patches.apparmor/apparmor-audit.diff: Delete. +- patches.apparmor/apparmor-intree.diff: Delete. +- patches.apparmor/apparmor-lsm.diff: Delete. +- patches.apparmor/apparmor-main.diff: Delete. +- patches.apparmor/apparmor-misc.diff: Delete. +- patches.apparmor/apparmor-module_interface.diff: Delete. +- patches.apparmor/apparmor-network.diff: Delete. +- patches.apparmor/apparmor-path_permission: Delete. +- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete. +- patches.apparmor/apparmor-rlimits.diff: Delete. +- patches.apparmor/d_namespace_path.diff: Delete. +- patches.apparmor/d_namespace_path_oops_fix.diff: Delete. +- patches.apparmor/do_path_lookup-nameidata.diff: Delete. +- patches.apparmor/export-security_inode_permission-for-aufs: + Delete. +- patches.apparmor/file-handle-ops.diff: Delete. +- patches.apparmor/fix-complain.diff: Delete. +- patches.apparmor/fix-vfs_rmdir.diff: Delete. +- patches.apparmor/fork-tracking.diff: Delete. +- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete. +- patches.apparmor/fsetattr-restore-ia_file.diff: Delete. +- patches.apparmor/fsetattr.diff: Delete. +- patches.apparmor/remove_suid.diff: Delete. +- patches.apparmor/security-create.diff: Delete. +- patches.apparmor/security-getxattr.diff: Delete. +- patches.apparmor/security-link.diff: Delete. +- patches.apparmor/security-listxattr.diff: Delete. +- patches.apparmor/security-mkdir.diff: Delete. +- patches.apparmor/security-mknod.diff: Delete. +- patches.apparmor/security-readlink.diff: Delete. ++++ 90 more lines (skipped) ++++ between kernel-source/kernel-debug.changes ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes kernel-default.changes: same change kernel-desktop.changes: same change kernel-kdump.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change calling whatdependson for head-i586 Old: ---- config-subst kernel-xen.changes kernel-xen.spec New: ---- TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS kernel-spec-macros ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:20.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-debug (Version 2.6.30.2) +# spec file for package kernel-debug (Version 2.6.31) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,37 +17,23 @@ # norootforbuild -%define using_buildservice 0%{?opensuse_bs} -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) -# Don't use shell commands in build macros, this won't work outside of rpm +%define srcversion 2.6.30 +%define patchversion 2.6.31-rc4 +%define variant %{nil} +%include %_sourcedir/kernel-spec-macros %define build_flavor debug %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.30 -%define patchversion 2.6.30.2 -%define variant %{nil} -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) -%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) -%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) -%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')} -%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*}) +%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) +%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) +%define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE @@ -61,7 +47,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 2.6.30.2 +Version: 2.6.31 Release: 1 %if %using_buildservice %else @@ -127,11 +113,9 @@ Source12: pre.sh Source13: post.sh Source20: series.conf -Source21: config.conf Source22: supported.conf Source30: arch-symbols Source31: guards -Source32: config-subst Source33: check-for-config-changes Source34: check-supported-list Source40: source-timestamp @@ -155,7 +139,6 @@ Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 -%define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc64 x86_64 # These files are found in the kernel-source package: @@ -190,9 +173,6 @@ Obsoletes: at76_usb-kmp Obsoletes: pcc-acpi-kmp Obsoletes: btusb-kmp -# Build with bash instead of sh as the shell: this turns on bash -# extensions like <(...). -%define _buildshell /bin/bash # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -213,12 +193,16 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi -echo "Symbol(s):" %symbols +SYMBOLS=%name +if test -e %_sourcedir/extra-symbols; then + SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)" +fi +echo "Symbol(s):" $SYMBOLS # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 mkdir -p %kernel_build_dir supported_conf() { - %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } # Generate the list of modules to be marked as supported @@ -229,7 +213,7 @@ cd linux-%srcversion # Apply patches echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ +%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ %if %build_vanilla egrep '^patches\.(kernel\.org|rpmify)/' | \ %endif @@ -240,13 +224,15 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi -cat ../config/%cpu_arch_flavor \ -| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ -| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ +cp ../config/%cpu_arch_flavor .config +%build_src_dir/scripts/config \ + --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} - | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ + --enable CONFIG_DEBUG_INFO +%else + --disable CONFIG_DEBUG_INFO %endif - > .config MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -317,6 +303,7 @@ cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux + # FIXME: create and package build-id symlinks objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -328,6 +315,7 @@ | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 + echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files %else cp vmlinux %buildroot/$vmlinux %endif @@ -533,7 +521,7 @@ %rpm_install_dir/%cpu_arch_flavor/Makefile link=%rpm_install_dir/%cpu_arch_flavor/include2/asm target=$(readlink "$link") - target=${target#%build_src_dir} + target=${target#%build_src_dir/} rm "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi @@ -738,4 +726,17 @@ %endif %endif +%package devel-debuginfo +# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz +Summary: Debug information for package %name-devel +License: GPL v2 only +Group: Development/Debug + +%description devel-debuginfo +Debug information for package %name-devel + + +%source_timestamp +%files devel-debuginfo -f vmlinux.debug.files + %changelog ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:20.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-default (Version 2.6.30.2) +# spec file for package kernel-default (Version 2.6.31) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,37 +17,23 @@ # norootforbuild -%define using_buildservice 0%{?opensuse_bs} -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) -# Don't use shell commands in build macros, this won't work outside of rpm +%define srcversion 2.6.30 +%define patchversion 2.6.31-rc4 +%define variant %{nil} +%include %_sourcedir/kernel-spec-macros %define build_flavor default %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.30 -%define patchversion 2.6.30.2 -%define variant %{nil} -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) -%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) -%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) -%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')} -%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*}) +%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) +%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) +%define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE @@ -61,7 +47,7 @@ Name: kernel-default Summary: The Standard Kernel -Version: 2.6.30.2 +Version: 2.6.31 Release: 1 %if %using_buildservice %else @@ -143,11 +129,9 @@ Source12: pre.sh Source13: post.sh Source20: series.conf -Source21: config.conf Source22: supported.conf Source30: arch-symbols Source31: guards -Source32: config-subst Source33: check-for-config-changes Source34: check-supported-list Source40: source-timestamp @@ -171,7 +155,6 @@ Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 -%define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc ppc64 s390x x86_64 # These files are found in the kernel-source package: @@ -206,9 +189,6 @@ Obsoletes: at76_usb-kmp Obsoletes: pcc-acpi-kmp Obsoletes: btusb-kmp -# Build with bash instead of sh as the shell: this turns on bash -# extensions like <(...). -%define _buildshell /bin/bash # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -228,12 +208,16 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi -echo "Symbol(s):" %symbols +SYMBOLS=%name +if test -e %_sourcedir/extra-symbols; then + SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)" +fi +echo "Symbol(s):" $SYMBOLS # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 mkdir -p %kernel_build_dir supported_conf() { - %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } # Generate the list of modules to be marked as supported @@ -244,7 +228,7 @@ cd linux-%srcversion # Apply patches echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ +%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ %if %build_vanilla egrep '^patches\.(kernel\.org|rpmify)/' | \ %endif @@ -255,13 +239,15 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi -cat ../config/%cpu_arch_flavor \ -| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ -| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ +cp ../config/%cpu_arch_flavor .config +%build_src_dir/scripts/config \ + --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} - | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ + --enable CONFIG_DEBUG_INFO +%else + --disable CONFIG_DEBUG_INFO %endif - > .config MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -332,6 +318,7 @@ cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux + # FIXME: create and package build-id symlinks objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -343,6 +330,7 @@ | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 + echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files %else cp vmlinux %buildroot/$vmlinux %endif @@ -548,7 +536,7 @@ %rpm_install_dir/%cpu_arch_flavor/Makefile link=%rpm_install_dir/%cpu_arch_flavor/include2/asm target=$(readlink "$link") - target=${target#%build_src_dir} + target=${target#%build_src_dir/} rm "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi @@ -751,4 +739,17 @@ %endif %endif +%package devel-debuginfo +# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz +Summary: Debug information for package %name-devel +License: GPL v2 only +Group: Development/Debug + +%description devel-debuginfo +Debug information for package %name-devel + + +%source_timestamp +%files devel-debuginfo -f vmlinux.debug.files + %changelog ++++++ kernel-desktop.spec ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:20.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-desktop (Version 2.6.30.2) +# spec file for package kernel-desktop (Version 2.6.31) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,37 +17,23 @@ # norootforbuild -%define using_buildservice 0%{?opensuse_bs} -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) -# Don't use shell commands in build macros, this won't work outside of rpm +%define srcversion 2.6.30 +%define patchversion 2.6.31-rc4 +%define variant %{nil} +%include %_sourcedir/kernel-spec-macros %define build_flavor desktop %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.30 -%define patchversion 2.6.30.2 -%define variant %{nil} -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) -%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) -%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) -%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')} -%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*}) +%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) +%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) +%define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE @@ -61,7 +47,7 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop -Version: 2.6.30.2 +Version: 2.6.31 Release: 1 %if %using_buildservice %else @@ -127,11 +113,9 @@ Source12: pre.sh Source13: post.sh Source20: series.conf -Source21: config.conf Source22: supported.conf Source30: arch-symbols Source31: guards -Source32: config-subst Source33: check-for-config-changes Source34: check-supported-list Source40: source-timestamp @@ -155,7 +139,6 @@ Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 -%define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 # These files are found in the kernel-source package: @@ -190,9 +173,6 @@ Obsoletes: at76_usb-kmp Obsoletes: pcc-acpi-kmp Obsoletes: btusb-kmp -# Build with bash instead of sh as the shell: this turns on bash -# extensions like <(...). -%define _buildshell /bin/bash # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -206,7 +186,7 @@ and has many of the features that aren't usually used on desktop machines disabled. -This kernel upports up to 64GB of main memory. It requires Physical +This kernel supports up to 64GB of main memory. It requires Physical Addressing Extensions (PAE), which were introduced with the Pentium Pro processor. @@ -223,12 +203,16 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi -echo "Symbol(s):" %symbols +SYMBOLS=%name +if test -e %_sourcedir/extra-symbols; then + SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)" +fi +echo "Symbol(s):" $SYMBOLS # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 mkdir -p %kernel_build_dir supported_conf() { - %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } # Generate the list of modules to be marked as supported @@ -239,7 +223,7 @@ cd linux-%srcversion # Apply patches echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ +%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ %if %build_vanilla egrep '^patches\.(kernel\.org|rpmify)/' | \ %endif @@ -250,13 +234,15 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi -cat ../config/%cpu_arch_flavor \ -| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ -| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ +cp ../config/%cpu_arch_flavor .config +%build_src_dir/scripts/config \ + --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} - | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ + --enable CONFIG_DEBUG_INFO +%else + --disable CONFIG_DEBUG_INFO %endif - > .config MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -327,6 +313,7 @@ cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux + # FIXME: create and package build-id symlinks objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -338,6 +325,7 @@ | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 + echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files %else cp vmlinux %buildroot/$vmlinux %endif @@ -543,7 +531,7 @@ %rpm_install_dir/%cpu_arch_flavor/Makefile link=%rpm_install_dir/%cpu_arch_flavor/include2/asm target=$(readlink "$link") - target=${target#%build_src_dir} + target=${target#%build_src_dir/} rm "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi @@ -641,7 +629,7 @@ and has many of the features that aren't usually used on desktop machines disabled. -This kernel upports up to 64GB of main memory. It requires Physical +This kernel supports up to 64GB of main memory. It requires Physical Addressing Extensions (PAE), which were introduced with the Pentium Pro processor. @@ -691,7 +679,7 @@ and has many of the features that aren't usually used on desktop machines disabled. -This kernel upports up to 64GB of main memory. It requires Physical +This kernel supports up to 64GB of main memory. It requires Physical Addressing Extensions (PAE), which were introduced with the Pentium Pro processor. @@ -768,4 +756,17 @@ %endif %endif +%package devel-debuginfo +# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz +Summary: Debug information for package %name-devel +License: GPL v2 only +Group: Development/Debug + +%description devel-debuginfo +Debug information for package %name-devel + + +%source_timestamp +%files devel-debuginfo -f vmlinux.debug.files + %changelog ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:20.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-kdump (Version 2.6.30.2) +# spec file for package kernel-kdump (Version 2.6.31) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,37 +17,23 @@ # norootforbuild -%define using_buildservice 0%{?opensuse_bs} -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) -# Don't use shell commands in build macros, this won't work outside of rpm +%define srcversion 2.6.30 +%define patchversion 2.6.31-rc4 +%define variant %{nil} +%include %_sourcedir/kernel-spec-macros %define build_flavor kdump %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.30 -%define patchversion 2.6.30.2 -%define variant %{nil} -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) -%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) -%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) -%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')} -%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*}) +%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) +%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) +%define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE @@ -61,7 +47,7 @@ Name: kernel-kdump Summary: kernel for kdump -Version: 2.6.30.2 +Version: 2.6.31 Release: 1 %if %using_buildservice %else @@ -127,11 +113,9 @@ Source12: pre.sh Source13: post.sh Source20: series.conf -Source21: config.conf Source22: supported.conf Source30: arch-symbols Source31: guards -Source32: config-subst Source33: check-for-config-changes Source34: check-supported-list Source40: source-timestamp @@ -155,7 +139,6 @@ Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 -%define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 # These files are found in the kernel-source package: @@ -190,9 +173,6 @@ Obsoletes: at76_usb-kmp Obsoletes: pcc-acpi-kmp Obsoletes: btusb-kmp -# Build with bash instead of sh as the shell: this turns on bash -# extensions like <(...). -%define _buildshell /bin/bash # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -215,12 +195,16 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi -echo "Symbol(s):" %symbols +SYMBOLS=%name +if test -e %_sourcedir/extra-symbols; then + SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)" +fi +echo "Symbol(s):" $SYMBOLS # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 mkdir -p %kernel_build_dir supported_conf() { - %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } # Generate the list of modules to be marked as supported @@ -231,7 +215,7 @@ cd linux-%srcversion # Apply patches echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ +%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ %if %build_vanilla egrep '^patches\.(kernel\.org|rpmify)/' | \ %endif @@ -242,13 +226,15 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi -cat ../config/%cpu_arch_flavor \ -| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ -| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ +cp ../config/%cpu_arch_flavor .config +%build_src_dir/scripts/config \ + --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} - | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ + --enable CONFIG_DEBUG_INFO +%else + --disable CONFIG_DEBUG_INFO %endif - > .config MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -319,6 +305,7 @@ cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux + # FIXME: create and package build-id symlinks objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -330,6 +317,7 @@ | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 + echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files %else cp vmlinux %buildroot/$vmlinux %endif @@ -535,7 +523,7 @@ %rpm_install_dir/%cpu_arch_flavor/Makefile link=%rpm_install_dir/%cpu_arch_flavor/include2/asm target=$(readlink "$link") - target=${target#%build_src_dir} + target=${target#%build_src_dir/} rm "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi @@ -744,4 +732,17 @@ %endif %endif +%package devel-debuginfo +# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz +Summary: Debug information for package %name-devel +License: GPL v2 only +Group: Development/Debug + +%description devel-debuginfo +Debug information for package %name-devel + + +%source_timestamp +%files devel-debuginfo -f vmlinux.debug.files + %changelog ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:20.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-pae (Version 2.6.30.2) +# spec file for package kernel-pae (Version 2.6.31) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,37 +17,23 @@ # norootforbuild -%define using_buildservice 0%{?opensuse_bs} -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) -# Don't use shell commands in build macros, this won't work outside of rpm +%define srcversion 2.6.30 +%define patchversion 2.6.31-rc4 +%define variant %{nil} +%include %_sourcedir/kernel-spec-macros %define build_flavor pae %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.30 -%define patchversion 2.6.30.2 -%define variant %{nil} -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) -%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) -%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) -%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')} -%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*}) +%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) +%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) +%define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE @@ -61,7 +47,7 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 2.6.30.2 +Version: 2.6.31 Release: 1 %if %using_buildservice %else @@ -131,11 +117,9 @@ Source12: pre.sh Source13: post.sh Source20: series.conf -Source21: config.conf Source22: supported.conf Source30: arch-symbols Source31: guards -Source32: config-subst Source33: check-for-config-changes Source34: check-supported-list Source40: source-timestamp @@ -159,7 +143,6 @@ Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 -%define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 # These files are found in the kernel-source package: @@ -194,9 +177,6 @@ Obsoletes: at76_usb-kmp Obsoletes: pcc-acpi-kmp Obsoletes: btusb-kmp -# Build with bash instead of sh as the shell: this turns on bash -# extensions like <(...). -%define _buildshell /bin/bash # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -223,12 +203,16 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi -echo "Symbol(s):" %symbols +SYMBOLS=%name +if test -e %_sourcedir/extra-symbols; then + SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)" +fi +echo "Symbol(s):" $SYMBOLS # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 mkdir -p %kernel_build_dir supported_conf() { - %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } # Generate the list of modules to be marked as supported @@ -239,7 +223,7 @@ cd linux-%srcversion # Apply patches echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ +%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ %if %build_vanilla egrep '^patches\.(kernel\.org|rpmify)/' | \ %endif @@ -250,13 +234,15 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi -cat ../config/%cpu_arch_flavor \ -| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ -| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ +cp ../config/%cpu_arch_flavor .config +%build_src_dir/scripts/config \ + --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} - | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ + --enable CONFIG_DEBUG_INFO +%else + --disable CONFIG_DEBUG_INFO %endif - > .config MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -327,6 +313,7 @@ cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux + # FIXME: create and package build-id symlinks objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -338,6 +325,7 @@ | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 + echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files %else cp vmlinux %buildroot/$vmlinux %endif @@ -543,7 +531,7 @@ %rpm_install_dir/%cpu_arch_flavor/Makefile link=%rpm_install_dir/%cpu_arch_flavor/include2/asm target=$(readlink "$link") - target=${target#%build_src_dir} + target=${target#%build_src_dir/} rm "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi @@ -760,4 +748,17 @@ %endif %endif +%package devel-debuginfo +# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz +Summary: Debug information for package %name-devel +License: GPL v2 only +Group: Development/Debug + +%description devel-debuginfo +Debug information for package %name-devel + + +%source_timestamp +%files devel-debuginfo -f vmlinux.debug.files + %changelog ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:20.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ppc64 (Version 2.6.30.2) +# spec file for package kernel-ppc64 (Version 2.6.31) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,37 +17,23 @@ # norootforbuild -%define using_buildservice 0%{?opensuse_bs} -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) -# Don't use shell commands in build macros, this won't work outside of rpm +%define srcversion 2.6.30 +%define patchversion 2.6.31-rc4 +%define variant %{nil} +%include %_sourcedir/kernel-spec-macros %define build_flavor ppc64 %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.30 -%define patchversion 2.6.30.2 -%define variant %{nil} -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) -%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) -%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) -%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')} -%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*}) +%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) +%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) +%define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE @@ -61,7 +47,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems -Version: 2.6.30.2 +Version: 2.6.31 Release: 1 %if %using_buildservice %else @@ -131,11 +117,9 @@ Source12: pre.sh Source13: post.sh Source20: series.conf -Source21: config.conf Source22: supported.conf Source30: arch-symbols Source31: guards -Source32: config-subst Source33: check-for-config-changes Source34: check-supported-list Source40: source-timestamp @@ -159,7 +143,6 @@ Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 -%define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 # These files are found in the kernel-source package: @@ -194,9 +177,6 @@ Obsoletes: at76_usb-kmp Obsoletes: pcc-acpi-kmp Obsoletes: btusb-kmp -# Build with bash instead of sh as the shell: this turns on bash -# extensions like <(...). -%define _buildshell /bin/bash # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -223,12 +203,16 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi -echo "Symbol(s):" %symbols +SYMBOLS=%name +if test -e %_sourcedir/extra-symbols; then + SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)" +fi +echo "Symbol(s):" $SYMBOLS # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 mkdir -p %kernel_build_dir supported_conf() { - %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } # Generate the list of modules to be marked as supported @@ -239,7 +223,7 @@ cd linux-%srcversion # Apply patches echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ +%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ %if %build_vanilla egrep '^patches\.(kernel\.org|rpmify)/' | \ %endif @@ -250,13 +234,15 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi -cat ../config/%cpu_arch_flavor \ -| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ -| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ +cp ../config/%cpu_arch_flavor .config +%build_src_dir/scripts/config \ + --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} - | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ + --enable CONFIG_DEBUG_INFO +%else + --disable CONFIG_DEBUG_INFO %endif - > .config MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -327,6 +313,7 @@ cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux + # FIXME: create and package build-id symlinks objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -338,6 +325,7 @@ | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 + echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files %else cp vmlinux %buildroot/$vmlinux %endif @@ -543,7 +531,7 @@ %rpm_install_dir/%cpu_arch_flavor/Makefile link=%rpm_install_dir/%cpu_arch_flavor/include2/asm target=$(readlink "$link") - target=${target#%build_src_dir} + target=${target#%build_src_dir/} rm "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi @@ -760,4 +748,17 @@ %endif %endif +%package devel-debuginfo +# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz +Summary: Debug information for package %name-devel +License: GPL v2 only +Group: Development/Debug + +%description devel-debuginfo +Debug information for package %name-devel + + +%source_timestamp +%files devel-debuginfo -f vmlinux.debug.files + %changelog ++++++ kernel-ps3.spec ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ps3 (Version 2.6.30.2) +# spec file for package kernel-ps3 (Version 2.6.31) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,37 +17,23 @@ # norootforbuild -%define using_buildservice 0%{?opensuse_bs} -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) -# Don't use shell commands in build macros, this won't work outside of rpm +%define srcversion 2.6.30 +%define patchversion 2.6.31-rc4 +%define variant %{nil} +%include %_sourcedir/kernel-spec-macros %define build_flavor ps3 %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.30 -%define patchversion 2.6.30.2 -%define variant %{nil} -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) -%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) -%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) -%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')} -%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*}) +%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) +%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) +%define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE @@ -61,7 +47,7 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader -Version: 2.6.30.2 +Version: 2.6.31 Release: 1 %if %using_buildservice %else @@ -127,11 +113,9 @@ Source12: pre.sh Source13: post.sh Source20: series.conf -Source21: config.conf Source22: supported.conf Source30: arch-symbols Source31: guards -Source32: config-subst Source33: check-for-config-changes Source34: check-supported-list Source40: source-timestamp @@ -155,7 +139,6 @@ Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 -%define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc # These files are found in the kernel-source package: @@ -190,9 +173,6 @@ Obsoletes: at76_usb-kmp Obsoletes: pcc-acpi-kmp Obsoletes: btusb-kmp -# Build with bash instead of sh as the shell: this turns on bash -# extensions like <(...). -%define _buildshell /bin/bash # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -215,12 +195,16 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi -echo "Symbol(s):" %symbols +SYMBOLS=%name +if test -e %_sourcedir/extra-symbols; then + SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)" +fi +echo "Symbol(s):" $SYMBOLS # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 mkdir -p %kernel_build_dir supported_conf() { - %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } # Generate the list of modules to be marked as supported @@ -231,7 +215,7 @@ cd linux-%srcversion # Apply patches echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ +%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ %if %build_vanilla egrep '^patches\.(kernel\.org|rpmify)/' | \ %endif @@ -242,13 +226,15 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi -cat ../config/%cpu_arch_flavor \ -| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ -| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ +cp ../config/%cpu_arch_flavor .config +%build_src_dir/scripts/config \ + --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} - | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ + --enable CONFIG_DEBUG_INFO +%else + --disable CONFIG_DEBUG_INFO %endif - > .config MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -319,6 +305,7 @@ cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux + # FIXME: create and package build-id symlinks objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -330,6 +317,7 @@ | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 + echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files %else cp vmlinux %buildroot/$vmlinux %endif @@ -535,7 +523,7 @@ %rpm_install_dir/%cpu_arch_flavor/Makefile link=%rpm_install_dir/%cpu_arch_flavor/include2/asm target=$(readlink "$link") - target=${target#%build_src_dir} + target=${target#%build_src_dir/} rm "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi @@ -744,4 +732,17 @@ %endif %endif +%package devel-debuginfo +# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz +Summary: Debug information for package %name-devel +License: GPL v2 only +Group: Development/Debug + +%description devel-debuginfo +Debug information for package %name-devel + + +%source_timestamp +%files devel-debuginfo -f vmlinux.debug.files + %changelog ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-s390 (Version 2.6.30.2) +# spec file for package kernel-s390 (Version 2.6.31) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,37 +17,23 @@ # norootforbuild -%define using_buildservice 0%{?opensuse_bs} -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) -# Don't use shell commands in build macros, this won't work outside of rpm +%define srcversion 2.6.30 +%define patchversion 2.6.31-rc4 +%define variant %{nil} +%include %_sourcedir/kernel-spec-macros %define build_flavor s390 %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.30 -%define patchversion 2.6.30.2 -%define variant %{nil} -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) -%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) -%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) -%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')} -%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*}) +%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) +%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) +%define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE @@ -61,7 +47,7 @@ Name: kernel-s390 Summary: The Standard Kernel -Version: 2.6.30.2 +Version: 2.6.31 Release: 1 %if %using_buildservice %else @@ -131,11 +117,9 @@ Source12: pre.sh Source13: post.sh Source20: series.conf -Source21: config.conf Source22: supported.conf Source30: arch-symbols Source31: guards -Source32: config-subst Source33: check-for-config-changes Source34: check-supported-list Source40: source-timestamp @@ -159,7 +143,6 @@ Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 -%define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: s390 # These files are found in the kernel-source package: @@ -194,9 +177,6 @@ Obsoletes: at76_usb-kmp Obsoletes: pcc-acpi-kmp Obsoletes: btusb-kmp -# Build with bash instead of sh as the shell: this turns on bash -# extensions like <(...). -%define _buildshell /bin/bash # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -216,12 +196,16 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi -echo "Symbol(s):" %symbols +SYMBOLS=%name +if test -e %_sourcedir/extra-symbols; then + SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)" +fi +echo "Symbol(s):" $SYMBOLS # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 mkdir -p %kernel_build_dir supported_conf() { - %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } # Generate the list of modules to be marked as supported @@ -232,7 +216,7 @@ cd linux-%srcversion # Apply patches echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ +%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ %if %build_vanilla egrep '^patches\.(kernel\.org|rpmify)/' | \ %endif @@ -243,13 +227,15 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi -cat ../config/%cpu_arch_flavor \ -| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ -| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ +cp ../config/%cpu_arch_flavor .config +%build_src_dir/scripts/config \ + --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} - | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ + --enable CONFIG_DEBUG_INFO +%else + --disable CONFIG_DEBUG_INFO %endif - > .config MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -320,6 +306,7 @@ cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux + # FIXME: create and package build-id symlinks objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -331,6 +318,7 @@ | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 + echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files %else cp vmlinux %buildroot/$vmlinux %endif @@ -536,7 +524,7 @@ %rpm_install_dir/%cpu_arch_flavor/Makefile link=%rpm_install_dir/%cpu_arch_flavor/include2/asm target=$(readlink "$link") - target=${target#%build_src_dir} + target=${target#%build_src_dir/} rm "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi @@ -739,4 +727,17 @@ %endif %endif +%package devel-debuginfo +# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz +Summary: Debug information for package %name-devel +License: GPL v2 only +Group: Development/Debug + +%description devel-debuginfo +Debug information for package %name-devel + + +%source_timestamp +%files devel-debuginfo -f vmlinux.debug.files + %changelog ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 2.6.30.2) +# spec file for package kernel-source (Version 2.6.31) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,21 +18,10 @@ # norootforbuild # icecream 0 -%define using_buildservice 0%{?opensuse_bs} -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) %define srcversion 2.6.30 -%define patchversion 2.6.30.2 +%define patchversion 2.6.31-rc4 %define variant %{nil} -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major +%include %_sourcedir/kernel-spec-macros %define src_install_dir usr/src/linux-%kernelrelease%variant %define obj_install_dir /%src_install_dir-obj %define rpm_install_dir %buildroot%real_install_dir @@ -40,7 +29,7 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 2.6.30.2 +Version: 2.6.31 Release: 1 %if %using_buildservice %else @@ -67,7 +56,6 @@ Source16: guards Source21: config.conf Source23: supported.conf -Source30: config-subst Source33: check-for-config-changes Source34: check-supported-list Source37: README.SUSE @@ -108,11 +96,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Prefix: /usr/src -# Build with bash instead of sh as the shell: this turns on bash -# extensions like <(...). -%define _buildshell /bin/bash -%define my_builddir %_builddir/%{name}-%{version} -%(chmod +x %_sourcedir/{guards,config-subst,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols}) +%(chmod +x %_sourcedir/{guards,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols}) %define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac) %define do_vanilla "%variant" == "" ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms (Version 2.6.30.2) +# spec file for package kernel-syms (Version 2.6.31) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,21 +17,12 @@ # norootforbuild -%define using_buildservice 0%{?opensuse_bs} -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) %define variant %{nil} +%include %_sourcedir/kernel-spec-macros Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 2.6.30.2 +Version: 2.6.31 Release: 1 %if %using_buildservice %else @@ -42,7 +33,7 @@ Url: http://www.kernel.org/ AutoReqProv: off BuildRequires: coreutils -%ifarch %ix86 ia64 ppc64 x86_64 +%ifarch %ix86 ppc64 x86_64 Requires: kernel-debug-devel = %version-%source_rel %endif %ifarch %ix86 ia64 ppc ppc64 s390x x86_64 @@ -51,9 +42,6 @@ %ifarch %ix86 x86_64 Requires: kernel-desktop-devel = %version-%source_rel %endif -%ifarch ppc ppc64 -Requires: kernel-kdump-devel = %version-%source_rel -%endif %ifarch %ix86 Requires: kernel-pae-devel = %version-%source_rel %endif @@ -66,12 +54,6 @@ %ifarch s390 Requires: kernel-s390-devel = %version-%source_rel %endif -%ifarch ia64 -Requires: kernel-trace-devel = %version-%source_rel -%endif -%ifarch %ix86 x86_64 -Requires: kernel-xen-devel = %version-%source_rel -%endif Source: README.KSYMS Requires: kernel-source%variant = %version-%source_rel BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-trace (Version 2.6.30.2) +# spec file for package kernel-trace (Version 2.6.31) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,37 +17,23 @@ # norootforbuild -%define using_buildservice 0%{?opensuse_bs} -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) -# Don't use shell commands in build macros, this won't work outside of rpm +%define srcversion 2.6.30 +%define patchversion 2.6.31-rc4 +%define variant %{nil} +%include %_sourcedir/kernel-spec-macros %define build_flavor trace %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.30 -%define patchversion 2.6.30.2 -%define variant %{nil} -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) -%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) -%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) -%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')} -%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*}) +%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) +%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) +%define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE @@ -61,7 +47,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel -Version: 2.6.30.2 +Version: 2.6.31 Release: 1 %if %using_buildservice %else @@ -127,11 +113,9 @@ Source12: pre.sh Source13: post.sh Source20: series.conf -Source21: config.conf Source22: supported.conf Source30: arch-symbols Source31: guards -Source32: config-subst Source33: check-for-config-changes Source34: check-supported-list Source40: source-timestamp @@ -155,9 +139,8 @@ Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 -%define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: ia64 +ExclusiveArch: %ix86 ia64 x86_64 # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -190,9 +173,6 @@ Obsoletes: at76_usb-kmp Obsoletes: pcc-acpi-kmp Obsoletes: btusb-kmp -# Build with bash instead of sh as the shell: this turns on bash -# extensions like <(...). -%define _buildshell /bin/bash # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -212,12 +192,16 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi -echo "Symbol(s):" %symbols +SYMBOLS=%name +if test -e %_sourcedir/extra-symbols; then + SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)" +fi +echo "Symbol(s):" $SYMBOLS # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 mkdir -p %kernel_build_dir supported_conf() { - %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } # Generate the list of modules to be marked as supported @@ -228,7 +212,7 @@ cd linux-%srcversion # Apply patches echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ +%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ %if %build_vanilla egrep '^patches\.(kernel\.org|rpmify)/' | \ %endif @@ -239,13 +223,15 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi -cat ../config/%cpu_arch_flavor \ -| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ -| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ +cp ../config/%cpu_arch_flavor .config +%build_src_dir/scripts/config \ + --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} - | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ + --enable CONFIG_DEBUG_INFO +%else + --disable CONFIG_DEBUG_INFO %endif - > .config MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -316,6 +302,7 @@ cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux + # FIXME: create and package build-id symlinks objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -327,6 +314,7 @@ | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 + echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files %else cp vmlinux %buildroot/$vmlinux %endif @@ -532,7 +520,7 @@ %rpm_install_dir/%cpu_arch_flavor/Makefile link=%rpm_install_dir/%cpu_arch_flavor/include2/asm target=$(readlink "$link") - target=${target#%build_src_dir} + target=${target#%build_src_dir/} rm "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi @@ -735,4 +723,17 @@ %endif %endif +%package devel-debuginfo +# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz +Summary: Debug information for package %name-devel +License: GPL v2 only +Group: Development/Debug + +%description devel-debuginfo +Debug information for package %name-devel + + +%source_timestamp +%files devel-debuginfo -f vmlinux.debug.files + %changelog ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-vanilla (Version 2.6.30.2) +# spec file for package kernel-vanilla (Version 2.6.31) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,37 +17,23 @@ # norootforbuild -%define using_buildservice 0%{?opensuse_bs} -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) -# Don't use shell commands in build macros, this won't work outside of rpm +%define srcversion 2.6.30 +%define patchversion 2.6.31-rc4 +%define variant %{nil} +%include %_sourcedir/kernel-spec-macros %define build_flavor vanilla %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.30 -%define patchversion 2.6.30.2 -%define variant %{nil} -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) -%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) -%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) -%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')} -%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*}) +%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) +%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) +%define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE @@ -61,7 +47,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches -Version: 2.6.30.2 +Version: 2.6.31 Release: 1 %if %using_buildservice %else @@ -135,11 +121,9 @@ Source12: pre.sh Source13: post.sh Source20: series.conf -Source21: config.conf Source22: supported.conf Source30: arch-symbols Source31: guards -Source32: config-subst Source33: check-for-config-changes Source34: check-supported-list Source40: source-timestamp @@ -163,7 +147,6 @@ Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 -%define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x x86_64 # These files are found in the kernel-source package: @@ -198,9 +181,6 @@ Obsoletes: at76_usb-kmp Obsoletes: pcc-acpi-kmp Obsoletes: btusb-kmp -# Build with bash instead of sh as the shell: this turns on bash -# extensions like <(...). -%define _buildshell /bin/bash # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -220,12 +200,16 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi -echo "Symbol(s):" %symbols +SYMBOLS=%name +if test -e %_sourcedir/extra-symbols; then + SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)" +fi +echo "Symbol(s):" $SYMBOLS # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 mkdir -p %kernel_build_dir supported_conf() { - %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } # Generate the list of modules to be marked as supported @@ -236,7 +220,7 @@ cd linux-%srcversion # Apply patches echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ +%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ %if %build_vanilla egrep '^patches\.(kernel\.org|rpmify)/' | \ %endif @@ -247,13 +231,15 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi -cat ../config/%cpu_arch_flavor \ -| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ -| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ +cp ../config/%cpu_arch_flavor .config +%build_src_dir/scripts/config \ + --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} - | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ + --enable CONFIG_DEBUG_INFO +%else + --disable CONFIG_DEBUG_INFO %endif - > .config MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -324,6 +310,7 @@ cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux + # FIXME: create and package build-id symlinks objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -335,6 +322,7 @@ | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 + echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files %else cp vmlinux %buildroot/$vmlinux %endif @@ -540,7 +528,7 @@ %rpm_install_dir/%cpu_arch_flavor/Makefile link=%rpm_install_dir/%cpu_arch_flavor/include2/asm target=$(readlink "$link") - target=${target#%build_src_dir} + target=${target#%build_src_dir/} rm "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi @@ -743,4 +731,17 @@ %endif %endif +%package devel-debuginfo +# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz +Summary: Debug information for package %name-devel +License: GPL v2 only +Group: Development/Debug + +%description devel-debuginfo +Debug information for package %name-devel + + +%source_timestamp +%files devel-debuginfo -f vmlinux.debug.files + %changelog ++++++ arch-symbols ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200 @@ -1,5 +1,25 @@ #!/bin/sh +############################################################################# +# Copyright (c) 2003-2005,2009 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com +############################################################################# + # With --list, list all known architectures, otherwise print the generic # name for this architecture (or the one specified on command line). ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200 @@ -1,5 +1,7 @@ # Kernel configuration file selection. -# (See series.conf for a list of symbols defined.) +# See the arch-symbols script for a list of symbols defined. +# -syms excludes a flavor from the kernel-syms package (vanilla is excluded +# automatically). # # IMPORTANT: the subdirectory names map to cpuarch @@ -10,27 +12,27 @@ +i386 i386/desktop +i386 i386/pae +i386 i386/debug -+i386 i386/xen ++i386 - i386/xen +i386 i386/vanilla -+i386 - i386/trace ++i386 -syms i386/trace +ia64 ia64/default -+ia64 ia64/debug ++ia64 -syms ia64/debug +ia64 ia64/vanilla -+ia64 ia64/trace ++ia64 -syms ia64/trace +x86_64 x86_64/default +x86_64 x86_64/desktop -+x86_64 x86_64/xen ++x86_64 - x86_64/xen +x86_64 x86_64/debug +x86_64 x86_64/vanilla -+x86_64 - x86_64/trace ++x86_64 -syms x86_64/trace # openSuSE: # G3 G4 bPlan +ppc ppc/default # pSeries -+ppc ppc/kdump ++ppc -syms ppc/kdump # G5 PS3 pSeries +ppc ppc/ppc64 # PS3 bootloader @@ -45,7 +47,7 @@ # supporting 32bit and 64bit systems. +ppc64 ppc64/default # pSeries -+ppc64 ppc64/kdump ++ppc64 -syms ppc64/kdump # G5 pSeries +ppc64 ppc64/ppc64 +ppc64 ppc64/debug @@ -53,6 +55,6 @@ +ppc64 ppc64/vanilla +s390 s390/s390 -+s390x s390/default +s390 s390/vanilla -+s390x s390/vanilla ++s390x s390x/default ++s390x s390x/vanilla ++++++ config.tar.bz2 ++++++ ++++ 30387 lines of diff (skipped) ++++++ guards ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:22.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:22.000000000 +0200 @@ -1,5 +1,23 @@ #!/usr/bin/perl -w - +############################################################################# +# Copyright (c) 2003-2007,2009 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com +############################################################################# # # Guards: # ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:22.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:22.000000000 +0200 @@ -17,44 +17,28 @@ # norootforbuild -%define using_buildservice 0%{?opensuse_bs} - -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif +%define srcversion @SRCVERSION@ +%define patchversion @PATCHVERSION@ +%define variant @VARIANT@%{nil} -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) +%include %_sourcedir/kernel-spec-macros -# Don't use shell commands in build macros, this won't work outside of rpm %define build_flavor @FLAVOR@ %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion @SRCVERSION@ -%define patchversion @PATCHVERSION@ -%define variant @VARIANT@%{nil} -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major - %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) +%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules}) -%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu) -%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) -%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')} -%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*}) +%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) +%define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) @@ -141,11 +125,9 @@ Source12: pre.sh Source13: post.sh Source20: series.conf -Source21: config.conf Source22: supported.conf Source30: arch-symbols Source31: guards -Source32: config-subst Source33: check-for-config-changes Source34: check-supported-list Source40: source-timestamp @@ -169,7 +151,6 @@ Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 -%define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: @ARCHS@ @@ -207,10 +188,6 @@ Obsoletes: pcc-acpi-kmp Obsoletes: btusb-kmp -# Build with bash instead of sh as the shell: this turns on bash -# extensions like <(...). -%define _buildshell /bin/bash - # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -233,7 +210,11 @@ exit 1 fi -echo "Symbol(s):" %symbols +SYMBOLS=%name +if test -e %_sourcedir/extra-symbols; then + SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)" +fi +echo "Symbol(s):" $SYMBOLS # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 @@ -241,7 +222,7 @@ mkdir -p %kernel_build_dir supported_conf() { - %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \ + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } @@ -255,7 +236,7 @@ # Apply patches echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ +%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ %if %build_vanilla egrep '^patches\.(kernel\.org|rpmify)/' | \ %endif @@ -269,13 +250,15 @@ cat %_sourcedir/localversion > localversion fi -cat ../config/%cpu_arch_flavor \ -| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \ -| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ +cp ../config/%cpu_arch_flavor .config +%build_src_dir/scripts/config \ + --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} - | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ + --enable CONFIG_DEBUG_INFO +%else + --disable CONFIG_DEBUG_INFO %endif - > .config MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then @@ -362,6 +345,7 @@ cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux + # FIXME: create and package build-id symlinks objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -373,6 +357,7 @@ | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 + echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files %else cp vmlinux %buildroot/$vmlinux %endif @@ -603,7 +588,7 @@ %rpm_install_dir/%cpu_arch_flavor/Makefile link=%rpm_install_dir/%cpu_arch_flavor/include2/asm target=$(readlink "$link") - target=${target#%build_src_dir} + target=${target#%build_src_dir/} rm "$link" ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi @@ -801,4 +786,17 @@ %endif %endif +%package devel-debuginfo +# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz +Summary: Debug information for package %name-devel +License: GPL v2 only +Group: Development/Debug + +%description devel-debuginfo +Debug information for package %name-devel + +%source_timestamp + +%files devel-debuginfo -f vmlinux.debug.files + %changelog ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:23.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:23.000000000 +0200 @@ -18,25 +18,11 @@ # norootforbuild # icecream 0 - -%define using_buildservice 0%{?opensuse_bs} - -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif - -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) - %define srcversion @SRCVERSION@ %define patchversion @PATCHVERSION@ %define variant @VARIANT@%{nil} -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major + +%include %_sourcedir/kernel-spec-macros %define src_install_dir usr/src/linux-%kernelrelease%variant %define obj_install_dir /%src_install_dir-obj @@ -74,7 +60,6 @@ Source16: guards Source21: config.conf Source23: supported.conf -Source30: config-subst Source33: check-for-config-changes Source34: check-supported-list Source37: README.SUSE @@ -116,13 +101,7 @@ BuildArch: noarch Prefix: /usr/src -# Build with bash instead of sh as the shell: this turns on bash -# extensions like <(...). -%define _buildshell /bin/bash - -%define my_builddir %_builddir/%{name}-%{version} - -%(chmod +x %_sourcedir/{guards,config-subst,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols}) +%(chmod +x %_sourcedir/{guards,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols}) %define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac) ++++++ kernel-spec-macros ++++++ # This file is included by all the kernel-*.spec files # Build with bash instead of sh as the shell: this turns on bash # extensions like <(...). %define _buildshell /bin/bash %define using_buildservice 0%{?opensuse_bs} %define source_rel %release %if %using_buildservice # The last digit is a volatile rebuild counter, strip it %define source_rel %(release=%release; echo ${release%.*}) %endif %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") %define kernelrelease %patchversion-%release_major %define my_builddir %_builddir/%{name}-%{version} # macro to add the source timestamp to package descriptions %define source_timestamp %(sed '1s/^/Source Timestamp: /' %_sourcedir/source-timestamp || :) # vim: ft=spec ++++++ kernel-syms.spec.in ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:23.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:23.000000000 +0200 @@ -17,21 +17,10 @@ # norootforbuild -%define using_buildservice 0%{?opensuse_bs} - -%if %using_buildservice -# Strip off the build number ("y") from the "x.y" release number -%define source_rel %(release=%release; echo ${release%.*}) -%else -# We don't have build numbers internally -%define source_rel %release -%endif - -# macro to add the source timestamp to package descriptions -%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) - %define variant @VARIANT@%{nil} +%include %_sourcedir/kernel-spec-macros + Name: kernel-syms@VARIANT@ Summary: Kernel Symbol Versions (modversions) Version: @RPMVERSION@ ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:24.000000000 +0200 @@ -1 +1 @@ -2096000 +1048576 ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:24.000000000 +0200 @@ -17,6 +17,8 @@ # flavor -> [supported archs] my %flavor_archs = parse_config_conf(); +# subset to include in kernel-syms +my %syms_flavor_archs = parse_config_conf("syms"); # template name -> template body my %templates = read_spec_templates(); @@ -59,7 +61,6 @@ # binary spec files for my $flavor (sort keys(%flavor_archs)) { - $flavor_archs{$flavor} = [sort @{$flavor_archs{$flavor}}]; my ($summary, $description); if (!exists($binary_descriptions{"kernel-$flavor"})) { print STDERR "warning: no description for kernel-$flavor found\n"; @@ -84,9 +85,9 @@ # kernel-syms.spec { my $requires = ""; - for my $flavor (sort keys(%flavor_archs)) { + for my $flavor (sort keys(%syms_flavor_archs)) { next if $flavor eq "vanilla"; - my @archs = arch2rpm(@{$flavor_archs{$flavor}}); + my @archs = arch2rpm(@{$syms_flavor_archs{$flavor}}); $requires .= "%ifarch @archs\n"; $requires .= "Requires: kernel-$flavor-devel = \%version-\%source_rel\n"; $requires .= "%endif\n"; @@ -101,10 +102,12 @@ sub parse_config_conf { + my @symbols = @_; + my $symbols = join(' ', @symbols); my %res; for my $arch (split(/\s+/, `$dir/arch-symbols --list`)) { - my @flavors = `$dir/guards $arch < $dir/config.conf`; + my @flavors = `$dir/guards $arch $symbols < $dir/config.conf`; next if @flavors == 0; chomp @flavors; @flavors = map { s/.*\///; $_ } @flavors; @@ -113,6 +116,9 @@ push(@{$res{$flavor}}, $arch); } } + for my $flavor (keys(%res)) { + $res{$flavor} = [sort @{$res{$flavor}}]; + } return %res; } ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:25.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:25.000000000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ package-descriptions ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:25.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:25.000000000 +0200 @@ -27,7 +27,7 @@ and has many of the features that aren't usually used on desktop machines disabled. -This kernel upports up to 64GB of main memory. It requires Physical +This kernel supports up to 64GB of main memory. It requires Physical Addressing Extensions (PAE), which were introduced with the Pentium Pro processor. ++++++ patches.apparmor.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor.diff new/patches.apparmor/apparmor.diff --- old/patches.apparmor/apparmor.diff 2009-07-17 17:11:44.000000000 +0200 +++ new/patches.apparmor/apparmor.diff 2009-07-17 17:10:26.000000000 +0200 @@ -10,7 +10,7 @@ --- include/linux/audit.h | 10 - security/Kconfig | 1 + security/Kconfig | 10 security/Makefile | 2 security/apparmor/Kconfig | 53 + security/apparmor/Makefile | 24 @@ -47,7 +47,7 @@ security/apparmor/procattr.c | 117 ++ security/apparmor/resource.c | 104 ++ security/apparmor/sid.c | 111 ++ - 38 files changed, 7106 insertions(+), 1 deletion(-) + 38 files changed, 7115 insertions(+), 1 deletion(-) --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -77,7 +77,7 @@ #define AUDIT_ANOM_PROMISCUOUS 1700 /* Device changed promiscuous mode */ --- a/security/Kconfig +++ b/security/Kconfig -@@ -136,6 +136,7 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR +@@ -116,6 +125,7 @@ config SECURITY_ROOTPLUG source security/selinux/Kconfig source security/smack/Kconfig source security/tomoyo/Kconfig @@ -95,9 +95,9 @@ # always enable default capabilities obj-y += commoncap.o -@@ -17,6 +18,7 @@ obj-$(CONFIG_SECURITYFS) += inode.o - obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o - obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o +@@ -20,6 +21,7 @@ ifeq ($(CONFIG_AUDIT),y) + obj-$(CONFIG_SECURITY_SMACK) += lsm_audit.o + endif obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o +obj-$(CONFIG_SECURITY_APPARMOR) += apparmor/built-in.o obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o @@ -7221,8 +7221,8 @@ + */ + +#include <linux/spinlock.h> -+#include <linux/errno.h> +#include <linux/err.h> ++#include <linux/errno.h> + +#include "include/sid.h" + ++++++ patches.arch.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi-export-hotplug_execute new/patches.arch/acpi-export-hotplug_execute --- old/patches.arch/acpi-export-hotplug_execute 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/acpi-export-hotplug_execute 2009-07-16 17:03:19.000000000 +0200 @@ -13,7 +13,7 @@ --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c -@@ -771,6 +771,7 @@ acpi_status acpi_os_hotplug_execute(acpi +@@ -778,6 +778,7 @@ acpi_status acpi_os_hotplug_execute(acpi { return __acpi_os_execute(0, function, context, 1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch new/patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch --- old/patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch 2009-07-16 17:03:19.000000000 +0200 @@ -18,7 +18,7 @@ --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -682,6 +682,11 @@ and is between 256 and 4096 characters. +@@ -687,6 +687,11 @@ and is between 256 and 4096 characters. eata= [HW,SCSI] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch new/patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch --- old/patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch 2009-07-16 17:03:19.000000000 +0200 @@ -30,7 +30,7 @@ --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c -@@ -1523,6 +1523,21 @@ static int __init dmi_ignore_irq0_timer_ +@@ -1403,6 +1403,21 @@ static int __init dmi_ignore_irq0_timer_ return 0; } @@ -52,7 +52,7 @@ /* * If your system is blacklisted here, but you find that acpi=force * works for you, please contact linux-acpi(a)vger.kernel.org -@@ -1690,6 +1705,32 @@ static struct dmi_system_id __initdata a +@@ -1562,6 +1577,32 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), }, }, @@ -85,7 +85,7 @@ {} }; -@@ -1890,6 +1931,18 @@ static int __init parse_acpi(char *arg) +@@ -1762,6 +1803,18 @@ static int __init parse_acpi(char *arg) } early_param("acpi", parse_acpi); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch new/patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch --- old/patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -From: Thomas Renninger <trenn(a)suse.de> -Subject: Do not use video backlight switching for Lenovo ThinkPads -Patch-Mainline: never - -Mainline will go the IGD driver way which is too new and untested for -SLE11. - ---- - drivers/acpi/video.c | 17 ++++++++++++++--- - drivers/acpi/video_detect.c | 2 +- - 2 files changed, 15 insertions(+), 4 deletions(-) - ---- a/drivers/acpi/video.c -+++ b/drivers/acpi/video.c -@@ -730,7 +730,7 @@ static void acpi_video_device_find_cap(s - { - acpi_handle h_dummy1; - u32 max_level = 0; -- -+ unsigned long acpi_video_support; - - memset(&device->cap, 0, sizeof(device->cap)); - -@@ -758,8 +758,19 @@ static void acpi_video_device_find_cap(s - device->cap._DSS = 1; - } - -- if (acpi_video_backlight_support()) -- max_level = acpi_video_init_brightness(device); -+ acpi_video_support = acpi_video_backlight_support(); -+ if (acpi_video_support) { -+ /* -+ * Ugly SLE11 hack to let thinkpad_acpi handle brightness on -+ * ThinkPad IGD devices -+ */ -+ if (dmi_name_in_vendors("LENOVO") && -+ (acpi_video_support & ACPI_VIDEO_IGD)) -+ brightness_switch_enabled = 0; -+ else -+ max_level = acpi_video_init_brightness(device); -+ } else -+ brightness_switch_enabled = 0; - - if (device->cap._BCL && device->cap._BCM && max_level > 0) { - int result; ---- a/drivers/acpi/video_detect.c -+++ b/drivers/acpi/video_detect.c -@@ -216,7 +216,7 @@ int acpi_video_backlight_support(void) - return 1; - - /* Then go the default way */ -- return acpi_video_support & ACPI_VIDEO_BACKLIGHT; -+ return acpi_video_support & (ACPI_VIDEO_BACKLIGHT | ACPI_VIDEO_IGD); - } - EXPORT_SYMBOL(acpi_video_backlight_support); - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ia64-page-migration new/patches.arch/ia64-page-migration --- old/patches.arch/ia64-page-migration 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/ia64-page-migration 2009-07-16 17:03:19.000000000 +0200 @@ -26,7 +26,7 @@ --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig -@@ -512,6 +512,15 @@ config COMPAT_FOR_U64_ALIGNMENT +@@ -513,6 +513,15 @@ config COMPAT_FOR_U64_ALIGNMENT config IA64_MCA_RECOVERY tristate "MCA recovery from errors other than TLB." @@ -58,7 +58,7 @@ extern void ia64_unreg_MCA_extension(void); +extern int ia64_reg_CE_extension(int (*fn)(void *)); +extern void ia64_unreg_CE_extension(void); - extern u64 ia64_get_rnat(u64 *); + extern unsigned long ia64_get_rnat(unsigned long *); extern void ia64_mca_printk(const char * fmt, ...) __attribute__ ((format (printf, 1, 2))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/mm-avoid-bad-page-on-lru new/patches.arch/mm-avoid-bad-page-on-lru --- old/patches.arch/mm-avoid-bad-page-on-lru 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/mm-avoid-bad-page-on-lru 2009-07-16 17:03:19.000000000 +0200 @@ -29,7 +29,7 @@ PG_head, /* A head page */ PG_tail, /* A tail page */ #else -@@ -161,15 +162,21 @@ static inline int TestSetPage##uname(str +@@ -158,15 +159,21 @@ static inline int TestSetPage##uname(str static inline int TestClearPage##uname(struct page *page) \ { return test_and_clear_bit(PG_##lname, &page->flags); } @@ -52,7 +52,7 @@ { return 0; } #define TESTSCFLAG(uname, lname) \ -@@ -382,6 +389,12 @@ static inline void __ClearPageTail(struc +@@ -372,6 +379,12 @@ static inline void __ClearPageTail(struc #endif /* !PAGEFLAGS_EXTENDED */ @@ -62,8 +62,8 @@ +PAGEFLAG_FALSE(MemError) +#endif + - #ifdef CONFIG_UNEVICTABLE_LRU - #define __PG_UNEVICTABLE (1 << PG_unevictable) + #ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT + #define __PG_MLOCKED (1 << PG_mlocked) #else --- a/mm/migrate.c +++ b/mm/migrate.c @@ -137,7 +137,7 @@ /* --- a/mm/vmscan.c +++ b/mm/vmscan.c -@@ -1047,6 +1047,7 @@ int isolate_lru_page(struct page *page) +@@ -1027,6 +1027,7 @@ int isolate_lru_page(struct page *page) } return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ppc-efika-mpc52xx-ac97.patch new/patches.arch/ppc-efika-mpc52xx-ac97.patch --- old/patches.arch/ppc-efika-mpc52xx-ac97.patch 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/ppc-efika-mpc52xx-ac97.patch 2009-07-16 17:03:19.000000000 +0200 @@ -7,29 +7,15 @@ Acked-by: Olaf Hering <olh(a)novell.com> --- - arch/powerpc/include/asm/mpc52xx_psc.h | 4 - arch/powerpc/kernel/prom_init.c | 3 - sound/ppc/Kconfig | 15 - sound/ppc/Makefile | 2 - sound/ppc/mpc52xx_ac97.c | 808 +++++++++++++++++++++++++++++++++ - 5 files changed, 832 insertions(+) + arch/powerpc/kernel/prom_init.c | 3 + sound/ppc/Kconfig | 15 + sound/ppc/Makefile | 2 + sound/ppc/mpc52xx_ac97.c | 808 ++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 828 insertions(+) ---- a/arch/powerpc/include/asm/mpc52xx_psc.h -+++ b/arch/powerpc/include/asm/mpc52xx_psc.h -@@ -28,6 +28,10 @@ - #define MPC52xx_PSC_MAXNUM 6 - - /* Programmable Serial Controller (PSC) status register bits */ -+#define MPC52xx_PSC_SR_UNEX_RX 0x0001 -+#define MPC52xx_PSC_SR_DATA_VAL 0x0002 -+#define MPC52xx_PSC_SR_DATA_OVR 0x0004 -+#define MPC52xx_PSC_SR_CMDSEND 0x0008 - #define MPC52xx_PSC_SR_CDE 0x0080 - #define MPC52xx_PSC_SR_RXRDY 0x0100 - #define MPC52xx_PSC_SR_RXFULL 0x0200 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c -@@ -2124,6 +2124,7 @@ static void __init fixup_device_tree_efi +@@ -2160,6 +2160,7 @@ static void __init fixup_device_tree_efi static void __init fixup_device_tree_efika(void) { @@ -37,7 +23,7 @@ int sound_irq[3] = { 2, 2, 0 }; int bcomm_irq[3*16] = { 3,0,0, 3,1,0, 3,2,0, 3,3,0, 3,4,0, 3,5,0, 3,6,0, 3,7,0, -@@ -2179,6 +2180,8 @@ static void __init fixup_device_tree_efi +@@ -2215,6 +2216,8 @@ static void __init fixup_device_tree_efi prom_printf("Adding sound interrupts property\n"); prom_setprop(node, "/builtin/sound", "interrupts", sound_irq, sizeof(sound_irq)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ppc-prom-nodisplay.patch new/patches.arch/ppc-prom-nodisplay.patch --- old/patches.arch/ppc-prom-nodisplay.patch 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/ppc-prom-nodisplay.patch 2009-07-16 17:03:19.000000000 +0200 @@ -43,7 +43,7 @@ --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c -@@ -172,6 +172,7 @@ static unsigned long __initdata dt_strin +@@ -169,6 +169,7 @@ static unsigned long __initdata dt_strin static unsigned long __initdata prom_initrd_start, prom_initrd_end; @@ -51,7 +51,7 @@ #ifdef CONFIG_PPC64 static int __initdata prom_iommu_force_on; static int __initdata prom_iommu_off; -@@ -494,9 +495,7 @@ static int __init prom_setprop(phandle n +@@ -491,9 +492,7 @@ static int __init prom_setprop(phandle n static void __init early_cmdline_parse(void) { struct prom_t *_prom = &RELOC(prom); @@ -61,7 +61,7 @@ char *p; int l = 0; -@@ -511,6 +510,14 @@ static void __init early_cmdline_parse(v +@@ -508,6 +507,14 @@ static void __init early_cmdline_parse(v #endif /* CONFIG_CMDLINE */ prom_printf("command line: %s\n", RELOC(prom_cmd_line)); @@ -76,7 +76,7 @@ #ifdef CONFIG_PPC64 opt = strstr(RELOC(prom_cmd_line), RELOC("iommu=")); if (opt) { -@@ -2340,6 +2347,7 @@ unsigned long __init prom_init(unsigned +@@ -2377,6 +2384,7 @@ unsigned long __init prom_init(unsigned /* * Initialize display devices */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ppc-pseries-bsr-4k.patch new/patches.arch/ppc-pseries-bsr-4k.patch --- old/patches.arch/ppc-pseries-bsr-4k.patch 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/ppc-pseries-bsr-4k.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -Subject: Unable to Use Small BSR register on Power LPAR -From: Sonny Rao <sonnyrao(a)us.ibm.com> -References: 443673 - LTC49749 - -Fix the BSR driver to allow small BSR devices on a 64k page kernel. -Previously the driver would reject the mmap since the size was smaller -than PAGESIZE. This patch adds a check for this case and uses remap_4k_pfn(). - -Also, take out code to set vm_flags, as the remap_pfn functions will -do this for us. - -Signed-off-by: Sonny Rao <sonnyrao(a)us.ibm.com> -Signed-off-by: Olaf Hering <olh(a)suse.de> - ---- - drivers/char/bsr.c | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - ---- a/drivers/char/bsr.c -+++ b/drivers/char/bsr.c -@@ -27,6 +27,7 @@ - #include <linux/cdev.h> - #include <linux/list.h> - #include <linux/mm.h> -+#include <asm/pgtable.h> - #include <asm/io.h> - - /* -@@ -117,15 +118,22 @@ static int bsr_mmap(struct file *filp, s - { - unsigned long size = vma->vm_end - vma->vm_start; - struct bsr_dev *dev = filp->private_data; -+ int ret; - -- if (size > dev->bsr_len || (size & (PAGE_SIZE-1))) -- return -EINVAL; -- -- vma->vm_flags |= (VM_IO | VM_DONTEXPAND); - vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); - -- if (io_remap_pfn_range(vma, vma->vm_start, dev->bsr_addr >> PAGE_SHIFT, -- size, vma->vm_page_prot)) -+ /* check for the case of a small BSR device and map one 4k page for it*/ -+ if (dev->bsr_len < PAGE_SIZE && size == PAGE_SIZE) -+ ret = remap_4k_pfn(vma, vma->vm_start, dev->bsr_addr >> 12, -+ vma->vm_page_prot); -+ else if (size <= dev->bsr_len) -+ ret = io_remap_pfn_range(vma, vma->vm_start, -+ dev->bsr_addr >> PAGE_SHIFT, -+ size, vma->vm_page_prot); -+ else -+ return -EINVAL; -+ -+ if (ret) - return -EAGAIN; - - return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ppc64-xmon-dmesg-printing.patch new/patches.arch/ppc64-xmon-dmesg-printing.patch --- old/patches.arch/ppc64-xmon-dmesg-printing.patch 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/ppc64-xmon-dmesg-printing.patch 2009-07-16 17:03:19.000000000 +0200 @@ -19,7 +19,7 @@ --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c -@@ -137,6 +137,7 @@ static struct bpt *in_breakpoint_table(u +@@ -138,6 +138,7 @@ static struct bpt *in_breakpoint_table(u static int do_step(struct pt_regs *); static void bpt_cmds(void); static void cacheflush(void); @@ -27,7 +27,7 @@ static int cpu_cmd(void); static void csum(void); static void bootcmds(void); -@@ -193,6 +194,7 @@ Commands:\n\ +@@ -194,6 +195,7 @@ Commands:\n\ #endif "\ C checksum\n\ @@ -35,7 +35,7 @@ d dump bytes\n\ di dump instructions\n\ df dump float values\n\ -@@ -807,6 +809,9 @@ cmds(struct pt_regs *excp) +@@ -809,6 +811,9 @@ cmds(struct pt_regs *excp) case 'd': dump(); break; @@ -45,7 +45,7 @@ case 'l': symbol_lookup(); break; -@@ -2523,6 +2528,58 @@ static void xmon_print_symbol(unsigned l +@@ -2570,6 +2575,58 @@ static void xmon_print_symbol(unsigned l printf("%s", after); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/s390-08-02-zfcp-gpn-align-fix.diff new/patches.arch/s390-08-02-zfcp-gpn-align-fix.diff --- old/patches.arch/s390-08-02-zfcp-gpn-align-fix.diff 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/s390-08-02-zfcp-gpn-align-fix.diff 2009-07-16 17:03:19.000000000 +0200 @@ -42,7 +42,7 @@ kmem_cache_destroy(zfcp_data.sr_buffer_cache); --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h -@@ -314,6 +314,14 @@ struct ct_iu_gid_pn_resp { +@@ -305,6 +305,14 @@ struct ct_iu_gid_pn_resp { u32 d_id; } __attribute__ ((packed)); @@ -57,7 +57,7 @@ /** * struct zfcp_send_ct - used to pass parameters to function zfcp_fsf_send_ct * @wka_port: port where the request is sent to -@@ -576,6 +584,7 @@ struct zfcp_data { +@@ -575,6 +583,7 @@ struct zfcp_data { struct kmem_cache *fsf_req_qtcb_cache; struct kmem_cache *sr_buffer_cache; struct kmem_cache *gid_pn_cache; @@ -82,7 +82,7 @@ struct gpn_ft_resp_acc { u8 control; u8 port_id[3]; -@@ -466,7 +458,8 @@ static void zfcp_free_sg_env(struct zfcp +@@ -481,7 +473,8 @@ static void zfcp_free_sg_env(struct zfcp { struct scatterlist *sg = &gpn_ft->sg_req; @@ -92,7 +92,7 @@ zfcp_sg_free_table(gpn_ft->sg_resp, buf_num); kfree(gpn_ft); -@@ -481,7 +474,7 @@ static struct zfcp_gpn_ft *zfcp_alloc_sg +@@ -496,7 +489,7 @@ static struct zfcp_gpn_ft *zfcp_alloc_sg if (!gpn_ft) return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/thinkpad_fingers_off_backlight_igd.patch new/patches.arch/thinkpad_fingers_off_backlight_igd.patch --- old/patches.arch/thinkpad_fingers_off_backlight_igd.patch 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/thinkpad_fingers_off_backlight_igd.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,142 +0,0 @@ -From: Thomas Renninger <trenn(a)stravinsky.suse.de> -Subject: Serve ThinkPad IGD devices backlight functionality through thinkpad_acpi -References: fate #302883 - -In future IDG devices will be handled by the dri subsystem. -But this code is very young and complex, better workaround this in -thinkpad_acpi driver for now. - -If in a later service pack the IGD parts get backported, this patch must -be reverted. - -Signed-off-by: Thomas Renninger <trenn(a)suse.de> ---- - drivers/acpi/video_detect.c | 15 +++++++++++++ - drivers/platform/x86/thinkpad_acpi.c | 38 +++++++++++++++++++++++++++++++---- - include/linux/acpi.h | 2 + - 3 files changed, 51 insertions(+), 4 deletions(-) - ---- a/drivers/acpi/video_detect.c -+++ b/drivers/acpi/video_detect.c -@@ -98,6 +98,21 @@ long acpi_is_video_device(struct acpi_de - ACPI_UINT32_MAX, acpi_backlight_cap_match, - &video_caps, NULL); - -+ /* IGD detection is not perfect. It should use the same method as done -+ * to identify an IGD device in the dri parts or video.ko -+ */ -+ -+ /* -+ * ThinkPads do need the IGD implementation, we detect ThinkPad IGD -+ * devices here and specially workaround it in thinkpad_acpi as the -+ * IGD parts are too experimental yet -+ */ -+ if (dmi_name_in_vendors("LENOVO") && -+ ACPI_SUCCESS(acpi_get_handle(device->handle, "DRDY", &h_dummy))) { -+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found IGD device\n")); -+ video_caps |= ACPI_VIDEO_IGD; -+ } -+ - return video_caps; - } - EXPORT_SYMBOL(acpi_is_video_device); ---- a/drivers/platform/x86/thinkpad_acpi.c -+++ b/drivers/platform/x86/thinkpad_acpi.c -@@ -263,6 +263,7 @@ static struct { - u32 light_status:1; - u32 bright_16levels:1; - u32 bright_acpimode:1; -+ u32 bright_igdmode:1; - u32 wan:1; - u32 uwb:1; - u32 fan_ctrl_status_undef:1; -@@ -2573,6 +2574,9 @@ err_exit: - return (res < 0)? res : 1; - } - -+static struct backlight_device *ibm_backlight_device; -+static int brightness_update_status(struct backlight_device *bd); -+ - static bool hotkey_notify_hotkey(const u32 hkey, - bool *send_acpi_ev, - bool *ignore_acpi_ev) -@@ -2582,6 +2586,26 @@ static bool hotkey_notify_hotkey(const u - *send_acpi_ev = true; - *ignore_acpi_ev = false; - -+ if (tp_features.bright_igdmode && ibm_backlight_device) { -+ /* ToDo: Is there an already defined key? */ -+ if (hkey == 0x1011) { -+ if (ibm_backlight_device-> -+ props.brightness > 0) { -+ ibm_backlight_device-> -+ props.brightness--; -+ } -+ } else if (hkey == 0x1010) { -+ if (ibm_backlight_device-> -+ props.brightness < -+ ibm_backlight_device-> -+ props.max_brightness) { -+ ibm_backlight_device-> -+ props.brightness++; -+ } -+ } -+ brightness_update_status(ibm_backlight_device); -+ } -+ - if (scancode > 0 && scancode < 0x21) { - scancode--; - if (!(hotkey_source_mask & (1 << scancode))) { -@@ -5349,7 +5373,6 @@ enum { - TP_EC_BACKLIGHT_MAPSW = 0x20, - }; - --static struct backlight_device *ibm_backlight_device; - static int brightness_mode; - static unsigned int brightness_enable = 2; /* 2 = auto, 0 = no, 1 = yes */ - -@@ -5488,7 +5511,7 @@ static struct backlight_ops ibm_backligh - static int __init brightness_init(struct ibm_init_struct *iibm) - { - int b; -- -+ long acpi_video_support; - vdbg_printk(TPACPI_DBG_INIT, "initializing brightness subdriver\n"); - - mutex_init(&brightness_mutex); -@@ -5500,8 +5523,9 @@ static int __init brightness_init(struct - */ - b = tpacpi_check_std_acpi_brightness_support(); - if (b > 0) { -- -- if (acpi_video_backlight_support()) { -+ acpi_video_support = acpi_video_backlight_support(); -+ if (acpi_video_support && -+ !(acpi_video_support & ACPI_VIDEO_IGD)) { - if (brightness_enable > 1) { - printk(TPACPI_NOTICE - "Standard ACPI backlight interface " -@@ -5519,6 +5543,12 @@ static int __init brightness_init(struct - "available, thinkpad_acpi native " - "brightness control enabled\n"); - } -+ if (acpi_video_support & ACPI_VIDEO_IGD) { -+ printk(TPACPI_NOTICE, "IGD device" -+ " detected - take over backlight" -+ " switching\n"); -+ tp_features.bright_igdmode = 1; -+ } - } - } - ---- a/include/linux/acpi.h -+++ b/include/linux/acpi.h -@@ -186,6 +186,8 @@ extern bool wmi_has_guid(const char *gui - #define ACPI_VIDEO_BACKLIGHT_DMI_VIDEO 0x0200 - #define ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VENDOR 0x0400 - #define ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VIDEO 0x0800 -+/* Do not use the IGD define, this is a SUSE only ThinkPad workaround hack! */ -+#define ACPI_VIDEO_IGD 0x1000 - - #if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x86-apic-force-bigsmp-apic-on-IBM-EXA3-4.patch new/patches.arch/x86-apic-force-bigsmp-apic-on-IBM-EXA3-4.patch --- old/patches.arch/x86-apic-force-bigsmp-apic-on-IBM-EXA3-4.patch 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/x86-apic-force-bigsmp-apic-on-IBM-EXA3-4.patch 2009-07-16 17:03:19.000000000 +0200 @@ -67,7 +67,7 @@ --- a/arch/x86/kernel/apic/probe_32.c +++ b/arch/x86/kernel/apic/probe_32.c -@@ -254,7 +254,7 @@ generic_mps_oem_check(struct mpc_table * +@@ -242,7 +242,7 @@ generic_mps_oem_check(struct mpc_table * if (!apic_probe[i]->mps_oem_check(mpc, oem, productid)) continue; @@ -76,7 +76,7 @@ apic = apic_probe[i]; printk(KERN_INFO "Switched to APIC driver `%s'.\n", apic->name); -@@ -274,7 +274,7 @@ int __init default_acpi_madt_oem_check(c +@@ -262,7 +262,7 @@ int __init default_acpi_madt_oem_check(c if (!apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x86-self-ptrace.patch new/patches.arch/x86-self-ptrace.patch --- old/patches.arch/x86-self-ptrace.patch 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/x86-self-ptrace.patch 2009-07-16 17:03:19.000000000 +0200 @@ -17,7 +17,7 @@ --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c -@@ -1410,6 +1410,17 @@ asmregparm long syscall_trace_enter(stru +@@ -1490,6 +1490,17 @@ asmregparm long syscall_trace_enter(stru /* do the secure computing check first */ secure_computing(regs->orig_ax); @@ -35,7 +35,7 @@ if (unlikely(test_thread_flag(TIF_SYSCALL_EMU))) ret = -1L; -@@ -1440,6 +1451,9 @@ asmregparm long syscall_trace_enter(stru +@@ -1520,6 +1531,9 @@ asmregparm long syscall_trace_enter(stru asmregparm void syscall_trace_leave(struct pt_regs *regs) { @@ -47,7 +47,7 @@ --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c -@@ -761,6 +761,11 @@ handle_signal(unsigned long sig, siginfo +@@ -760,6 +760,11 @@ handle_signal(unsigned long sig, siginfo tracehook_signal_handler(sig, info, ka, regs, test_thread_flag(TIF_SINGLESTEP)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x86_64-unwind-annotations new/patches.arch/x86_64-unwind-annotations --- old/patches.arch/x86_64-unwind-annotations 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/x86_64-unwind-annotations 2009-07-16 17:03:19.000000000 +0200 @@ -18,7 +18,7 @@ #include <asm/segment.h> #include <asm/cache.h> #include <asm/errno.h> -@@ -251,21 +252,21 @@ ENDPROC(native_usergs_sysret64) +@@ -240,21 +241,21 @@ ENDPROC(native_usergs_sysret64) /* * initial frame state for interrupts (and exceptions without error code) */ @@ -47,7 +47,7 @@ /*CFI_REL_OFFSET ss, SS+\offset-RIP*/ CFI_REL_OFFSET rsp, RSP+\offset-RIP /*CFI_REL_OFFSET rflags, EFLAGS+\offset-RIP*/ -@@ -278,15 +279,16 @@ ENDPROC(native_usergs_sysret64) +@@ -267,15 +268,16 @@ ENDPROC(native_usergs_sysret64) * with vector already pushed) */ .macro XCPT_FRAME start=1 offset=0 @@ -67,7 +67,7 @@ CFI_REL_OFFSET rdi, RDI+\offset-ARGOFFSET CFI_REL_OFFSET rsi, RSI+\offset-ARGOFFSET CFI_REL_OFFSET rdx, RDX+\offset-ARGOFFSET -@@ -302,7 +304,9 @@ ENDPROC(native_usergs_sysret64) +@@ -291,7 +293,9 @@ ENDPROC(native_usergs_sysret64) * frame that enables passing a complete pt_regs to a C function. */ .macro DEFAULT_FRAME start=1 offset=0 @@ -78,7 +78,7 @@ CFI_REL_OFFSET rbx, RBX+\offset CFI_REL_OFFSET rbp, RBP+\offset CFI_REL_OFFSET r12, R12+\offset -@@ -313,21 +317,23 @@ ENDPROC(native_usergs_sysret64) +@@ -302,21 +306,23 @@ ENDPROC(native_usergs_sysret64) /* save partial stack frame */ ENTRY(save_args) @@ -112,7 +112,7 @@ testl $3, CS(%rdi) je 1f SWAPGS -@@ -339,11 +345,10 @@ ENTRY(save_args) +@@ -328,11 +334,10 @@ ENTRY(save_args) */ 1: incl PER_CPU_VAR(irq_count) jne 2f @@ -127,7 +127,7 @@ /* * We entered an interrupt context - irqs are off: */ -@@ -353,14 +358,14 @@ ENTRY(save_args) +@@ -342,14 +347,14 @@ ENTRY(save_args) END(save_args) ENTRY(save_rest) @@ -149,7 +149,7 @@ movq %r11, 8(%rsp) /* return address */ FIXUP_TOP_OF_STACK %r11, 16 ret -@@ -370,23 +375,23 @@ END(save_rest) +@@ -359,23 +364,23 @@ END(save_rest) /* save complete stack frame */ .pushsection .kprobes.text, "ax" ENTRY(save_paranoid) @@ -189,7 +189,7 @@ movl $1,%ebx movl $MSR_GS_BASE,%ecx rdmsr -@@ -702,7 +707,7 @@ ENTRY(\label) +@@ -691,7 +696,7 @@ ENTRY(\label) subq $REST_SKIP, %rsp CFI_ADJUST_CFA_OFFSET REST_SKIP call save_rest @@ -198,7 +198,7 @@ leaq 8(%rsp), \arg /* pt_regs pointer */ call \func jmp ptregscall_common -@@ -719,12 +724,12 @@ END(\label) +@@ -708,12 +713,12 @@ END(\label) ENTRY(ptregscall_common) DEFAULT_FRAME 1 8 /* offset 8: return address */ RESTORE_TOP_OF_STACK %r11, 8 @@ -217,7 +217,7 @@ ret $REST_SKIP /* pop extended registers */ CFI_ENDPROC END(ptregscall_common) -@@ -813,10 +818,12 @@ END(interrupt) +@@ -802,10 +807,12 @@ END(interrupt) /* 0(%rsp): ~(interrupt number) */ .macro interrupt func @@ -233,7 +233,7 @@ call \func .endm -@@ -1033,10 +1040,10 @@ ENTRY(\sym) +@@ -1034,10 +1041,10 @@ ENTRY(\sym) INTR_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */ @@ -247,7 +247,7 @@ movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ call \do_sym -@@ -1051,8 +1058,10 @@ ENTRY(\sym) +@@ -1052,8 +1059,10 @@ ENTRY(\sym) PARAVIRT_ADJUST_EXCEPTION_FRAME pushq $-1 /* ORIG_RAX: no syscall to restart */ CFI_ADJUST_CFA_OFFSET 8 @@ -259,7 +259,7 @@ TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ -@@ -1068,8 +1077,10 @@ ENTRY(\sym) +@@ -1069,8 +1078,10 @@ ENTRY(\sym) PARAVIRT_ADJUST_EXCEPTION_FRAME pushq $-1 /* ORIG_RAX: no syscall to restart */ CFI_ADJUST_CFA_OFFSET 8 @@ -271,7 +271,7 @@ TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ -@@ -1086,10 +1097,10 @@ END(\sym) +@@ -1087,10 +1098,10 @@ END(\sym) ENTRY(\sym) XCPT_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME @@ -285,7 +285,7 @@ movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ -@@ -1104,10 +1115,10 @@ END(\sym) +@@ -1105,10 +1116,10 @@ END(\sym) ENTRY(\sym) XCPT_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME @@ -299,7 +299,7 @@ TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ -@@ -1461,7 +1472,7 @@ paranoidzeroentry machine_check do_machi +@@ -1467,7 +1478,7 @@ paranoidzeroentry machine_check *machine /* ebx: no swapgs flag */ ENTRY(paranoid_exit) @@ -308,7 +308,7 @@ DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF testl %ebx,%ebx /* swapgs needed? */ -@@ -1511,25 +1522,24 @@ END(paranoid_exit) +@@ -1517,25 +1528,24 @@ END(paranoid_exit) * returns in "no swapgs flag" in %ebx. */ ENTRY(error_entry) @@ -350,7 +350,7 @@ xorl %ebx,%ebx testl $3,CS+8(%rsp) je error_kernelspace -@@ -1538,7 +1548,6 @@ error_swapgs: +@@ -1544,7 +1554,6 @@ error_swapgs: error_sti: TRACE_IRQS_OFF ret @@ -358,7 +358,7 @@ /* * There are two places in the kernel that can potentially fault with -@@ -1548,6 +1557,7 @@ error_sti: +@@ -1554,6 +1563,7 @@ error_sti: * compat mode. Check for these here too. */ error_kernelspace: @@ -366,7 +366,7 @@ incl %ebx leaq irq_return(%rip),%rcx cmpq %rcx,RIP+8(%rsp) -@@ -1558,6 +1568,7 @@ error_kernelspace: +@@ -1564,6 +1574,7 @@ error_kernelspace: cmpq $gs_change,RIP+8(%rsp) je error_swapgs jmp error_sti @@ -374,7 +374,7 @@ END(error_entry) -@@ -1586,10 +1597,10 @@ ENTRY(nmi) +@@ -1592,10 +1603,10 @@ ENTRY(nmi) INTR_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME pushq_cfi $-1 @@ -390,7 +390,7 @@ movq $-1,%rsi --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S -@@ -286,6 +286,8 @@ early_idt_handlers: +@@ -285,6 +285,8 @@ early_idt_handlers: ENTRY(early_idt_handler) #ifdef CONFIG_EARLY_PRINTK @@ -399,7 +399,7 @@ cmpl $2,early_recursion_flag(%rip) jz 1f incl early_recursion_flag(%rip) -@@ -301,6 +303,16 @@ ENTRY(early_idt_handler) +@@ -300,6 +302,16 @@ ENTRY(early_idt_handler) testl $0x27d00,%eax je 0f popq %r8 # get error code @@ -416,7 +416,7 @@ 0: movq 0(%rsp),%rcx # get ip movq 8(%rsp),%rdx # get cs xorl %eax,%eax -@@ -314,6 +326,7 @@ ENTRY(early_idt_handler) +@@ -313,6 +325,7 @@ ENTRY(early_idt_handler) movq 0(%rsp),%rsi # get rip again call __print_symbol #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x86_agpgart-g33-stoeln-fix-2.patch new/patches.arch/x86_agpgart-g33-stoeln-fix-2.patch --- old/patches.arch/x86_agpgart-g33-stoeln-fix-2.patch 2009-06-30 11:36:03.000000000 +0200 +++ new/patches.arch/x86_agpgart-g33-stoeln-fix-2.patch 2009-07-16 17:03:19.000000000 +0200 @@ -58,7 +58,7 @@ --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c -@@ -573,6 +573,13 @@ static void intel_i830_init_gtt_entries( +@@ -575,6 +575,13 @@ static void intel_i830_init_gtt_entries( } else { switch (gmch_ctrl & I855_GMCH_GMS_MASK) { case I855_GMCH_GMS_STOLEN_1M: ++++++ patches.drivers.tar.bz2 ++++++ ++++ 9505 lines of diff (skipped) ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/dm-mpath-reattach-dh new/patches.fixes/dm-mpath-reattach-dh --- old/patches.fixes/dm-mpath-reattach-dh 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/dm-mpath-reattach-dh 2009-07-16 17:03:19.000000000 +0200 @@ -12,43 +12,21 @@ Signed-off-by: Hannes Reinecke <hare(a)suse.de --- - drivers/md/dm-mpath.c | 16 ++++++++++++---- + drivers/md/dm-mpath.c | 2 -- drivers/scsi/device_handler/scsi_dh.c | 10 +++------- - 2 files changed, 15 insertions(+), 11 deletions(-) + 2 files changed, 3 insertions(+), 9 deletions(-) --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c -@@ -165,8 +165,6 @@ static void free_pgpaths(struct list_hea +@@ -164,8 +164,6 @@ static void free_pgpaths(struct list_hea list_for_each_entry_safe(pgpath, tmp, pgpaths, list) { list_del(&pgpath->list); - if (m->hw_handler_name) - scsi_dh_detach(bdev_get_queue(pgpath->path.dev->bdev)); dm_put_device(ti, pgpath->path.dev); - spin_lock_irqsave(&m->lock, flags); - if (m->pgpath_to_activate == pgpath) -@@ -595,9 +593,19 @@ static struct pgpath *parse_path(struct + free_pgpath(pgpath); } - - if (m->hw_handler_name) { -- r = scsi_dh_attach(bdev_get_queue(p->path.dev->bdev), -- m->hw_handler_name); -+ struct request_queue *q = bdev_get_queue(p->path.dev->bdev); -+ -+ r = scsi_dh_attach(q, m->hw_handler_name); -+ if (r == -EBUSY) { -+ /* -+ * Already attached to different hw_handler, -+ * try to reattach with correct one. -+ */ -+ scsi_dh_detach(q); -+ r = scsi_dh_attach(q, m->hw_handler_name); -+ } - if (r < 0) { -+ ti->error = "error attaching hardware handler"; - dm_put_device(ti, p->path.dev); - goto bad; - } --- a/drivers/scsi/device_handler/scsi_dh.c +++ b/drivers/scsi/device_handler/scsi_dh.c @@ -498,7 +498,6 @@ void scsi_dh_detach(struct request_queue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/dm-table-switch-to-readonly new/patches.fixes/dm-table-switch-to-readonly --- old/patches.fixes/dm-table-switch-to-readonly 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/dm-table-switch-to-readonly 2009-07-16 17:03:19.000000000 +0200 @@ -16,7 +16,7 @@ --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c -@@ -463,11 +463,19 @@ static int __table_get_device(struct dm_ +@@ -455,11 +455,19 @@ static int __table_get_device(struct dm_ dd->dm_dev.mode = mode; dd->dm_dev.bdev = NULL; @@ -39,7 +39,7 @@ atomic_set(&dd->count, 0); --- a/drivers/md/dm.c +++ b/drivers/md/dm.c -@@ -307,16 +307,25 @@ static void __exit dm_exit(void) +@@ -322,16 +322,25 @@ static void __exit dm_exit(void) static int dm_blk_open(struct block_device *bdev, fmode_t mode) { struct mapped_device *md; @@ -66,7 +66,7 @@ goto out; } -@@ -326,7 +335,7 @@ static int dm_blk_open(struct block_devi +@@ -341,7 +350,7 @@ static int dm_blk_open(struct block_devi out: spin_unlock(&_minor_lock); @@ -75,15 +75,15 @@ } static int dm_blk_close(struct gendisk *disk, fmode_t mode) -@@ -1929,6 +1938,11 @@ static int __bind(struct mapped_device * - write_lock(&md->map_lock); +@@ -1951,6 +1960,11 @@ static int __bind(struct mapped_device * + write_lock_irqsave(&md->map_lock, flags); md->map = t; - dm_table_set_restrictions(t, q); + dm_table_set_restrictions(t, q, limits); + if (!(dm_table_get_mode(t) & FMODE_WRITE)) { + set_disk_ro(md->disk, 1); + } else { + set_disk_ro(md->disk, 0); + } - write_unlock(&md->map_lock); + write_unlock_irqrestore(&md->map_lock, flags); return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/do_anonymous_page-race new/patches.fixes/do_anonymous_page-race --- old/patches.fixes/do_anonymous_page-race 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/do_anonymous_page-race 2009-07-16 17:03:19.000000000 +0200 @@ -15,7 +15,7 @@ --- a/fs/bio.c +++ b/fs/bio.c -@@ -1396,6 +1396,16 @@ void bio_endio(struct bio *bio, int erro +@@ -1395,6 +1395,16 @@ void bio_endio(struct bio *bio, int erro else if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) error = -EIO; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/ext3-mark-super-uptodate new/patches.fixes/ext3-mark-super-uptodate --- old/patches.fixes/ext3-mark-super-uptodate 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/ext3-mark-super-uptodate 2009-07-16 17:03:19.000000000 +0200 @@ -24,7 +24,7 @@ --- a/fs/ext3/super.c +++ b/fs/ext3/super.c -@@ -2332,6 +2332,13 @@ static int ext3_commit_super(struct supe +@@ -2315,6 +2315,13 @@ static int ext3_commit_super(struct supe es->s_free_blocks_count = cpu_to_le32(ext3_count_free_blocks(sb)); es->s_free_inodes_count = cpu_to_le32(ext3_count_free_inodes(sb)); BUFFER_TRACE(sbh, "marking dirty"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/fix-nf_conntrack_slp new/patches.fixes/fix-nf_conntrack_slp --- old/patches.fixes/fix-nf_conntrack_slp 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/fix-nf_conntrack_slp 2009-07-16 17:03:19.000000000 +0200 @@ -15,7 +15,7 @@ { struct nf_conntrack_expect *exp; - struct iphdr *iph = ip_hdr(skb); - struct rtable *rt = skb->rtable; + struct rtable *rt = skb_rtable(skb); struct in_device *in_dev; __be32 mask = 0; + __be32 src = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/grab-swap-token-oops new/patches.fixes/grab-swap-token-oops --- old/patches.fixes/grab-swap-token-oops 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/grab-swap-token-oops 2009-07-16 17:03:19.000000000 +0200 @@ -17,13 +17,13 @@ --- a/mm/thrash.c +++ b/mm/thrash.c -@@ -31,6 +31,9 @@ void grab_swap_token(void) +@@ -31,6 +31,9 @@ void grab_swap_token(struct mm_struct *m int current_interval; global_faults++; -+ if (current->mm == NULL) ++ if (mm == NULL) + return; + - current_interval = global_faults - current->mm->faultstamp; + current_interval = global_faults - mm->faultstamp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/ia64-configure-HAVE_UNSTABLE_SCHED_CLOCK-for-SGI_SN.patch new/patches.fixes/ia64-configure-HAVE_UNSTABLE_SCHED_CLOCK-for-SGI_SN.patch --- old/patches.fixes/ia64-configure-HAVE_UNSTABLE_SCHED_CLOCK-for-SGI_SN.patch 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/ia64-configure-HAVE_UNSTABLE_SCHED_CLOCK-for-SGI_SN.patch 2009-07-16 17:03:19.000000000 +0200 @@ -33,7 +33,7 @@ --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig -@@ -552,6 +552,7 @@ config IA64_MC_ERR_INJECT +@@ -553,6 +553,7 @@ config IA64_MC_ERR_INJECT config SGI_SN def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/mm-madvise-fix.patch new/patches.fixes/mm-madvise-fix.patch --- old/patches.fixes/mm-madvise-fix.patch 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/mm-madvise-fix.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -From: Nick Piggin <npiggin(a)suse.de> -Subject: mm: madvise correct return code -References: bnc#352998 - -madvise should return -EINVAL if passed in an invalid flag, even if the -requested range is 0. - -Signed-off-by: Nick Piggin <npiggin(a)suse.de> ---- ---- - mm/madvise.c | 23 ++++++++++++++++++++++- - 1 file changed, 22 insertions(+), 1 deletion(-) - ---- a/mm/madvise.c -+++ b/mm/madvise.c -@@ -239,12 +239,30 @@ madvise_vma(struct vm_area_struct *vma, - break; - - default: -- error = -EINVAL; -+ BUG(); - break; - } - return error; - } - -+static int -+madvise_behavior_valid(int behavior) -+{ -+ switch (behavior) { -+ case MADV_DOFORK: -+ case MADV_DONTFORK: -+ case MADV_NORMAL: -+ case MADV_SEQUENTIAL: -+ case MADV_RANDOM: -+ case MADV_REMOVE: -+ case MADV_WILLNEED: -+ case MADV_DONTNEED: -+ return 1; -+ -+ default: -+ return 0; -+ } -+} - /* - * The madvise(2) system call. - * -@@ -290,6 +308,9 @@ SYSCALL_DEFINE3(madvise, unsigned long, - int write; - size_t len; - -+ if (!madvise_behavior_valid(behavior)) -+ return error; -+ - write = madvise_need_mmap_write(behavior); - if (write) - down_write(&current->mm->mmap_sem); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/nfs-write.c-bug-removal.patch new/patches.fixes/nfs-write.c-bug-removal.patch --- old/patches.fixes/nfs-write.c-bug-removal.patch 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/nfs-write.c-bug-removal.patch 2009-07-16 17:03:19.000000000 +0200 @@ -17,7 +17,7 @@ --- a/fs/nfs/write.c +++ b/fs/nfs/write.c -@@ -247,9 +247,12 @@ static int nfs_page_async_flush(struct n +@@ -250,9 +250,12 @@ static int nfs_page_async_flush(struct n return ret; spin_lock(&inode->i_lock); } @@ -32,7 +32,7 @@ } if (nfs_set_page_writeback(page) != 0) { spin_unlock(&inode->i_lock); -@@ -408,6 +411,19 @@ nfs_mark_request_dirty(struct nfs_page * +@@ -411,6 +414,19 @@ nfs_mark_request_dirty(struct nfs_page * __set_page_dirty_nobuffers(req->wb_page); } @@ -52,7 +52,7 @@ #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) /* * Add a request to the inode's commit list. -@@ -419,7 +435,7 @@ nfs_mark_request_commit(struct nfs_page +@@ -422,7 +438,7 @@ nfs_mark_request_commit(struct nfs_page struct nfs_inode *nfsi = NFS_I(inode); spin_lock(&inode->i_lock); @@ -61,7 +61,7 @@ radix_tree_tag_set(&nfsi->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_COMMIT); -@@ -429,19 +445,6 @@ nfs_mark_request_commit(struct nfs_page +@@ -432,19 +448,6 @@ nfs_mark_request_commit(struct nfs_page __mark_inode_dirty(inode, I_DIRTY_DATASYNC); } @@ -81,7 +81,7 @@ static inline int nfs_write_need_commit(struct nfs_write_data *data) { -@@ -451,7 +454,7 @@ int nfs_write_need_commit(struct nfs_wri +@@ -454,7 +457,7 @@ int nfs_write_need_commit(struct nfs_wri static inline int nfs_reschedule_unstable_write(struct nfs_page *req) { @@ -90,7 +90,7 @@ nfs_mark_request_commit(req); return 1; } -@@ -467,12 +470,6 @@ nfs_mark_request_commit(struct nfs_page +@@ -470,12 +473,6 @@ nfs_mark_request_commit(struct nfs_page { } @@ -103,7 +103,7 @@ static inline int nfs_write_need_commit(struct nfs_write_data *data) { -@@ -530,8 +527,11 @@ static void nfs_cancel_commit_list(struc +@@ -533,8 +530,11 @@ static void nfs_cancel_commit_list(struc while(!list_empty(head)) { req = nfs_list_entry(head->next); @@ -116,7 +116,7 @@ nfs_inode_remove_request(req); nfs_unlock_request(req); } -@@ -611,7 +611,8 @@ static struct nfs_page *nfs_try_to_updat +@@ -614,7 +614,8 @@ static struct nfs_page *nfs_try_to_updat * Note: nfs_flush_incompatible() will already * have flushed out requests having wrong owners. */ @@ -126,7 +126,7 @@ || end < req->wb_offset) goto out_flushme; -@@ -627,10 +628,6 @@ static struct nfs_page *nfs_try_to_updat +@@ -630,10 +631,6 @@ static struct nfs_page *nfs_try_to_updat spin_lock(&inode->i_lock); } @@ -137,7 +137,7 @@ /* Okay, the request matches. Update the region */ if (offset < req->wb_offset) { req->wb_offset = offset; -@@ -712,7 +709,8 @@ int nfs_flush_incompatible(struct file * +@@ -715,7 +712,8 @@ int nfs_flush_incompatible(struct file * req = nfs_page_find_request(page); if (req == NULL) return 0; @@ -147,7 +147,7 @@ nfs_release_request(req); if (!do_flush) return 0; -@@ -1317,7 +1315,10 @@ static void nfs_commit_release(void *cal +@@ -1341,7 +1339,10 @@ static void nfs_commit_release(void *cal while (!list_empty(&data->pages)) { req = nfs_list_entry(data->pages.next); nfs_list_remove_request(req); @@ -159,7 +159,7 @@ dprintk("NFS: commit (%s/%lld %d@%lld)", req->wb_context->path.dentry->d_inode->i_sb->s_id, -@@ -1489,7 +1490,7 @@ int nfs_wb_page_cancel(struct inode *ino +@@ -1516,7 +1517,7 @@ int nfs_wb_page_cancel(struct inode *ino req = nfs_page_find_request(page); if (req == NULL) goto out; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/oom-warning new/patches.fixes/oom-warning --- old/patches.fixes/oom-warning 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/oom-warning 2009-07-16 17:03:19.000000000 +0200 @@ -13,7 +13,7 @@ --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -1664,7 +1664,13 @@ nofail_alloc: +@@ -1837,7 +1837,13 @@ rebalance: nopage: if (!(gfp_mask & __GFP_NOWARN) && printk_ratelimit()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/qla2xxx-disable-automatic-queue-tracking new/patches.fixes/qla2xxx-disable-automatic-queue-tracking --- old/patches.fixes/qla2xxx-disable-automatic-queue-tracking 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/qla2xxx-disable-automatic-queue-tracking 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -From: Mike Reed <mdr(a)sgi.com> -Subject: qla2xxx: Conditionally disable queue_full tracking -References: bnc#449386 - -Changing a lun's queue depth (/sys/block/sdX/device/queue_depth) isn't -sticky when the device is connected via a QLogic fibre channel adapter. - -The QLogic qla2xxx fibre channel driver dynamically adjusts a lun's queue -depth. If a user has a specific need to limit the number of commands issued -to a lun (say a tape drive, or a shared raid where the total commands issued -to all luns is limited at the controller level, for example) and writes a -limiting value to /sys/block/sdXX/device/queue_depth, the qla2xxx driver will -silently and gradually increase the queue depth back to the driver limit -of ql2xmaxqdepth. While reducing this value (module parameter) or increasing -the interval between ramp ups (ql2xqfullrampup) offers the potential for a -work around it would be better to have the option of just disabling the -dynamic adjustment of queue depth. - -This patch implements an "off switch" as a module parameter. Applies to -2.6.28-rc6-git1. - -Signed-off-by: Michael Reed <mdr(a)sgi.com> -Signed-off-by: Hannes Reinecke <hare(a)suse.de> - ---- - drivers/scsi/qla2xxx/qla_gbl.h | 1 + - drivers/scsi/qla2xxx/qla_isr.c | 10 ++++++++++ - drivers/scsi/qla2xxx/qla_os.c | 8 ++++++++ - 3 files changed, 19 insertions(+) - ---- a/drivers/scsi/qla2xxx/qla_gbl.h -+++ b/drivers/scsi/qla2xxx/qla_gbl.h -@@ -67,6 +67,7 @@ extern int ql2xextended_error_logging; - extern int ql2xqfullrampup; - extern int ql2xiidmaenable; - extern int ql2xmaxqueues; -+extern int ql2xqfulltracking; - - extern int qla2x00_loop_reset(scsi_qla_host_t *); - extern void qla2x00_abort_all_cmds(scsi_qla_host_t *, int); ---- a/drivers/scsi/qla2xxx/qla_isr.c -+++ b/drivers/scsi/qla2xxx/qla_isr.c -@@ -766,6 +766,9 @@ qla2x00_adjust_sdev_qdepth_up(struct scs - struct qla_hw_data *ha = vha->hw; - struct req_que *req = NULL; - -+ if (!ql2xqfulltracking) -+ return; -+ - req = ha->req_q_map[vha->req_ques[0]]; - if (!req) - return; -@@ -808,6 +811,9 @@ qla2x00_ramp_up_queue_depth(scsi_qla_hos - fc_port_t *fcport; - struct scsi_device *sdev; - -+ if (!ql2xqfulltracking) -+ return; -+ - sdev = sp->cmd->device; - if (sdev->queue_depth >= req->max_q_depth) - return; -@@ -1121,6 +1127,8 @@ qla2x00_status_entry(scsi_qla_host_t *vh - scsi_status)); - - /* Adjust queue depth for all luns on the port. */ -+ if (!ql2xqfulltracking) -+ break; - fcport->last_queue_full = jiffies; - starget_for_each_device(cp->device->sdev_target, - fcport, qla2x00_adjust_sdev_qdepth_down); -@@ -1179,6 +1187,8 @@ qla2x00_status_entry(scsi_qla_host_t *vh - * Adjust queue depth for all luns on the - * port. - */ -+ if (!ql2xqfulltracking) -+ break; - fcport->last_queue_full = jiffies; - starget_for_each_device( - cp->device->sdev_target, fcport, ---- a/drivers/scsi/qla2xxx/qla_os.c -+++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -77,6 +77,14 @@ module_param(ql2xmaxqdepth, int, S_IRUGO - MODULE_PARM_DESC(ql2xmaxqdepth, - "Maximum queue depth to report for target devices."); - -+int ql2xqfulltracking = 1; -+module_param(ql2xqfulltracking, int, S_IRUGO|S_IWUSR); -+MODULE_PARM_DESC(ql2xqfulltracking, -+ "Controls whether the driver tracks queue full status " -+ "returns and dynamically adjusts a scsi device's queue " -+ "depth. Default is 1, perform tracking. Set to 0 to " -+ "disable dynamic tracking and adjustment of queue depth."); -+ - int ql2xqfullrampup = 120; - module_param(ql2xqfullrampup, int, S_IRUGO|S_IWUSR); - MODULE_PARM_DESC(ql2xqfullrampup, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/reiserfs-expose-privroot new/patches.fixes/reiserfs-expose-privroot --- old/patches.fixes/reiserfs-expose-privroot 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/reiserfs-expose-privroot 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -From: Jeff Mahoney <jeffm(a)suse.com> -Subject: reiserfs: allow exposing privroot w/ xattrs enabled ---- - fs/reiserfs/dir.c | 10 ++++------ - fs/reiserfs/super.c | 1 + - fs/reiserfs/xattr.c | 3 ++- - include/linux/reiserfs_fs_sb.h | 2 ++ - 4 files changed, 9 insertions(+), 7 deletions(-) - ---- a/fs/reiserfs/dir.c -+++ b/fs/reiserfs/dir.c -@@ -44,13 +44,11 @@ static int reiserfs_dir_fsync(struct fil - static inline bool is_privroot_deh(struct dentry *dir, - struct reiserfs_de_head *deh) - { -- int ret = 0; --#ifdef CONFIG_REISERFS_FS_XATTR - struct dentry *privroot = REISERFS_SB(dir->d_sb)->priv_root; -- ret = (dir == dir->d_parent && privroot->d_inode && -- deh->deh_objectid == INODE_PKEY(privroot->d_inode)->k_objectid); --#endif -- return ret; -+ if (reiserfs_expose_privroot(dir->d_sb)) -+ return 0; -+ return (dir == dir->d_parent && privroot->d_inode && -+ deh->deh_objectid == INODE_PKEY(privroot->d_inode)->k_objectid); - } - - int reiserfs_readdir_dentry(struct dentry *dentry, void *dirent, ---- a/fs/reiserfs/super.c -+++ b/fs/reiserfs/super.c -@@ -898,6 +898,7 @@ static int reiserfs_parse_options(struct - {"conv",.setmask = 1 << REISERFS_CONVERT}, - {"attrs",.setmask = 1 << REISERFS_ATTRS}, - {"noattrs",.clrmask = 1 << REISERFS_ATTRS}, -+ {"expose_privroot", .setmask = 1 << REISERFS_EXPOSE_PRIVROOT}, - #ifdef CONFIG_REISERFS_FS_XATTR - {"user_xattr",.setmask = 1 << REISERFS_XATTRS_USER}, - {"nouser_xattr",.clrmask = 1 << REISERFS_XATTRS_USER}, ---- a/fs/reiserfs/xattr.c -+++ b/fs/reiserfs/xattr.c -@@ -981,7 +981,8 @@ int reiserfs_lookup_privroot(struct supe - strlen(PRIVROOT_NAME)); - if (!IS_ERR(dentry)) { - REISERFS_SB(s)->priv_root = dentry; -- s->s_root->d_op = &xattr_lookup_poison_ops; -+ if (!reiserfs_expose_privroot(s)) -+ s->s_root->d_op = &xattr_lookup_poison_ops; - if (dentry->d_inode) - dentry->d_inode->i_flags |= S_PRIVATE; - } else ---- a/include/linux/reiserfs_fs_sb.h -+++ b/include/linux/reiserfs_fs_sb.h -@@ -453,6 +453,7 @@ enum reiserfs_mount_options { - REISERFS_ATTRS, - REISERFS_XATTRS_USER, - REISERFS_POSIXACL, -+ REISERFS_EXPOSE_PRIVROOT, - REISERFS_BARRIER_NONE, - REISERFS_BARRIER_FLUSH, - -@@ -490,6 +491,7 @@ enum reiserfs_mount_options { - #define reiserfs_data_writeback(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_WRITEBACK)) - #define reiserfs_xattrs_user(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_XATTRS_USER)) - #define reiserfs_posixacl(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_POSIXACL)) -+#define reiserfs_expose_privroot(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_EXPOSE_PRIVROOT)) - #define reiserfs_xattrs_optional(s) (reiserfs_xattrs_user(s) || reiserfs_posixacl(s)) - #define reiserfs_barrier_none(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_BARRIER_NONE)) - #define reiserfs_barrier_flush(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_BARRIER_FLUSH)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/remount-no-shrink-dcache new/patches.fixes/remount-no-shrink-dcache --- old/patches.fixes/remount-no-shrink-dcache 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/remount-no-shrink-dcache 2009-07-16 17:03:19.000000000 +0200 @@ -14,8 +14,8 @@ --- a/fs/super.c +++ b/fs/super.c -@@ -654,16 +654,10 @@ retry: - file_list_unlock(); +@@ -517,16 +517,10 @@ out: + return err; } -/** @@ -35,14 +35,14 @@ { int retval; int remount_rw; -@@ -674,13 +668,14 @@ int do_remount_sb(struct super_block *sb +@@ -537,13 +531,14 @@ int do_remount_sb(struct super_block *sb #endif if (flags & MS_RDONLY) acct_auto_close(sb); - shrink_dcache_sb(sb); + if (rflags & REMOUNT_SHRINK_DCACHE) + shrink_dcache_sb(sb); - fsync_super(sb); + sync_filesystem(sb); /* If we are remounting RDONLY and current sb is read/write, make sure there are no rw files opened */ @@ -52,7 +52,7 @@ mark_files_ro(sb); else if (!fs_may_remount_ro(sb)) return -EBUSY; -@@ -703,6 +698,21 @@ int do_remount_sb(struct super_block *sb +@@ -564,6 +559,21 @@ int do_remount_sb(struct super_block *sb return 0; } @@ -74,7 +74,7 @@ static void do_emergency_remount(struct work_struct *work) { struct super_block *sb; -@@ -981,7 +991,7 @@ int get_sb_single(struct file_system_typ +@@ -848,7 +858,7 @@ int get_sb_single(struct file_system_typ } s->s_flags |= MS_ACTIVE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/scsi-add-tgps-setting new/patches.fixes/scsi-add-tgps-setting --- old/patches.fixes/scsi-add-tgps-setting 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/scsi-add-tgps-setting 2009-07-16 17:03:19.000000000 +0200 @@ -203,7 +203,7 @@ static int hp_sw_bus_attach(struct scsi_device *sdev); --- a/drivers/scsi/device_handler/scsi_dh_rdac.c +++ b/drivers/scsi/device_handler/scsi_dh_rdac.c -@@ -609,25 +609,25 @@ static int rdac_check_sense(struct scsi_ +@@ -615,25 +615,25 @@ static int rdac_check_sense(struct scsi_ } static const struct scsi_dh_devlist rdac_dev_list[] = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/scsi-ibmvscsi-module_alias.patch new/patches.fixes/scsi-ibmvscsi-module_alias.patch --- old/patches.fixes/scsi-ibmvscsi-module_alias.patch 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/scsi-ibmvscsi-module_alias.patch 2009-07-16 17:03:19.000000000 +0200 @@ -8,7 +8,7 @@ --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c -@@ -99,6 +99,9 @@ static struct scsi_transport_template *i +@@ -106,6 +106,9 @@ static struct scsi_transport_template *i static struct ibmvscsi_ops *ibmvscsi_ops; @@ -18,7 +18,7 @@ MODULE_DESCRIPTION("IBM Virtual SCSI"); MODULE_AUTHOR("Dave Boutcher"); MODULE_LICENSE("GPL"); -@@ -1611,7 +1614,7 @@ static struct device_attribute *ibmvscsi +@@ -1831,7 +1834,7 @@ static struct device_attribute *ibmvscsi static struct scsi_host_template driver_template = { .module = THIS_MODULE, .name = "IBM POWER Virtual SCSI Adapter " IBMVSCSI_VERSION, @@ -27,7 +27,7 @@ .queuecommand = ibmvscsi_queuecommand, .eh_abort_handler = ibmvscsi_eh_abort_handler, .eh_device_reset_handler = ibmvscsi_eh_device_reset_handler, -@@ -1770,7 +1773,7 @@ static struct vio_driver ibmvscsi_driver +@@ -1999,7 +2002,7 @@ static struct vio_driver ibmvscsi_driver .remove = ibmvscsi_remove, .get_desired_dma = ibmvscsi_get_desired_dma, .driver = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/scsi-ibmvscsi-show-config.patch new/patches.fixes/scsi-ibmvscsi-show-config.patch --- old/patches.fixes/scsi-ibmvscsi-show-config.patch 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/scsi-ibmvscsi-show-config.patch 2009-07-16 17:03:19.000000000 +0200 @@ -14,10 +14,10 @@ --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c -@@ -90,10 +90,12 @@ static int max_channel = 3; - static int init_timeout = 5; - static int max_requests = IBMVSCSI_MAX_REQUESTS_DEFAULT; +@@ -97,10 +97,12 @@ static int max_requests = IBMVSCSI_MAX_R static int max_events = IBMVSCSI_MAX_REQUESTS_DEFAULT + 2; + static int fast_fail = 1; + static int client_reserve = 1; +/*host data buffer size*/ +#define buff_size 4096 @@ -28,7 +28,7 @@ static struct ibmvscsi_ops *ibmvscsi_ops; -@@ -1478,7 +1480,7 @@ static ssize_t show_host_srp_version(str +@@ -1696,7 +1698,7 @@ static ssize_t show_host_srp_version(str struct ibmvscsi_host_data *hostdata = shost_priv(shost); int len; @@ -37,7 +37,7 @@ hostdata->madapter_info.srp_version); return len; } -@@ -1499,7 +1501,7 @@ static ssize_t show_host_partition_name( +@@ -1717,7 +1719,7 @@ static ssize_t show_host_partition_name( struct ibmvscsi_host_data *hostdata = shost_priv(shost); int len; @@ -46,7 +46,7 @@ hostdata->madapter_info.partition_name); return len; } -@@ -1520,7 +1522,7 @@ static ssize_t show_host_partition_numbe +@@ -1738,7 +1740,7 @@ static ssize_t show_host_partition_numbe struct ibmvscsi_host_data *hostdata = shost_priv(shost); int len; @@ -55,7 +55,7 @@ hostdata->madapter_info.partition_number); return len; } -@@ -1540,7 +1542,7 @@ static ssize_t show_host_mad_version(str +@@ -1758,7 +1760,7 @@ static ssize_t show_host_mad_version(str struct ibmvscsi_host_data *hostdata = shost_priv(shost); int len; @@ -64,7 +64,7 @@ hostdata->madapter_info.mad_version); return len; } -@@ -1560,7 +1562,7 @@ static ssize_t show_host_os_type(struct +@@ -1778,7 +1780,7 @@ static ssize_t show_host_os_type(struct struct ibmvscsi_host_data *hostdata = shost_priv(shost); int len; @@ -73,7 +73,7 @@ return len; } -@@ -1579,7 +1581,7 @@ static ssize_t show_host_config(struct d +@@ -1797,7 +1799,7 @@ static ssize_t show_host_config(struct d struct ibmvscsi_host_data *hostdata = shost_priv(shost); /* returns null-terminated host config data */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/scsi-scan-blist-update new/patches.fixes/scsi-scan-blist-update --- old/patches.fixes/scsi-scan-blist-update 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/scsi-scan-blist-update 2009-07-16 17:03:19.000000000 +0200 @@ -15,7 +15,7 @@ --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c -@@ -152,7 +152,7 @@ static struct { +@@ -159,7 +159,7 @@ static struct { {"DGC", "RAID", NULL, BLIST_SPARSELUN}, /* Dell PV 650F, storage on LUN 0 */ {"DGC", "DISK", NULL, BLIST_SPARSELUN}, /* Dell PV 650F, no storage on LUN 0 */ {"EMC", "Invista", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/scsi-skip-nonscsi-device-for-dma new/patches.fixes/scsi-skip-nonscsi-device-for-dma --- old/patches.fixes/scsi-skip-nonscsi-device-for-dma 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/scsi-skip-nonscsi-device-for-dma 2009-07-16 17:03:19.000000000 +0200 @@ -29,7 +29,7 @@ --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c -@@ -1637,7 +1637,7 @@ struct request_queue *__scsi_alloc_queue +@@ -1608,7 +1608,7 @@ struct request_queue *__scsi_alloc_queue request_fn_proc *request_fn) { struct request_queue *q; @@ -66,7 +66,7 @@ + --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h -@@ -689,6 +689,10 @@ static inline void *shost_priv(struct Sc +@@ -698,6 +698,10 @@ static inline void *shost_priv(struct Sc int scsi_is_host_device(const struct device *); @@ -77,7 +77,7 @@ static inline struct Scsi_Host *dev_to_shost(struct device *dev) { while (!scsi_is_host_device(dev)) { -@@ -699,6 +703,26 @@ static inline struct Scsi_Host *dev_to_s +@@ -708,6 +712,26 @@ static inline struct Scsi_Host *dev_to_s return container_of(dev, struct Scsi_Host, shost_gendev); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/sd-needs-updating new/patches.fixes/sd-needs-updating --- old/patches.fixes/sd-needs-updating 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/sd-needs-updating 1970-01-01 01:00:00.000000000 +0100 @@ -1,104 +0,0 @@ -Subject: Driver 'sd' needs updating -From: Hannes Reinecke <hare(a)suse.de> -Date: Tue Oct 7 16:17:19 2008 +0200: -Git: 2ec147acf8022cc363266fde3e8f5f89149926c8 -References: bnc#406656 - -If a driver sets blk_queue_prep_rq(), it should clean it up itself, and -not from the bus callbacks. This removes the need to hook into bus->remove(), -which should not be used at the same time as driver->remove(). - -Signed-off-by: Hannes Reinecke <hare(a)suse.de> -Signed-off-by: Kay Sievers <kay.sievers(a)vrfy.org> - ---- - drivers/scsi/scsi_lib.c | 1 + - drivers/scsi/scsi_priv.h | 1 - - drivers/scsi/scsi_sysfs.c | 17 ----------------- - drivers/scsi/sd.c | 2 ++ - drivers/scsi/sr.c | 1 + - include/scsi/scsi_driver.h | 1 + - 6 files changed, 5 insertions(+), 18 deletions(-) - ---- a/drivers/scsi/scsi_lib.c -+++ b/drivers/scsi/scsi_lib.c -@@ -1236,6 +1236,7 @@ int scsi_prep_fn(struct request_queue *q - ret = scsi_setup_blk_pc_cmnd(sdev, req); - return scsi_prep_return(q, req, ret); - } -+EXPORT_SYMBOL(scsi_prep_fn); - - /* - * scsi_dev_queue_ready: if we can send requests to sdev, return 1 else ---- a/drivers/scsi/scsi_priv.h -+++ b/drivers/scsi/scsi_priv.h -@@ -71,7 +71,6 @@ extern int scsi_init_queue(void); - extern void scsi_exit_queue(void); - struct request_queue; - struct request; --extern int scsi_prep_fn(struct request_queue *, struct request *); - extern struct kmem_cache *scsi_sdb_cache; - - /* scsi_proc.c */ ---- a/drivers/scsi/scsi_sysfs.c -+++ b/drivers/scsi/scsi_sysfs.c -@@ -420,29 +420,12 @@ static int scsi_bus_resume(struct device - return err; - } - --static int scsi_bus_remove(struct device *dev) --{ -- struct device_driver *drv = dev->driver; -- struct scsi_device *sdev = to_scsi_device(dev); -- int err = 0; -- -- /* reset the prep_fn back to the default since the -- * driver may have altered it and it's being removed */ -- blk_queue_prep_rq(sdev->request_queue, scsi_prep_fn); -- -- if (drv && drv->remove) -- err = drv->remove(dev); -- -- return 0; --} -- - struct bus_type scsi_bus_type = { - .name = "scsi", - .match = scsi_bus_match, - .uevent = scsi_bus_uevent, - .suspend = scsi_bus_suspend, - .resume = scsi_bus_resume, -- .remove = scsi_bus_remove, - }; - EXPORT_SYMBOL_GPL(scsi_bus_type); - ---- a/drivers/scsi/sd.c -+++ b/drivers/scsi/sd.c -@@ -2053,6 +2053,8 @@ static int sd_remove(struct device *dev) - { - struct scsi_disk *sdkp = dev_get_drvdata(dev); - -+ blk_queue_prep_rq(sdkp->device->request_queue, scsi_prep_fn); -+ - device_del(&sdkp->dev); - del_gendisk(sdkp->disk); - sd_shutdown(dev); ---- a/drivers/scsi/sr.c -+++ b/drivers/scsi/sr.c -@@ -880,6 +880,7 @@ static int sr_remove(struct device *dev) - { - struct scsi_cd *cd = dev_get_drvdata(dev); - -+ blk_queue_prep_rq(cd->device->request_queue, scsi_prep_fn); - del_gendisk(cd->disk); - - mutex_lock(&sr_ref_mutex); ---- a/include/scsi/scsi_driver.h -+++ b/include/scsi/scsi_driver.h -@@ -32,5 +32,6 @@ int scsi_setup_blk_pc_cmnd(struct scsi_d - int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req); - int scsi_prep_state_check(struct scsi_device *sdev, struct request *req); - int scsi_prep_return(struct request_queue *q, struct request *req, int ret); -+int scsi_prep_fn(struct request_queue *, struct request *); - - #endif /* _SCSI_SCSI_DRIVER_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/seccomp-disable-tsc-option new/patches.fixes/seccomp-disable-tsc-option --- old/patches.fixes/seccomp-disable-tsc-option 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/seccomp-disable-tsc-option 2009-07-16 17:03:19.000000000 +0200 @@ -18,7 +18,7 @@ --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1404,6 +1404,18 @@ config SECCOMP +@@ -1444,6 +1444,18 @@ config SECCOMP If unsure, say Y. Only embedded should say N here. @@ -39,7 +39,7 @@ --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c -@@ -127,6 +127,7 @@ static void hard_disable_TSC(void) +@@ -130,6 +130,7 @@ static void hard_disable_TSC(void) void disable_TSC(void) { @@ -47,7 +47,7 @@ preempt_disable(); if (!test_and_set_thread_flag(TIF_NOTSC)) /* -@@ -135,6 +136,7 @@ void disable_TSC(void) +@@ -138,6 +139,7 @@ void disable_TSC(void) */ hard_disable_TSC(); preempt_enable(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/tg3-fix-default-wol.patch new/patches.fixes/tg3-fix-default-wol.patch --- old/patches.fixes/tg3-fix-default-wol.patch 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/tg3-fix-default-wol.patch 2009-07-16 17:03:19.000000000 +0200 @@ -16,7 +16,7 @@ --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c -@@ -11008,8 +11008,10 @@ static void __devinit tg3_get_eeprom_hw_ +@@ -11026,8 +11026,10 @@ static void __devinit tg3_get_eeprom_hw_ if (val & VCPU_CFGSHDW_ASPM_DBNC) tp->tg3_flags |= TG3_FLAG_ASPM_WORKAROUND; if ((val & VCPU_CFGSHDW_WOL_ENABLE) && @@ -28,7 +28,7 @@ goto done; } -@@ -11142,8 +11144,10 @@ static void __devinit tg3_get_eeprom_hw_ +@@ -11160,8 +11162,10 @@ static void __devinit tg3_get_eeprom_hw_ tp->tg3_flags &= ~TG3_FLAG_WOL_CAP; if ((tp->tg3_flags & TG3_FLAG_WOL_CAP) && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/tiocgdev new/patches.fixes/tiocgdev --- old/patches.fixes/tiocgdev 2009-06-29 19:49:45.000000000 +0200 +++ new/patches.fixes/tiocgdev 2009-07-16 17:03:19.000000000 +0200 @@ -120,7 +120,7 @@ #define TCSETXF 0x5434 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c -@@ -2559,6 +2559,21 @@ long tty_ioctl(struct file *file, unsign +@@ -2506,6 +2506,21 @@ long tty_ioctl(struct file *file, unsign case TIOCSETD: return tiocsetd(tty, p); /* @@ -144,7 +144,7 @@ case TIOCSBRK: /* Turn break on, unconditionally */ --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c -@@ -1876,6 +1876,7 @@ COMPATIBLE_IOCTL(TCSETSW) +@@ -1865,6 +1865,7 @@ COMPATIBLE_IOCTL(TCSETSW) COMPATIBLE_IOCTL(TCSETSF) COMPATIBLE_IOCTL(TIOCLINUX) COMPATIBLE_IOCTL(TIOCSBRK) ++++++ patches.kernel.org.tar.bz2 ++++++ kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: char 11, line 1 ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/arm-arch_include_asm-fix.diff new/patches.rpmify/arm-arch_include_asm-fix.diff --- old/patches.rpmify/arm-arch_include_asm-fix.diff 2009-06-10 16:12:26.000000000 +0200 +++ new/patches.rpmify/arm-arch_include_asm-fix.diff 2009-07-27 03:04:42.000000000 +0200 @@ -13,7 +13,7 @@ --- a/arch/arm/Makefile +++ b/arch/arm/Makefile -@@ -222,7 +222,7 @@ archprepare: maketools +@@ -234,7 +234,7 @@ archprepare: maketools PHONY += maketools FORCE maketools: include/linux/version.h FORCE @@ -22,7 +22,7 @@ # Convert bzImage to zImage bzImage: zImage -@@ -233,7 +233,7 @@ zImage Image xipImage bootpImage uImage: +@@ -245,7 +245,7 @@ zImage Image xipImage bootpImage uImage: zinstall install: vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/firmware-path new/patches.rpmify/firmware-path --- old/patches.rpmify/firmware-path 2009-06-10 16:12:26.000000000 +0200 +++ new/patches.rpmify/firmware-path 2009-07-27 03:04:42.000000000 +0200 @@ -14,7 +14,7 @@ --- a/Makefile +++ b/Makefile -@@ -1074,7 +1074,7 @@ depend dep: +@@ -1067,7 +1067,7 @@ depend dep: # --------------------------------------------------------------------------- # Firmware install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/no-include-asm new/patches.rpmify/no-include-asm --- old/patches.rpmify/no-include-asm 2009-06-10 16:12:26.000000000 +0200 +++ new/patches.rpmify/no-include-asm 2009-07-27 03:04:42.000000000 +0200 @@ -18,7 +18,7 @@ --- a/Makefile +++ b/Makefile -@@ -967,7 +967,11 @@ ifneq ($(KBUILD_SRC),) +@@ -960,7 +960,11 @@ ifneq ($(KBUILD_SRC),) fi; $(Q)if [ ! -d include2 ]; then \ mkdir -p include2; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/rtl8192su-build-fix new/patches.rpmify/rtl8192su-build-fix --- old/patches.rpmify/rtl8192su-build-fix 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/rtl8192su-build-fix 2009-07-27 03:04:42.000000000 +0200 @@ -0,0 +1,87 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: rtl8192su: compile fixes + + This driver needs real help. + +Acked-by: Jeff Mahoney <jeffm(a)suse.com> +--- + drivers/staging/rtl8192su/Makefile | 1 - + drivers/staging/rtl8192su/r8192U_core.c | 22 ++++++++-------------- + 2 files changed, 8 insertions(+), 15 deletions(-) + +--- a/drivers/staging/rtl8192su/Makefile ++++ b/drivers/staging/rtl8192su/Makefile +@@ -2,7 +2,6 @@ NIC_SELECT = RTL8192SU + + EXTRA_CFLAGS += -std=gnu89 + EXTRA_CFLAGS += -O2 +-EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y + + EXTRA_CFLAGS += -DJACKSON_NEW_RX + EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TURBO +--- a/drivers/staging/rtl8192su/r8192U_core.c ++++ b/drivers/staging/rtl8192su/r8192U_core.c +@@ -24,14 +24,7 @@ + * Jerry chuang <wlanfae(a)realtek.com> + */ + +-#ifndef CONFIG_FORCE_HARD_FLOAT +-double __floatsidf (int i) { return i; } +-unsigned int __fixunsdfsi (double d) { return d; } +-double __adddf3(double a, double b) { return a+b; } +-double __addsf3(float a, float b) { return a+b; } +-double __subdf3(double a, double b) { return a-b; } +-double __extendsfdf2(float a) {return a;} +-#endif ++#include <linux/vmalloc.h> + + #undef LOOP_TEST + #undef DUMP_RX +@@ -1715,7 +1708,7 @@ static int rtl8192_rx_initiate(struct ne + } + // printk("nomal packet IN request!\n"); + usb_fill_bulk_urb(entry, priv->udev, +- usb_rcvbulkpipe(priv->udev, 3), skb->tail, ++ usb_rcvbulkpipe(priv->udev, 3), skb_tail_pointer(skb), + RX_URB_SIZE, rtl8192_rx_isr, skb); + info = (struct rtl8192_rx_info *) skb->cb; + info->urb = entry; +@@ -1745,7 +1738,7 @@ static int rtl8192_rx_initiate(struct ne + break; + } + usb_fill_bulk_urb(entry, priv->udev, +- usb_rcvbulkpipe(priv->udev, 9), skb->tail, ++ usb_rcvbulkpipe(priv->udev, 9), skb_tail_pointer(skb), + RX_URB_SIZE, rtl8192_rx_isr, skb); + info = (struct rtl8192_rx_info *) skb->cb; + info->urb = entry; +@@ -2135,7 +2128,8 @@ static void rtl8192_rx_isr(struct urb *u + } + + usb_fill_bulk_urb(urb, priv->udev, +- usb_rcvbulkpipe(priv->udev, out_pipe), skb->tail, ++ usb_rcvbulkpipe(priv->udev, out_pipe), ++ skb_tail_pointer(skb), + RX_URB_SIZE, rtl8192_rx_isr, skb); + + info = (struct rtl8192_rx_info *) skb->cb; +@@ -2143,7 +2137,7 @@ static void rtl8192_rx_isr(struct urb *u + info->dev = dev; + info->out_pipe = out_pipe; + +- urb->transfer_buffer = skb->tail; ++ urb->transfer_buffer = skb_tail_pointer(skb); + urb->context = skb; + skb_queue_tail(&priv->rx_queue, skb); + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) +@@ -2356,8 +2350,8 @@ struct sk_buff *DrvAggr_Aggregation(stru + /* Subframe drv Tx descriptor and firmware info setting */ + skb = pSendList->tx_agg_frames[i]; + tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); +- tx_agg_desc = (tx_desc_819x_usb_aggr_subframe *)agg_skb->tail; +- tx_fwinfo = (tx_fwinfo_819x_usb *)(agg_skb->tail + sizeof(tx_desc_819x_usb_aggr_subframe)); ++ tx_agg_desc = (tx_desc_819x_usb_aggr_subframe *)agg_skb_tail_pointer(skb); ++ tx_fwinfo = (tx_fwinfo_819x_usb *)(agg_skb_tail_pointer(skb) + sizeof(tx_desc_819x_usb_aggr_subframe)); + + memset(tx_fwinfo,0,sizeof(tx_fwinfo_819x_usb)); + /* DWORD 0 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/sgi-hotplug-fixup new/patches.rpmify/sgi-hotplug-fixup --- old/patches.rpmify/sgi-hotplug-fixup 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/sgi-hotplug-fixup 2009-07-27 03:04:42.000000000 +0200 @@ -0,0 +1,35 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: hotplug: fix sgi-hotplug attribute handling + + struct hotplug_slot_attribute doesn't exist. This patch uses the + pci_slot_attribute instead. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + drivers/pci/hotplug/sgi_hotplug.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/pci/hotplug/sgi_hotplug.c ++++ b/drivers/pci/hotplug/sgi_hotplug.c +@@ -90,10 +90,10 @@ static struct hotplug_slot_ops sn_hotplu + + static DEFINE_MUTEX(sn_hotplug_mutex); + +-static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot, +- char *buf) ++static ssize_t path_show (struct pci_slot *pci_slot, char *buf) + { + int retval = -ENOENT; ++ struct hotplug_slot *bss_hotplug_slot = pci_slot->hotplug; + struct slot *slot = bss_hotplug_slot->private; + + if (!slot) +@@ -103,7 +103,7 @@ static ssize_t path_show (struct hotplug + return retval; + } + +-static struct hotplug_slot_attribute sn_slot_path_attr = __ATTR_RO(path); ++static struct pci_slot_attribute sn_slot_path_attr = __ATTR_RO(path); + + static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device) + { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/spin_is_contended-fix new/patches.rpmify/spin_is_contended-fix --- old/patches.rpmify/spin_is_contended-fix 2009-06-10 16:12:26.000000000 +0200 +++ new/patches.rpmify/spin_is_contended-fix 2009-07-27 03:04:42.000000000 +0200 @@ -55,7 +55,7 @@ default y --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -115,7 +115,7 @@ config GENERIC_IRQ_PROBE +@@ -111,7 +111,7 @@ config GENERIC_IRQ_PROBE config GENERIC_LOCKBREAK bool default y @@ -66,9 +66,9 @@ bool --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig -@@ -21,6 +21,11 @@ config RWSEM_XCHGADD_ALGORITHM - bool - default n +@@ -17,6 +17,11 @@ config RWSEM_GENERIC_SPINLOCK + config RWSEM_XCHGADD_ALGORITHM + def_bool n +config GENERIC_LOCKBREAK + bool @@ -76,11 +76,11 @@ + depends on SMP + config BLACKFIN - bool - default y + def_bool y + select HAVE_FUNCTION_GRAPH_TRACER --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig -@@ -61,7 +61,7 @@ config IOMMU_HELPER +@@ -62,7 +62,7 @@ config IOMMU_HELPER config GENERIC_LOCKBREAK bool default y @@ -113,7 +113,7 @@ def_bool y --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -75,7 +75,7 @@ config RWSEM_XCHGADD_ALGORITHM +@@ -78,7 +78,7 @@ config RWSEM_XCHGADD_ALGORITHM config GENERIC_LOCKBREAK bool default y @@ -135,7 +135,7 @@ bool --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig -@@ -45,6 +45,11 @@ config RWSEM_GENERIC_SPINLOCK +@@ -48,6 +48,11 @@ config RWSEM_GENERIC_SPINLOCK config RWSEM_XCHGADD_ALGORITHM bool @@ -147,7 +147,7 @@ config GENERIC_BUG def_bool y depends on BUG && SUPERH32 -@@ -84,7 +89,7 @@ config GENERIC_CLOCKEVENTS_BROADCAST +@@ -98,7 +103,7 @@ config GENERIC_CMOS_UPDATE config GENERIC_LOCKBREAK def_bool y @@ -158,7 +158,7 @@ bool --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig -@@ -301,7 +301,7 @@ config US3_MC +@@ -306,7 +306,7 @@ config US3_MC config GENERIC_LOCKBREAK bool default y ++++++ patches.suse.tar.bz2 ++++++ ++++ 7353 lines of diff (skipped) ++++++ patches.trace.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/ftrace-framepointer.diff new/patches.trace/ftrace-framepointer.diff --- old/patches.trace/ftrace-framepointer.diff 2009-06-10 16:12:26.000000000 +0200 +++ new/patches.trace/ftrace-framepointer.diff 2009-07-03 22:32:42.000000000 +0200 @@ -12,18 +12,18 @@ --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig -@@ -78,7 +78,6 @@ menu "Tracers" +@@ -111,7 +111,6 @@ if FTRACE config FUNCTION_TRACER bool "Kernel Function Tracer" depends on HAVE_FUNCTION_TRACER - select FRAME_POINTER select KALLSYMS - select TRACING + select GENERIC_TRACER select CONTEXT_SWITCH_TRACER -@@ -151,6 +150,7 @@ config SYSPROF_TRACER +@@ -186,6 +185,7 @@ config SYSPROF_TRACER bool "Sysprof Tracer" depends on X86 - select TRACING + select GENERIC_TRACER + select FRAME_POINTER select CONTEXT_SWITCH_TRACER help diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/utrace-core new/patches.trace/utrace-core --- old/patches.trace/utrace-core 2009-06-10 16:12:26.000000000 +0200 +++ new/patches.trace/utrace-core 2009-07-03 22:32:42.000000000 +0200 @@ -641,7 +641,7 @@ fdt = files_fdtable(p->files); --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1291,6 +1291,11 @@ struct task_struct { +@@ -1325,6 +1325,11 @@ struct task_struct { #endif seccomp_t seccomp; @@ -1593,7 +1593,7 @@ +#endif /* linux/utrace.h */ --- a/init/Kconfig +++ b/init/Kconfig -@@ -1165,6 +1165,16 @@ config STOP_MACHINE +@@ -1207,6 +1207,16 @@ config STOP_MACHINE help Need stop_machine() primitive. @@ -1612,14 +1612,14 @@ config PREEMPT_NOTIFIERS --- a/kernel/Makefile +++ b/kernel/Makefile -@@ -69,6 +69,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o +@@ -70,6 +70,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o obj-$(CONFIG_STOP_MACHINE) += stop_machine.o obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o +obj-$(CONFIG_UTRACE) += utrace.o - obj-$(CONFIG_AUDIT) += audit.o auditfilter.o + obj-$(CONFIG_AUDIT) += audit.o auditfilter.o audit_watch.o obj-$(CONFIG_AUDITSYSCALL) += auditsc.o - obj-$(CONFIG_AUDIT_TREE) += audit_tree.o + obj-$(CONFIG_GCOV_KERNEL) += gcov/ --- /dev/null +++ b/kernel/utrace.c @@ -0,0 +1,2495 @@ ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:27.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:27.000000000 +0200 @@ -27,7 +27,10 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## - patches.kernel.org/patch-2.6.30.2 + patches.kernel.org/patch-2.6.31-rc1 + patches.kernel.org/patch-2.6.31-rc1-rc2 + patches.kernel.org/patch-2.6.31-rc2-rc3 + patches.kernel.org/patch-2.6.31-rc3-rc4 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -44,6 +47,7 @@ patches.rpmify/spin_is_contended-fix patches.kernel.org/staging-pci-deps patches.rpmify/arm-arch_include_asm-fix.diff + patches.rpmify/sgi-hotplug-fixup ######################################################## # kABI consistency patches @@ -173,7 +177,6 @@ patches.arch/ppc-vmcoreinfo.diff patches.arch/ppc-select - patches.arch/ppc-pseries-bsr-4k.patch patches.arch/ppc-spufs-07-Don-t-spu_acquire_saved-unnecessarily.patch ######################################################## @@ -197,7 +200,6 @@ patches.fixes/oom-warning patches.suse/shmall-bigger patches.fixes/grab-swap-token-oops - patches.fixes/mm-madvise-fix.patch patches.suse/mm-do-not-disable-memory-hotplug-when-hibernation-is-enabled.patch patches.suse/osync-error @@ -206,8 +208,6 @@ patches.suse/reiser4-set_page_dirty_notag patches.suse/file-capabilities-disable-by-default.diff - patches.suse/mnt-want-write-speedup.patch - patches.suse/mnt_clone_write.patch patches.suse/unlock_page-speedup.patch ######################################################## @@ -236,26 +236,20 @@ +needs_update patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch patches.arch/acpi_thermal_passive_blacklist.patch - -+still_needed? patches.arch/thinkpad_fingers_off_backlight_igd.patch -+still_needed? patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch - patches.arch/acpi-export-hotplug_execute patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch -+still_needed? patches.suse/acpi_osi_sle11_ident.patch + + # Adjust this patch for every new product (at least Enterprise + # level) to provide OEMs a safety break so that they can add + # for example SLE11 specific BIOS updates (if there is no other + # way to safely solve an ACPI issue). ++trenn patches.suse/acpi_osi_sle11_ident.patch ######################################################## # CPUFREQ ######################################################## - # To be benchmarked (if time after late feature freeze): -+trenn patches.drivers/cpufreq_add_cpu_number_paramater_1.patch -+trenn patches.drivers/cpufreq_change_load_calculation_2.patch -+trenn patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch -+trenn patches.drivers/cpufreq_parameterize_down_differential_4.patch -+trenn patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch -+trenn patches.drivers/cpufreq_add_idle_microaccounting_6.patch ######################################################## # AGP, graphics related stuff @@ -290,7 +284,7 @@ # ext2/ext3 ######################################################## patches.suse/ext3-barrier-default - patches.suse/ext2-fsync-err +# patches.suse/ext2-fsync-err patches.fixes/ext3-mark-super-uptodate ######################################################## @@ -301,7 +295,6 @@ # Reiserfs Patches ######################################################## patches.suse/reiserfs-barrier-default - patches.fixes/reiserfs-expose-privroot ######################################################## # ocfs2 @@ -368,11 +361,9 @@ patches.drivers/libata-ata_piix-clear-spurious-IRQ # Block layer fixes - patches.fixes/sd-needs-updating patches.fixes/scsi-inquiry-too-short-ratelimit patches.suse/scsi-netlink-ml - patches.fixes/qla2xxx-disable-automatic-queue-tracking +needs_update patches.drivers/mpt-fusion-4.16.00.00-update patches.drivers/qla4xxx-sles11-update patches.drivers/qla4xxx-5.01.00-k8_sles11-03-update @@ -409,7 +400,6 @@ patches.fixes/tg3-fix-default-wol.patch patches.drivers/ehea-modinfo.patch patches.drivers/tg3_libphy_workaround - patches.drivers/r8169-allow-true-forced-mode-setting.patch ######################################################## # Wireless Networking @@ -453,11 +443,68 @@ ########################################################## # Sound ########################################################## - patches.drivers/alsa-ad1984a-hp-quirks + patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max + + patches.drivers/alsa-pcm-01-Fix-regressions-with-VMware + patches.drivers/alsa-pcm-02-Add-logging-of-hwptr-updates + patches.drivers/alsa-pcm-03-Fix-warnings-in-debug-loggings + patches.drivers/alsa-pcm-04-Fix-hwptr-buffer-size-overlap-bug + + patches.drivers/alsa-midi-01-always-log-message-on-output-overrun + patches.drivers/alsa-midi-02-do-not-send-MIDI-reset-when-closing + patches.drivers/alsa-midi-03-disable-active-sensing-on-close-by-def + patches.drivers/alsa-midi-04-oss-remove-magic-numbers + + patches.drivers/alsa-hda-01-Don-t-call-snd_hda_codec_configure + patches.drivers/alsa-hda-02-Add-patch-module-option + patches.drivers/alsa-hda-03-Check-beep-hint + patches.drivers/alsa-hda-04-Merge-patch_alc882-and-patch_alc883 + patches.drivers/alsa-hda-05-Fix-input-pinctl-for-ALC882-auto-mode + patches.drivers/alsa-hda-06-Allow-FLOAT-PCM-format + patches.drivers/alsa-hda-07-Add-missing-mixer-amp-initialization + patches.drivers/alsa-hda-08-Manually-expand-alc882_init_verbs + patches.drivers/alsa-hda-09-Don-t-override-maxbps-for-FLOAT + patches.drivers/alsa-hda-10-Add-quirks-for-RTL888-RV630-M76 + patches.drivers/alsa-hda-11-Fix-the-merge-error + patches.drivers/alsa-hda-12-Check-codec-errors-in-connections + patches.drivers/alsa-hda-13-Add-CX20582-and-OLPC-XO-1.5-support + patches.drivers/alsa-hda-14-Add-support-for-new-AMD-HD-audio-devices + patches.drivers/alsa-hda-15-add-bounds-checking-for-the-codec-cmds + patches.drivers/alsa-hda-16-Fix-the-previous-sanity-check + patches.drivers/alsa-hda-17-Fix-ALC268-parser-for-mono-speaker + patches.drivers/alsa-hda-18-Reduce-click-noise-at-power-saving + patches.drivers/alsa-hda-19-Fix-ALC861-auto-mode-parser + patches.drivers/alsa-hda-20-do-not-read-connections-for-widged + patches.drivers/alsa-hda-21-use-AC_WCAP_CONN_LIST + patches.drivers/alsa-hda-22-Use-snprintf-to-be-safer + patches.drivers/alsa-hda-23-Cleanups-for-widget-connection-list + patches.drivers/alsa-hda-24-Restore-GPIO1-properly-at-resume + patches.drivers/alsa-hda-25-Add-better-Intel-IbexPeak-platform-support + patches.drivers/alsa-hda-26-Fix-mute-control-with-some-ALC262-models + patches.drivers/alsa-hda-27-Introduce-get_wcaps_type-macro + patches.drivers/alsa-hda-28-Add-exception-for-volume-knob + patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555 + + patches.drivers/alsa-ctxfi-01-Native-timer-support-for-emu20k2 + patches.drivers/alsa-ctxfi-02-Fix-uninitialized-error-checks + patches.drivers/alsa-ctxfi-03-Simple-code-clean-up + + patches.drivers/alsa-ice-01-Patch-for-suspend-resume-for-Audiotrak + patches.drivers/alsa-ice-02-Fix-section-mismatch + + patches.drivers/alsa-usb-01-Use-the-new-TLV_DB_MINMAX-type + patches.drivers/alsa-usb-02-Correct-bogus-volume-dB-information + patches.drivers/alsa-usb-03-Xonar-U1-digital-output-support + patches.drivers/alsa-usb-04-use-multiple-input-URBs + patches.drivers/alsa-usb-05-use-multiple-output-URBs + patches.drivers/alsa-usb-06-add-MIDI-drain-callback + patches.drivers/alsa-usb-07-Volume-control-quirk-for-QuickCam-E-3 + patches.drivers/alsa-usb-08-add-support-for-Audio2DJ ######################################################## # Other driver fixes ######################################################## + patches.rpmify/rtl8192su-build-fix patches.fixes/ieee1394-sbp2_long_sysfs_ieee1394_id.patch patches.fixes/parport-mutex @@ -481,18 +528,12 @@ ######################################################## patches.suse/dm-emulate-blkrrpart-ioctl patches.suse/dm-raid45_2.6.27_20081027.patch - patches.suse/rq-based-multipath patches.fixes/dm-mpath-reattach-dh patches.suse/dm-mpath-leastpending-path-update +needs_update patches.suse/dm-mpath-accept-failed-paths +needs_update patches.suse/dm-mpath-requeue-for-stopped-queue - patches.suse/dm-mpath-check-info-before-access patches.suse/dm-mpath-null-pgs patches.fixes/dm-table-switch-to-readonly - patches.suse/dm-mpath-add-start-io - patches.suse/dm-mpath-queue-length-load-balancing - patches.suse/dm-mpath-tracking-nr-bytes - patches.suse/dm-mpath-service-time-load-balancing ######################################################## # md @@ -544,7 +585,6 @@ patches.suse/cgroup-disable-memory.patch +29 patches.suse/kdb-sysctl-context - patches.suse/panic-on-io-nmi.diff ######################################################## # Tracing ######################################################## @@ -593,18 +633,6 @@ patches.suse/uvcvideo-ignore-hue-control-for-5986-0241.patch # devtmpfs - patches.suse/driver-core-add-nodename-callbacks.patch - patches.suse/driver-core-misc-add-nodename-support-for-misc-devices.patch - patches.suse/driver-core-usb-add-nodename-support-for-usb-drivers.patch - patches.suse/driver-core-block-add-nodename-support-for-block-drivers.patch - patches.suse/driver-core-x86-add-nodename-for-cpuid-and-msr-drivers.patch - patches.suse/driver-core-dvb-add-nodename-for-dvb-drivers.patch - patches.suse/driver-core-input-add-nodename-for-input-drivers.patch - patches.suse/driver-core-sound-add-nodename-for-sound-drivers.patch - patches.suse/driver-core-raw-add-nodename-for-raw-devices.patch - patches.suse/driver-core-drm-add-nodename-for-drm-devices.patch - patches.suse/driver-core-aoe-add-nodename-for-aoe-devices.patch - patches.suse/driver-core-bsg-add-nodename-for-bsg-driver.patch patches.suse/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch ######################################################## @@ -624,100 +652,100 @@ # on top of them instead. This reduces workload when # re-basing to a newer xen tree. # - ### both uml framebuffer and xen need this one. - patches.xen/add-console-use-vt - - # split out patches - patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch - patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch - patches.xen/ipv6-no-autoconf - patches.xen/pci-guestdev - patches.xen/pci-reserve - patches.xen/sfc-driverlink - patches.xen/sfc-resource-driver - patches.xen/sfc-driverlink-conditional - patches.xen/sfc-external-sram - patches.xen/tmem - - # bulk stuff, new files for xen - patches.xen/xen3-auto-xen-arch.diff - patches.xen/xen3-auto-xen-drivers.diff - patches.xen/xen3-auto-include-xen-interface.diff - - # kconfig bits for xen - patches.xen/xen3-auto-xen-kconfig.diff - - # common code changes - patches.xen/xen3-auto-common.diff - patches.xen/xen3-auto-arch-x86.diff - patches.xen/xen3-auto-arch-i386.diff - patches.xen/xen3-auto-arch-x86_64.diff - - # fixups due to upstream Xen parts - patches.xen/xen3-fixup-xen - - patches.xen/sfc-sync-headers - patches.xen/sfc-endianness - - # newer changeset backports - - # changes outside arch/{i386,x86_64}/xen - patches.xen/xen3-fixup-kconfig - patches.xen/xen3-fixup-common - patches.xen/xen3-fixup-arch-x86 - - # ports of other patches - patches.xen/xen3-patch-2.6.18 - patches.xen/xen3-patch-2.6.19 - patches.xen/xen3-patch-2.6.20 - patches.xen/xen3-patch-2.6.21 - patches.xen/xen3-patch-2.6.22 - patches.xen/xen3-patch-2.6.23 - patches.xen/xen3-patch-2.6.24 - patches.xen/xen3-patch-2.6.25 - patches.xen/xen3-patch-2.6.26 - patches.xen/xen3-patch-2.6.27 - patches.xen/xen3-patch-2.6.28 - patches.xen/xen3-patch-2.6.29 - patches.xen/xen3-patch-2.6.30 - patches.xen/xen3-seccomp-disable-tsc-option -+needs_to_go_away patches.xen/xen3-x86-mark_rodata_rw.patch - patches.xen/xen3-driver-core-misc-add-nodename-support-for-misc-devices.patch - patches.xen/xen3-kdb-x86 - patches.xen/xen3-stack-unwind - patches.xen/xen3-panic-on-io-nmi.diff - patches.xen/xen3-x86_64-unwind-annotations - - # bugfixes and enhancements - patches.xen/xen-balloon-max-target - patches.xen/xen-modular-blktap - patches.xen/xen-blkback-bimodal-suse - patches.xen/xen-blkif-protocol-fallback-hack - patches.xen/xen-blkback-cdrom - patches.xen/xen-blktap-write-barriers - patches.xen/xen-scsifront-block-timeout-update - patches.xen/xen-op-packet - patches.xen/xen-blkfront-cdrom - patches.xen/xen-sections - patches.xen/xen-swiotlb-heuristics - patches.xen/xen-kconfig-compat - patches.xen/xen-cpufreq-report - patches.xen/xen-staging-build - patches.xen/xen-sysdev-suspend - patches.xen/xen-ipi-per-cpu-irq - patches.xen/xen-virq-per-cpu-irq - patches.xen/xen-configurable-guest-devices - patches.xen/xen-netback-nr-irqs - patches.xen/xen-netback-notify-multi - patches.xen/xen-x86-panic-no-reboot - patches.xen/xen-x86-dcr-fallback - patches.xen/xen-x86-consistent-nmi - patches.xen/xen-x86-no-lapic - patches.xen/xen-x86-pmd-handling - patches.xen/xen-x86-bigmem - patches.xen/xen-x86-machphys-prediction - patches.xen/xen-x86-exit-mmap - patches.xen/xen-x86_64-pgd-pin - patches.xen/xen-x86_64-pgd-alloc-order - patches.xen/xen-x86_64-dump-user-pgt - patches.xen/xen-x86_64-note-init-p2m ++xen_needs_updating ### both uml framebuffer and xen need this one. ++xen_needs_updating patches.xen/add-console-use-vt ++xen_needs_updating ++xen_needs_updating # split out patches ++xen_needs_updating patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch ++xen_needs_updating patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch ++xen_needs_updating patches.xen/ipv6-no-autoconf ++xen_needs_updating patches.xen/pci-guestdev ++xen_needs_updating patches.xen/pci-reserve ++xen_needs_updating patches.xen/sfc-driverlink ++xen_needs_updating patches.xen/sfc-resource-driver ++xen_needs_updating patches.xen/sfc-driverlink-conditional ++xen_needs_updating patches.xen/sfc-external-sram ++xen_needs_updating patches.xen/tmem ++xen_needs_updating ++xen_needs_updating # bulk stuff, new files for xen ++xen_needs_updating patches.xen/xen3-auto-xen-arch.diff ++xen_needs_updating patches.xen/xen3-auto-xen-drivers.diff ++xen_needs_updating patches.xen/xen3-auto-include-xen-interface.diff ++xen_needs_updating ++xen_needs_updating # kconfig bits for xen ++xen_needs_updating patches.xen/xen3-auto-xen-kconfig.diff ++xen_needs_updating ++xen_needs_updating # common code changes ++xen_needs_updating patches.xen/xen3-auto-common.diff ++xen_needs_updating patches.xen/xen3-auto-arch-x86.diff ++xen_needs_updating patches.xen/xen3-auto-arch-i386.diff ++xen_needs_updating patches.xen/xen3-auto-arch-x86_64.diff ++xen_needs_updating ++xen_needs_updating # fixups due to upstream Xen parts ++xen_needs_updating patches.xen/xen3-fixup-xen ++xen_needs_updating ++xen_needs_updating patches.xen/sfc-sync-headers ++xen_needs_updating patches.xen/sfc-endianness ++xen_needs_updating ++xen_needs_updating # newer changeset backports ++xen_needs_updating ++xen_needs_updating # changes outside arch/{i386,x86_64}/xen ++xen_needs_updating patches.xen/xen3-fixup-kconfig ++xen_needs_updating patches.xen/xen3-fixup-common ++xen_needs_updating patches.xen/xen3-fixup-arch-x86 ++xen_needs_updating ++xen_needs_updating # ports of other patches ++xen_needs_updating patches.xen/xen3-patch-2.6.18 ++xen_needs_updating patches.xen/xen3-patch-2.6.19 ++xen_needs_updating patches.xen/xen3-patch-2.6.20 ++xen_needs_updating patches.xen/xen3-patch-2.6.21 ++xen_needs_updating patches.xen/xen3-patch-2.6.22 ++xen_needs_updating patches.xen/xen3-patch-2.6.23 ++xen_needs_updating patches.xen/xen3-patch-2.6.24 ++xen_needs_updating patches.xen/xen3-patch-2.6.25 ++xen_needs_updating patches.xen/xen3-patch-2.6.26 ++xen_needs_updating patches.xen/xen3-patch-2.6.27 ++xen_needs_updating patches.xen/xen3-patch-2.6.28 ++xen_needs_updating patches.xen/xen3-patch-2.6.29 ++xen_needs_updating patches.xen/xen3-patch-2.6.30 ++xen_needs_updating patches.xen/xen3-seccomp-disable-tsc-option ++xen_needs_updating+needs_to_go_away patches.xen/xen3-x86-mark_rodata_rw.patch ++xen_needs_updating patches.xen/xen3-driver-core-misc-add-nodename-support-for-misc-devices.patch ++xen_needs_updating patches.xen/xen3-kdb-x86 ++xen_needs_updating patches.xen/xen3-stack-unwind ++xen_needs_updating patches.xen/xen3-panic-on-io-nmi.diff ++xen_needs_updating patches.xen/xen3-x86_64-unwind-annotations ++xen_needs_updating ++xen_needs_updating # bugfixes and enhancements ++xen_needs_updating patches.xen/xen-balloon-max-target ++xen_needs_updating patches.xen/xen-modular-blktap ++xen_needs_updating patches.xen/xen-blkback-bimodal-suse ++xen_needs_updating patches.xen/xen-blkif-protocol-fallback-hack ++xen_needs_updating patches.xen/xen-blkback-cdrom ++xen_needs_updating patches.xen/xen-blktap-write-barriers ++xen_needs_updating patches.xen/xen-scsifront-block-timeout-update ++xen_needs_updating patches.xen/xen-op-packet ++xen_needs_updating patches.xen/xen-blkfront-cdrom ++xen_needs_updating patches.xen/xen-sections ++xen_needs_updating patches.xen/xen-swiotlb-heuristics ++xen_needs_updating patches.xen/xen-kconfig-compat ++xen_needs_updating patches.xen/xen-cpufreq-report ++xen_needs_updating patches.xen/xen-staging-build ++xen_needs_updating patches.xen/xen-sysdev-suspend ++xen_needs_updating patches.xen/xen-ipi-per-cpu-irq ++xen_needs_updating patches.xen/xen-virq-per-cpu-irq ++xen_needs_updating patches.xen/xen-configurable-guest-devices ++xen_needs_updating patches.xen/xen-netback-nr-irqs ++xen_needs_updating patches.xen/xen-netback-notify-multi ++xen_needs_updating patches.xen/xen-x86-panic-no-reboot ++xen_needs_updating patches.xen/xen-x86-dcr-fallback ++xen_needs_updating patches.xen/xen-x86-consistent-nmi ++xen_needs_updating patches.xen/xen-x86-no-lapic ++xen_needs_updating patches.xen/xen-x86-pmd-handling ++xen_needs_updating patches.xen/xen-x86-bigmem ++xen_needs_updating patches.xen/xen-x86-machphys-prediction ++xen_needs_updating patches.xen/xen-x86-exit-mmap ++xen_needs_updating patches.xen/xen-x86_64-pgd-pin ++xen_needs_updating patches.xen/xen-x86_64-pgd-alloc-order ++xen_needs_updating patches.xen/xen-x86_64-dump-user-pgt ++xen_needs_updating patches.xen/xen-x86_64-note-init-p2m ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:27.000000000 +0200 +++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:27.000000000 +0200 @@ -1,3 +1,3 @@ -2009-07-20 20:31:16 +0200 -GIT Revision: f92072d365019df63887941412a8ba5893839135 +2009-07-29 16:01:26 +0200 +GIT Revision: ddfe58aede98cf3f017c0e8eefbb5189e835d82c GIT Branch: master ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

Jump to page: