May 2009 - openSUSE Commits - openSUSE Mailing Lists

commit audacity for openSUSE:Factory
by root＠Hilbert.suse.de 20 May '09

20 May '09

Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at Wed May 20 12:30:39 CEST 2009. -------- --- audacity/audacity.changes 2009-05-11 23:10:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/audacity/audacity.changes 2009-05-19 18:30:02.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 19 16:18:43 CEST 2009 - cmorve69(a)yahoo.es + +- Add alsa-devel BR to allow ALSA output + +------------------------------------------------------------------- @@ -6,0 +12 @@ +- do not force -fno-strict-aliasing since upstream already does calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.u10598/_old 2009-05-20 12:30:14.000000000 +0200 +++ /var/tmp/diff_new_pack.u10598/_new 2009-05-20 12:30:14.000000000 +0200 @@ -25,6 +25,8 @@ BuildRequires: libid3tag-devel libsamplerate-devel libsndfile-devel BuildRequires: libvorbis-devel soundtouch-devel update-desktop-files BuildRequires: wxGTK-devel +# Only needed because of internal PortAudio, why aren't we using the system version? +BuildRequires: alsa-devel %if %{with ffmpeg} BuildRequires: libffmpeg-devel %endif @@ -36,7 +38,7 @@ %endif Summary: A Free, Cross-Platform Digital Audio Editor Version: 1.3.7 -Release: 3 +Release: 4 License: GPL v2 or later Group: Productivity/Multimedia/Sound/Editors and Convertors BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -141,10 +143,13 @@ %{_datadir}/mime/packages/audacity.xml %changelog +* Tue May 19 2009 cmorve69(a)yahoo.es +- Add alsa-devel BR to allow ALSA output * Mon May 11 2009 cmorve69(a)yahoo.es - removed unneeded BuildRequires - make ffmpeg, mad and twolame support build options - use upstream .desktop file +- do not force -fno-strict-aliasing since upstream already does * Wed Apr 08 2009 mseben(a)suse.cz - added wxGTK_with_stl.patch to fix build issues when linking wxGTK configured with --enable-stl flag ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 systemtap for openSUSE:Factory
by root＠Hilbert.suse.de 20 May '09

20 May '09

Hello community, here is the log from the commit of package systemtap for openSUSE:Factory checked in at Wed May 20 12:02:58 CEST 2009. -------- --- systemtap/systemtap.changes 2009-05-08 16:44:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/systemtap/systemtap.changes 2009-05-15 11:47:08.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 15 11:46:11 CEST 2009 - tiwai(a)suse.de + +- split to several subpackages, systemtap-runtime, -client, -server + and -sdt-devel (bnc#503088). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemtap.spec ++++++ --- /var/tmp/diff_new_pack.VR3115/_old 2009-05-20 12:02:45.000000000 +0200 +++ /var/tmp/diff_new_pack.VR3115/_new 2009-05-20 12:02:45.000000000 +0200 @@ -30,7 +30,7 @@ %define use_snapshot 0 License: GPL v2 or later Version: 0.9.7 -Release: 1 +Release: 2 Summary: Instrumentation System Group: Development/Tools/Debuggers Url: http://sourceware.org/systemtap/ @@ -46,6 +46,7 @@ Patch2: systemtap-ioblock-suse-kernel-fix.diff Patch3: systemtap-xmlto-fop.diff Requires: libebl1 +Requires: %{name}-runtime = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -62,6 +63,81 @@ Martin Hunt <hunt(a)redhat.com> Tom Zanussi <zanussi(a)us.ibm.com> +%package runtime +License: GPL v2 or later +Group: Development/Tools/Debuggers +Summary: Runtime environment for systemtap + +%description runtime +SystemTap is an instrumentation system for systems running Linux 2.6. +This package contains the runtime environment for systemtap programs. + + + +Authors: +-------- + Frank Ch. Eigler <fche(a)redhat.com> + Graydon Hoare <graydon(a)redhat.com> + Martin Hunt <hunt(a)redhat.com> + Tom Zanussi <zanussi(a)us.ibm.com> + +%package client +License: GPL v2 or later +Group: Development/Tools/Debuggers +Summary: Systemtap client +Requires: %{name}-runtime = %{version}-%{release} + +%description client +SystemTap is an instrumentation system for systems running Linux 2.6. +This package contains the client component for systemtap. + + + +Authors: +-------- + Frank Ch. Eigler <fche(a)redhat.com> + Graydon Hoare <graydon(a)redhat.com> + Martin Hunt <hunt(a)redhat.com> + Tom Zanussi <zanussi(a)us.ibm.com> + +%package server +License: GPL v2 or later +Group: Development/Tools/Debuggers +Summary: Systemtap server +Requires: %{name} = %{version}-%{release} + +%description server +SystemTap is an instrumentation system for systems running Linux 2.6. +This package contains the server component of systemtap. + + + +Authors: +-------- + Frank Ch. Eigler <fche(a)redhat.com> + Graydon Hoare <graydon(a)redhat.com> + Martin Hunt <hunt(a)redhat.com> + Tom Zanussi <zanussi(a)us.ibm.com> + +%package sdt-devel +License: GPL v2 or later +Group: Development/Tools/Debuggers +Summary: Static probe support tools +Requires: %{name} = %{version}-%{release} + +%description sdt-devel +SystemTap is an instrumentation system for systems running Linux 2.6. +This package contains the support tools for static probes. + + + +Authors: +-------- + Frank Ch. Eigler <fche(a)redhat.com> + Graydon Hoare <graydon(a)redhat.com> + Martin Hunt <hunt(a)redhat.com> + Tom Zanussi <zanussi(a)us.ibm.com> + %prep %if %use_snapshot %setup -n src -q @@ -87,7 +163,6 @@ %makeinstall mkdir -p $RPM_BUILD_ROOT/var/cache/systemtap cp README AUTHORS NEWS COPYING $RPM_BUILD_ROOT%{_docdir}/systemtap/ -rm -rf $RPM_BUILD_ROOT%{_includedir}/sys/* %clean rm -rf ${RPM_BUILD_ROOT} @@ -95,13 +170,46 @@ %files %defattr(-,root,root) %doc %{_docdir}/systemtap -%{_bindir}/* -%{_mandir}/man?/* -%{_libdir}/systemtap +%{_bindir}/stap +%{_mandir}/man1/* +%{_mandir}/man3/* %{_datadir}/systemtap %dir %attr(0755,root,root) /var/cache/systemtap +%files runtime +%defattr(-,root,root) +%{_bindir}/staprun +%{_bindir}/stap-report +%{_libdir}/systemtap +%{_mandir}/man8/staprun.* + +%files client +%defattr(-,root,root) +%{_bindir}/stap-client +%{_bindir}/stap-find-servers +%{_bindir}/stap-find-or-start-server +%{_bindir}/stap-add-server-cert +%{_bindir}/stap-client-connect + +%files server +%defattr(-,root,root) +%{_bindir}/stap-server +%{_bindir}/stap-serverd +%{_bindir}/stap-start-server +%{_bindir}/stap-stop-server +%{_bindir}/stap-gen-server-cert +%{_bindir}/stap-server-connect +%{_mandir}/man8/stap-server.* + +%files sdt-devel +%defattr(-,root,root) +%{_bindir}/dtrace +%{_includedir}/sys/*.h + %changelog +* Fri May 15 2009 tiwai(a)suse.de +- split to several subpackages, systemtap-runtime, -client, -server + and -sdt-devel (bnc#503088). * Fri May 08 2009 tiwai(a)suse.de - updated to released version 0.9.7: * Lots of fixes, improvements, see NEWS file for details ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bootchart for openSUSE:Factory
by root＠Hilbert.suse.de 20 May '09

20 May '09

Hello community, here is the log from the commit of package bootchart for openSUSE:Factory checked in at Wed May 20 12:02:33 CEST 2009. -------- --- bootchart/bootchart.changes 2009-04-30 15:58:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/bootchart/bootchart.changes 2009-05-19 15:37:47.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 19 15:32:06 CEST 2009 - coolo(a)suse.de + +- don't use java but python (removes noarch) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bootchart-java14.diff commons-cli-1.0.jar New: ---- pybootchartgui-r124.diff pybootchartgui-r124.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bootchart.spec ++++++ --- /var/tmp/diff_new_pack.bP2175/_old 2009-05-20 12:02:21.000000000 +0200 +++ /var/tmp/diff_new_pack.bP2175/_new 2009-05-20 12:02:21.000000000 +0200 @@ -19,23 +19,22 @@ Name: bootchart -BuildRequires: ant java2-devel-packages sysstat xml-commons-apis +BuildRequires: fdupes python-devel sysstat Url: http://www.bootchart.org License: GPL v2 or later Group: Development/Tools/Other Summary: Boot Process Charting Application Version: 0.9 -Release: 293 +Release: 294 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%{version}.tar.bz2 -Source1: commons-cli-1.0.jar Source2: mkinitrd-boot.sh Source3: mkinitrd-setup.sh Source4: README.SUSE +Source5: pybootchartgui-r124.tar.bz2 +Patch0: pybootchartgui-r124.diff Patch1: %name-%version.diff -Patch2: bootchart-java14.diff -Requires: acct jpackage-utils -BuildArch: noarch +Requires: acct python-cairo python-gtk Requires(post): mkinitrd %description @@ -49,25 +48,31 @@ Ziga Mahkovec <ziga.mahkovec(a)klika.si> %prep -%setup -q +%setup -q -a 5 +%patch0 %patch1 -p1 -%patch2 %build -ant jar %install mkdir -p $RPM_BUILD_ROOT/lib/bootchart/mnt install -m 755 -D script/bootchartd $RPM_BUILD_ROOT/sbin/bootchartd install -m 644 -D script/bootchartd.conf $RPM_BUILD_ROOT/etc/bootchartd.conf -install -m 755 -D script/bootchart $RPM_BUILD_ROOT/usr/bin/bootchart -install -m 644 -D bootchart.jar $RPM_BUILD_ROOT/usr/share/java/bootchart.jar +#install -m 755 -D script/bootchart $RPM_BUILD_ROOT/usr/bin/bootchart install -d $RPM_BUILD_ROOT/usr/share/bootchart -install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/java/bootchart-commons-cli.jar install -m 755 -D %SOURCE2 $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-bootchart.sh install -m 755 -D %SOURCE3 $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-bootchart.sh cp -a svg $RPM_BUILD_ROOT/usr/share/bootchart cp %SOURCE4 . +cd pybootchartgui-r*/ +install -d $RPM_BUILD_ROOT%py_sitedir/pybootchartgui +cp pybootchartgui/*.py $RPM_BUILD_ROOT%py_sitedir/pybootchartgui +install -D -m 755 pybootchartgui.py $RPM_BUILD_ROOT%_bindir/pybootchartgui +pushd $RPM_BUILD_ROOT%py_sitedir/pybootchartgui +python %py_libdir/py_compile.py *.py +PYTHONOPTIMIZE=1 python %py_libdir/py_compile.py *.py +popd +%fdupes %post [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup @@ -89,11 +94,13 @@ /sbin/* /usr/bin/* %config(noreplace) /etc/bootchartd.conf -/usr/share/java/*.jar /usr/share/bootchart /lib/mkinitrd +%py_sitedir/pybootchartgui %changelog +* Tue May 19 2009 coolo(a)suse.de +- don't use java but python (removes noarch) * Thu Apr 30 2009 coolo(a)suse.de - remove mingetty from the list of processes to check for, it's just not our target ++++++ bootchart-0.9.diff ++++++ --- /var/tmp/diff_new_pack.bP2175/_old 2009-05-20 12:02:21.000000000 +0200 +++ /var/tmp/diff_new_pack.bP2175/_new 2009-05-20 12:02:21.000000000 +0200 @@ -105,9 +105,10 @@ # Render the chart if configured (and the renderer is installed) - [ "$AUTO_RENDER" = "yes" -a -x /usr/bin/bootchart ] && \ -+ if [ "$AUTO_RENDER" = "yes" -a -x /usr/bin/bootchart ]; then +- /usr/bin/bootchart -o "$AUTO_RENDER_DIR" -f $AUTO_RENDER_FORMAT "$BOOTLOG_DEST" ++ if [ "$AUTO_RENDER" = "yes" -a -x /usr/bin/pybootchartgui ]; then + cd $AUTO_RENDER_DIR - /usr/bin/bootchart -o "$AUTO_RENDER_DIR" -f $AUTO_RENDER_FORMAT "$BOOTLOG_DEST" ++ /usr/bin/pybootchartgui -o "$AUTO_RENDER_DIR"/bootchart.$AUTO_RENDER_FORMAT -f $AUTO_RENDER_FORMAT "$BOOTLOG_DEST" + fi } ++++++ pybootchartgui-r124.diff ++++++ diff -ru pybootchartgui-r124.orig/pybootchartgui/draw.py pybootchartgui-r124/pybootchartgui/draw.py --- pybootchartgui-r124.orig/pybootchartgui/draw.py 2009-04-14 22:42:11.000000000 +0200 +++ pybootchartgui-r124/pybootchartgui/draw.py 2009-05-19 15:32:54.000000000 +0200 @@ -164,7 +164,8 @@ return x, y xscale = float(chart_bounds[2]) / max(x for (x,y) in data) - yscale = float(chart_bounds[3]) / max(y for (x,y) in data) + maxy = max(1, max(y for (x,y) in data)) + yscale = float(chart_bounds[3]) / maxy first = transform_point_coords(data[0], x_shift, 0, xscale, yscale, chart_bounds[0], chart_bounds[1]) last = transform_point_coords(data[-1], x_shift, 0, xscale, yscale, chart_bounds[0], chart_bounds[1]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit konversation for openSUSE:Factory
by root＠Hilbert.suse.de 20 May '09

20 May '09

Hello community, here is the log from the commit of package konversation for openSUSE:Factory checked in at Wed May 20 11:05:05 CEST 2009. -------- --- KDE/konversation/konversation.changes 2009-05-13 09:25:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/konversation/konversation.changes 2009-05-20 09:07:08.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 20 08:47:47 CEST 2009 - beineri(a)opensuse.org + +- update to 1.2 Alpha 1 release, see ChangeLog for a summary of + bugfixes and new features which happened during KDE4 port cycle + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- konvi-kde4.tar.bz2 New: ---- konversation-1.2-alpha1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konversation.spec ++++++ --- /var/tmp/diff_new_pack.T14877/_old 2009-05-20 11:04:48.000000000 +0200 +++ /var/tmp/diff_new_pack.T14877/_new 2009-05-20 11:04:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package konversation (Version 1.1.77.svn967285) +# spec file for package konversation (Version 1.2alpha1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,10 +24,10 @@ License: GPL v2 or later Group: Productivity/Networking/IRC Summary: A User-Friendly IRC Client for KDE -Version: 1.1.77.svn967285 +Version: 1.2alpha1 Release: 1 -# svn.kde.org/home/kde/branches/work/konvi-kde4 -Source0: konvi-kde4.tar.bz2 +%define rversion 1.2-alpha1 +Source0: konversation-%rversion.tar.bz2 Patch: fixbuild.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_akonadi_requires @@ -36,6 +36,7 @@ Provides: kde4-konversation = 1.1.76 Obsoletes: kde4-konversation <= 1.1.76 %endif +Requires: %{name}-lang = %{version} %description Konversation is a user-friendly IRC client for KDE @@ -56,8 +57,9 @@ İsmail D�nmez <ismail(a)kde.org.tr> Eike Hein <sho(a)eikehein.com> +%lang_package %prep -%setup -q -n konvi-kde4 +%setup -q -n konversation-%rversion %patch %build @@ -69,6 +71,7 @@ %makeinstall popd %suse_update_desktop_file konversation IRCClient + %find_lang konversation %post -p /sbin/ldconfig @@ -77,9 +80,10 @@ %clean rm -rf $RPM_BUILD_ROOT +%files lang -f konversation.lang + %files %defattr(-,root,root) -%doc %lang(en) /usr/share/doc/kde/HTML/en/konversation /usr/bin/konversation /usr/share/applications/kde4/konversation.desktop /usr/share/kde4/apps/konversation @@ -93,6 +97,9 @@ /usr/share/kde4/apps/kconf_update/* %changelog +* Wed May 20 2009 beineri(a)opensuse.org +- update to 1.2 Alpha 1 release, see ChangeLog for a summary of + bugfixes and new features which happened during KDE4 port cycle * Wed May 13 2009 beineri(a)opensuse.org - update to r967285 * Sat May 02 2009 beineri(a)opensuse.org ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdelibs4-experimental for openSUSE:Factory
by root＠Hilbert.suse.de 20 May '09

20 May '09

Hello community, here is the log from the commit of package kdelibs4-experimental for openSUSE:Factory checked in at Wed May 20 11:02:11 CEST 2009. -------- --- KDE/kdelibs4-experimental/kdelibs4-experimental.changes 2009-05-18 12:57:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdelibs4-experimental/kdelibs4-experimental.changes 2009-05-20 09:13:04.000000000 +0200 @@ -1,0 +2,10 @@ +Wed May 20 09:12:04 CEST 2009 - dmueller(a)suse.de + +- fix debug package requires + +------------------------------------------------------------------- +Mon May 18 16:34:29 CEST 2009 - coolo(a)novell.com + +- update 4_3_BRANCH to get correct license + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-experimental.spec ++++++ --- /var/tmp/diff_new_pack.Q11640/_old 2009-05-20 11:02:03.000000000 +0200 +++ /var/tmp/diff_new_pack.Q11640/_new 2009-05-20 11:02:03.000000000 +0200 @@ -16,6 +16,7 @@ # +%define debug_package_requires libknotificationitem-1 = %version-%release Name: kdelibs4-experimental BuildRequires: libkde4-devel @@ -24,7 +25,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 4.2.85 -Release: 2 +Release: 3 Source0: kdelibs-experimental-%version.tar.bz2 Patch0: 4_3_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -111,6 +112,10 @@ /usr/share/kde4/apps/cmake/modules/FindLibKNotificationItem-1.cmake %changelog +* Wed May 20 2009 dmueller(a)suse.de +- fix debug package requires +* Mon May 18 2009 coolo(a)novell.com +- update 4_3_BRANCH to get correct license * Mon May 18 2009 coolo(a)novell.com - fix baselibs.conf * Thu May 07 2009 dmueller(a)suse.de ++++++ 4_3_BRANCH.diff ++++++ ++++ 1355 lines (skipped) ++++ between KDE/kdelibs4-experimental/4_3_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdelibs4-experimental/4_3_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kde4-plasma-addons for openSUSE:Factory
by root＠Hilbert.suse.de 20 May '09

20 May '09

Hello community, here is the log from the commit of package kde4-plasma-addons for openSUSE:Factory checked in at Wed May 20 11:01:51 CEST 2009. -------- --- KDE/kde4-plasma-addons/kde4-plasma-addons.changes 2009-05-02 08:08:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/kde4-plasma-addons/kde4-plasma-addons.changes 2009-05-17 13:23:20.000000000 +0200 @@ -1,0 +2,15 @@ +Sun May 17 13:22:36 CEST 2009 - beineri(a)opensuse.org + +- created kde4-plasma-addons-marble subpackage for wallpaper plugin + +------------------------------------------------------------------- +Thu May 14 19:31:22 CEST 2009 - dmueller(a)suse.de + +- update to 4.2.85 (KDE 4.3 Beta1) + +------------------------------------------------------------------- +Tue May 12 18:56:55 CEST 2009 - llunak(a)suse.cz + +- eigen2 build dependency, to enable mandelbrot wallpaper + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 4_2_BRANCH.diff kdeplasma-addons-4.2.3.tar.bz2 panelspacer.tar.bz2 weather.tar.bz2 New: ---- 4_3_BRANCH.diff kdeplasma-addons-4.2.85.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-plasma-addons.spec ++++++ --- /var/tmp/diff_new_pack.Hj9649/_old 2009-05-20 11:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Hj9649/_new 2009-05-20 11:01:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kde4-plasma-addons (Version 4.2.3) +# spec file for package kde4-plasma-addons (Version 4.2.85) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,6 +21,7 @@ Name: kde4-plasma-addons BuildRequires: kdebase4-workspace-devel libkexiv2-devel libqimageblitz-devel BuildRequires: libQtWebKit-devel libkdepimlibs4-devel python-qt4 +BuildRequires: kde4-kopete kde4-marble-devel libeigen2-devel %if %suse_version > 1020 BuildRequires: fdupes %endif @@ -28,13 +29,11 @@ Group: System/GUI/KDE Summary: Additional Plasmoids Url: http://www.kde.org/ -Version: 4.2.3 +Version: 4.2.85 Release: 1 Source0: kdeplasma-addons-%{version}.tar.bz2 Source1: kbstateapplet.tar.bz2 -Source2: panelspacer.tar.bz2 -Source3: weather.tar.bz2 -Patch0: 4_2_BRANCH.diff +Patch0: 4_3_BRANCH.diff Patch1: applets.diff Provides: extragear-plasma = 4.0.80 Obsoletes: extragear-plasma <= 4.0.80 @@ -43,6 +42,7 @@ Provides: kdeplasmoids4 = 4.0.85 Obsoletes: kdeplasmoids4 <= 4.0.85 BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: kde4-plasma-addons-marble %kde4_runtime_requires %description @@ -54,15 +54,42 @@ -------- The KDE Team +%package devel +License: GPL v2 or later +Group: System/GUI/KDE +Summary: Additional Plasmoids (Development) +Requires: kde4-plasma-addons = %version + +%description devel +Development files of Plasmoids + + + +Authors: +-------- + The KDE Team + +%package marble +License: GPL v2 or later +Group: System/GUI/KDE +Summary: Additional Plasmoids Depending on Marble + +%description marble +Additional plasmoids from upstream that require Marble + + + +Authors: +-------- + The KDE Team + %prep %setup -q -n kdeplasma-addons-%{version} pushd applets -tar xvfj %SOURCE1 -tar xvfj %SOURCE2 -tar xvfj %SOURCE3 +#tar xvfj %SOURCE1 popd %patch -%patch1 +#%patch1 %build %cmake_kde4 -d build @@ -81,9 +108,32 @@ %postun -p /sbin/ldconfig +%post marble -p /sbin/ldconfig + +%postun marble -p /sbin/ldconfig + %clean rm -rf $RPM_BUILD_ROOT +%files devel +%defattr(-,root,root) +/usr/include/lancelot +%_libdir/liblancelot.so +/usr/include/conversion +%_libdir/libconversion.so +%_libdir/libplasmaweather.so +%_libdir/libplasmacomicprovidercore.so +%_kde_share_dir/apps/cmake/modules/FindConversion.cmake +/usr/%_lib/libplasmapotdprovidercore.so +/usr/%_lib/librtm.so +/usr/%_lib/libocsclient.so + +%files marble +%defattr(-,root,root) +%doc COPYING +%_kde4_modules/plasma_wallpaper_marble.so +%_kde_share_dir/services/plasma-wallpaper-marble.desktop + %files %defattr(-,root,root) %doc COPYING @@ -95,40 +145,52 @@ %_kde4_modules/krunner_konquerorsessions.so %_kde4_modules/krunner_konsolesessions.so %_kde4_modules/krunner_spellcheckrunner.so +%exclude %_kde4_modules/plasma_wallpaper_marble.so %_kde4_modules/plasma_* %_kde_config_dir/comic.knsrc +%_kde_config_dir/virus_wallpaper.knsrc %_kde_share_dir/apps/bball %_kde_share_dir/apps/desktoptheme/* %_kde_share_dir/apps/plasma/services/tweet.operations %_kde_share_dir/apps/rssnow -%_kde_share_dir/apps/kbstateapplet +%exclude %_kde_share_dir/services/plasma-wallpaper-marble.desktop %_kde_share_dir/services/* %_kde_share_dir/servicetypes/plasma_comicprovider.desktop -%_libdir/libplasmacomicprovidercore.so %_libdir/libplasmacomicprovidercore.so.* -%_libdir/libplasmaconverter.so -%_libdir/libplasmaconverter.so.4 -%_libdir/libplasmaconverter.so.4.2.0 -/usr/share/icons/hicolor/128x128/apps/previewer.png -/usr/share/icons/hicolor/16x16/apps/previewer.png -/usr/share/icons/hicolor/22x22/apps/previewer.png -/usr/share/icons/hicolor/32x32/apps/previewer.png -/usr/share/icons/hicolor/48x48/apps/previewer.png -/usr/share/icons/hicolor/64x64/apps/previewer.png +/usr/share/icons/hicolor/*/apps/previewer.* /usr/share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz /usr/share/icons/oxygen/scalable/apps/bball.svgz +/usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz /usr/bin/lancelot -/usr/include/lancelot -/usr/%_lib/liblancelot.so -/usr/%_lib/liblancelot.so.* +%_libdir/liblancelot.so.* /usr/share/dbus-1/services/org.kde.lancelot.service /usr/share/icons/hicolor/*/apps/lancelot-part.* /usr/share/icons/hicolor/*/apps/lancelot.* /usr/share/mime/packages/lancelotpart-mime.xml -/usr/share/kde4/apps/plasma-bluemarble +%_kde_share_dir/apps/plasma-bluemarble %_kde_share_dir/apps/desktoptheme/Aya +%_libdir/libconversion.so.* +%_libdir/libplasmaweather.so.* +%_kde4_modules/plasma-applet_systemloadviewer.so +%_kde_share_dir/apps/lancelot +%_kde_share_dir/apps/plasma_wallpaper_pattern +%_kde_share_dir/apps/plasma_pastebin +/usr/%_lib/libocsclient.so.* +/usr/%_lib/libplasmapotdprovidercore.so.* +/usr/%_lib/librtm.so.* +/usr/share/kde4/apps/plasma-applet-opendesktop +/usr/share/kde4/apps/plasma/services/rtmauth.operations +/usr/share/kde4/apps/plasma/services/rtmtask.operations +/usr/share/kde4/apps/plasma/services/rtmtasks.operations +/usr/share/kde4/servicetypes/plasma_potdprovider.desktop %changelog +* Sun May 17 2009 beineri(a)opensuse.org +- created kde4-plasma-addons-marble subpackage for wallpaper plugin +* Thu May 14 2009 dmueller(a)suse.de +- update to 4.2.85 (KDE 4.3 Beta1) +* Tue May 12 2009 llunak(a)suse.cz +- eigen2 build dependency, to enable mandelbrot wallpaper * Sat May 02 2009 beineri(a)opensuse.org - - update to 4.2.3 * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php ++++++ 4_2_BRANCH.diff -> 4_3_BRANCH.diff ++++++ ++++ 4670 lines (skipped) ++++ between KDE/kde4-plasma-addons/4_2_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kde4-plasma-addons/4_3_BRANCH.diff ++++++ applets.diff ++++++ --- /var/tmp/diff_new_pack.Hj9649/_old 2009-05-20 11:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Hj9649/_new 2009-05-20 11:01:36.000000000 +0200 @@ -1,9 +1,7 @@ --- applets/CMakeLists.txt 2009/02/03 14:52:59 1.1 +++ applets/CMakeLists.txt 2009/02/03 14:53:12 -@@ -49,3 +49,6 @@ +@@ -49,3 +49,4 @@ add_subdirectory(paste) endif(NOT WIN32) -+add_subdirectory(panelspacer) +add_subdirectory(kbstateapplet) -+add_subdirectory(weather) ++++++ kdeplasma-addons-4.2.3.tar.bz2 -> kdeplasma-addons-4.2.85.tar.bz2 ++++++ ++++ 77249 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 kernel-source for openSUSE:Factory
by root＠Hilbert.suse.de 20 May '09

20 May '09

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Wed May 20 10:59:17 CEST 2009. -------- --- kernel-source/kernel-debug.changes 2009-03-24 17:53:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2009-05-19 18:06:39.000000000 +0200 @@ -1,0 +2,591 @@ +Tue May 19 18:03:44 CEST 2009 - jeffm(a)suse.com + +- Set CONFIG_FRAMEBUFFER_CONSOLE=y + +------------------------------------------------------------------- +Tue May 19 17:27:45 CEST 2009 - jeffm(a)suse.com + +- Restored CONFIG_BOOTSPLASH=y and CONFIG_FB_VESA=y on + x86/x86_64 (bnc#504608) + +------------------------------------------------------------------- +Tue May 19 16:17:34 CEST 2009 - jbeulich(a)novell.com + +- patches.xen/sfc-endianness: fix building with gcc 4.4. + +------------------------------------------------------------------- +Tue May 19 12:04:26 CEST 2009 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.30/rc6-git3 and c/s 873. + +------------------------------------------------------------------- +Mon May 18 16:52:37 CEST 2009 - jeffm(a)suse.com + +- Updated to 2.6.30-rc6-git3. + - Eliminated 4 patches. + +------------------------------------------------------------------- +Fri May 15 19:16:23 CEST 2009 - jeffm(a)suse.de + +- doc/README.SUSE: Updated to reflect building in an external + directory so as not to contaminate /usr/src/linux + +------------------------------------------------------------------- +Thu May 14 14:09:10 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: fix path in + /usr/src/linux-obj/.../Makefile. + +------------------------------------------------------------------- +Thu May 14 11:09:01 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: provide kernel-$flavor-devel = + %version-%source_rel in the -devel packages (bnc#503280). + +------------------------------------------------------------------- +Wed May 13 15:42:49 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: also fix kernel-$flavor-devel requires + (bnc#503280). + +------------------------------------------------------------------- +Wed May 13 15:32:58 CEST 2009 - mmarek(a)suse.cz + +- rpm/mkspec: fix kernel-syms requires (bnc#503280). + +------------------------------------------------------------------- +Mon May 11 21:11:59 CEST 2009 - jeffm(a)suse.com + +- patches.fixes/dup2-retval-fix: dup2: Fix return value with + oldfd == newfd and invalid fd (bnc#498042). + +------------------------------------------------------------------- +Mon May 11 21:11:19 CEST 2009 - jeffm(a)suse.com + +- patches.fixes/reiserfs-xattr-fixup: reiserfs: clean up ifdefs. +- patches.fixes/reiserfs-xattr-root-fixup: reiserfs: deal with + NULL xattr root w/ xattrs disabled. +- patches.fixes/reiserfs-xattrs-disabled-perms: reiserfs: fixup + perms when xattrs are disabled. +- patches.fixes/reiserfs-expose-privroot: reiserfs: allow exposing + privroot w/ xattrs enabled. + +------------------------------------------------------------------- +Mon May 11 19:41:25 CEST 2009 - jeffm(a)suse.de + +- Updated to 2.6.30-rc5-git1. + - Eliminated 4 patches. + +------------------------------------------------------------------- +Wed May 6 17:38:57 CEST 2009 - gregkh(a)suse.de + +- Update config files. update vanilla configs so that the build works. + +------------------------------------------------------------------- +Wed May 6 17:19:56 CEST 2009 - gregkh(a)suse.de + +- Update config files. +- patches.suse/devtmpfs.patch: driver-core: devtmpfs - driver-core + maintained /dev tmpfs. + +------------------------------------------------------------------- +Tue May 5 17:17:21 CEST 2009 - jeffm(a)suse.com + +- Update config files. + +------------------------------------------------------------------- +Tue May 5 16:46:08 CEST 2009 - jeffm(a)suse.com + +- Update to 2.6.30-rc4-git1. +- patches.rpmify/fix-unexpected-non-allocable-warnings-with-suse-gcc: + kbuild, modpost: fix "unexpected non-allocatable" warning with + SUSE gcc. + +------------------------------------------------------------------- +Tue May 5 14:31:59 CEST 2009 - jbeulich(a)novell.com + +- patches.fixes/iwl3945-build: iwl3945: fix ia64/ppc build. + +------------------------------------------------------------------- +Tue May 5 11:05:37 CEST 2009 - jbeulich(a)novell.com + +- patches.xen/xen3-patch-2.6.30-rc4: Fix ia64 build. + +------------------------------------------------------------------- +Tue May 5 10:08:12 CEST 2009 - jbeulich(a)novell.com + +- patches.suse/stack-unwind: Also initialize PT_GS() on 32-bit. +- patches.arch/x86_64-unwind-annotations: Refresh. + +------------------------------------------------------------------- +Tue May 5 10:02:41 CEST 2009 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.29-rc4 and c/s 867. +- Update i386 and x86_64 config files. +- config.conf: Re-enable Xen. + +------------------------------------------------------------------- +Tue May 5 05:22:16 CEST 2009 - teheo(a)suse.de + +- patches.suse/kbuild-icecream-workaround: kbuild: add workaround + for icecream bug (bnc#495786). + +------------------------------------------------------------------- +Fri May 1 20:01:16 CEST 2009 - jeffm(a)suse.com + +- patches.fixes/reiserfs-xattr-locking: reiserfs: Expand i_mutex + to enclose lookup_one_len. + +------------------------------------------------------------------- +Fri May 1 20:00:48 CEST 2009 - jeffm(a)suse.com + +- Update to 2.6.30-rc4. + - Eliminated 2 patches. + +------------------------------------------------------------------- +Fri May 1 19:58:07 CEST 2009 - jeffm(a)suse.com + +- patches.drivers/libata-prefer-over-ide: libata: prefer libata + drivers over ide ones (bnc#433105). +- patches.fixes/reiserfs-xattr-locking: reiserfs: Expand i_mutex + to enclose lookup_one_len. +- patches.kernel.org/patch-2.6.30-rc3-rc4: +- patches.suse/no-frame-pointer-select: Fix stack unwinder Kconfig + (bnc#402518). +- patches.arch/s390-08-05-af_iucv-msgpeek-fix.patch: Delete. +- patches.fixes/fix-periodic-mode-programming-on-amd81xx: Delete. + +------------------------------------------------------------------- +Thu Apr 30 16:56:17 CEST 2009 - mmarek(a)suse.cz + +- scripts/submit-to-bs: tentative script to submit a new kernel to + openSUSE:Factory + +------------------------------------------------------------------- +Tue Apr 28 11:19:41 CEST 2009 - npiggin(a)suse.de + +- patches.apparmor/unambiguous-__d_path.diff: Put a reminder in here + to fix the lock order problem when the patch is updated to HEAD. + +------------------------------------------------------------------- +Mon Apr 27 13:48:49 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: Fix prepending EXTRAVERSION, + rename the variable back to @RELEASE_PREFIX@. + +------------------------------------------------------------------- +Mon Apr 27 10:41:20 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: prepend the EXTRAVERSION to + the rpm release string (note that this won't have any effect in + the openSUSE:* projects). + +------------------------------------------------------------------- +Fri Apr 24 19:28:44 CEST 2009 - gregkh(a)suse.de + +- Update config files. + - build rtc_cmos driver into the kernel for i386 and x86-64 default + kernels. This should automatically take care of the rtc/system time + syncing so we don't need to do it in a boot script and should speed + up booting time a lot. + +------------------------------------------------------------------- +Fri Apr 24 19:24:53 CEST 2009 - gregkh(a)suse.de + +- Update config files. change CONFIG_ATA=y and CONFIG_SATA_AHCI=y ++++ 394 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-kdump.changes: same change New Changes file: --- /dev/null 2009-04-14 11:58:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-legacy.changes 2009-05-19 18:06:49.000000000 +0200 @@ -0,0 +1,49687 @@ +------------------------------------------------------------------- +Tue May 19 18:03:44 CEST 2009 - jeffm(a)suse.com + +- Set CONFIG_FRAMEBUFFER_CONSOLE=y + +------------------------------------------------------------------- +Tue May 19 17:27:45 CEST 2009 - jeffm(a)suse.com + +- Restored CONFIG_BOOTSPLASH=y and CONFIG_FB_VESA=y on + x86/x86_64 (bnc#504608) + +------------------------------------------------------------------- +Tue May 19 16:17:34 CEST 2009 - jbeulich(a)novell.com + +- patches.xen/sfc-endianness: fix building with gcc 4.4. + +------------------------------------------------------------------- +Tue May 19 12:04:26 CEST 2009 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.30/rc6-git3 and c/s 873. + +------------------------------------------------------------------- +Mon May 18 16:52:37 CEST 2009 - jeffm(a)suse.com + +- Updated to 2.6.30-rc6-git3. + - Eliminated 4 patches. + +------------------------------------------------------------------- +Fri May 15 19:16:23 CEST 2009 - jeffm(a)suse.de + +- doc/README.SUSE: Updated to reflect building in an external + directory so as not to contaminate /usr/src/linux + +------------------------------------------------------------------- +Thu May 14 14:09:10 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: fix path in + /usr/src/linux-obj/.../Makefile. + +------------------------------------------------------------------- +Thu May 14 11:09:01 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: provide kernel-$flavor-devel = + %version-%source_rel in the -devel packages (bnc#503280). + +------------------------------------------------------------------- +Wed May 13 15:42:49 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: also fix kernel-$flavor-devel requires + (bnc#503280). + +------------------------------------------------------------------- +Wed May 13 15:32:58 CEST 2009 - mmarek(a)suse.cz + +- rpm/mkspec: fix kernel-syms requires (bnc#503280). + +------------------------------------------------------------------- +Mon May 11 21:11:59 CEST 2009 - jeffm(a)suse.com + +- patches.fixes/dup2-retval-fix: dup2: Fix return value with + oldfd == newfd and invalid fd (bnc#498042). + +------------------------------------------------------------------- +Mon May 11 21:11:19 CEST 2009 - jeffm(a)suse.com + +- patches.fixes/reiserfs-xattr-fixup: reiserfs: clean up ifdefs. +- patches.fixes/reiserfs-xattr-root-fixup: reiserfs: deal with + NULL xattr root w/ xattrs disabled. +- patches.fixes/reiserfs-xattrs-disabled-perms: reiserfs: fixup + perms when xattrs are disabled. +- patches.fixes/reiserfs-expose-privroot: reiserfs: allow exposing + privroot w/ xattrs enabled. + +------------------------------------------------------------------- +Mon May 11 19:41:25 CEST 2009 - jeffm(a)suse.de + +- Updated to 2.6.30-rc5-git1. + - Eliminated 4 patches. + +------------------------------------------------------------------- +Wed May 6 17:38:57 CEST 2009 - gregkh(a)suse.de + +- Update config files. update vanilla configs so that the build works. + +------------------------------------------------------------------- +Wed May 6 17:19:56 CEST 2009 - gregkh(a)suse.de + +- Update config files. +- patches.suse/devtmpfs.patch: driver-core: devtmpfs - driver-core + maintained /dev tmpfs. + +------------------------------------------------------------------- +Tue May 5 17:17:21 CEST 2009 - jeffm(a)suse.com + +- Update config files. + +------------------------------------------------------------------- +Tue May 5 16:46:08 CEST 2009 - jeffm(a)suse.com + +- Update to 2.6.30-rc4-git1. +- patches.rpmify/fix-unexpected-non-allocable-warnings-with-suse-gcc: + kbuild, modpost: fix "unexpected non-allocatable" warning with + SUSE gcc. + +------------------------------------------------------------------- +Tue May 5 14:31:59 CEST 2009 - jbeulich(a)novell.com + +- patches.fixes/iwl3945-build: iwl3945: fix ia64/ppc build. + +------------------------------------------------------------------- +Tue May 5 11:05:37 CEST 2009 - jbeulich(a)novell.com + +- patches.xen/xen3-patch-2.6.30-rc4: Fix ia64 build. + +------------------------------------------------------------------- +Tue May 5 10:08:12 CEST 2009 - jbeulich(a)novell.com + +- patches.suse/stack-unwind: Also initialize PT_GS() on 32-bit. +- patches.arch/x86_64-unwind-annotations: Refresh. + +------------------------------------------------------------------- +Tue May 5 10:02:41 CEST 2009 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.29-rc4 and c/s 867. +- Update i386 and x86_64 config files. +- config.conf: Re-enable Xen. + +------------------------------------------------------------------- +Tue May 5 05:22:16 CEST 2009 - teheo(a)suse.de + +- patches.suse/kbuild-icecream-workaround: kbuild: add workaround + for icecream bug (bnc#495786). + +------------------------------------------------------------------- +Fri May 1 20:01:16 CEST 2009 - jeffm(a)suse.com + +- patches.fixes/reiserfs-xattr-locking: reiserfs: Expand i_mutex + to enclose lookup_one_len. + +------------------------------------------------------------------- +Fri May 1 20:00:48 CEST 2009 - jeffm(a)suse.com + +- Update to 2.6.30-rc4. + - Eliminated 2 patches. + +------------------------------------------------------------------- +Fri May 1 19:58:07 CEST 2009 - jeffm(a)suse.com + +- patches.drivers/libata-prefer-over-ide: libata: prefer libata + drivers over ide ones (bnc#433105). +- patches.fixes/reiserfs-xattr-locking: reiserfs: Expand i_mutex + to enclose lookup_one_len. +- patches.kernel.org/patch-2.6.30-rc3-rc4: +- patches.suse/no-frame-pointer-select: Fix stack unwinder Kconfig + (bnc#402518). +- patches.arch/s390-08-05-af_iucv-msgpeek-fix.patch: Delete. +- patches.fixes/fix-periodic-mode-programming-on-amd81xx: Delete. + +------------------------------------------------------------------- +Thu Apr 30 16:56:17 CEST 2009 - mmarek(a)suse.cz + +- scripts/submit-to-bs: tentative script to submit a new kernel to + openSUSE:Factory + +------------------------------------------------------------------- +Tue Apr 28 11:19:41 CEST 2009 - npiggin(a)suse.de + +- patches.apparmor/unambiguous-__d_path.diff: Put a reminder in here + to fix the lock order problem when the patch is updated to HEAD. + +------------------------------------------------------------------- +Mon Apr 27 13:48:49 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: Fix prepending EXTRAVERSION, + rename the variable back to @RELEASE_PREFIX@. + +------------------------------------------------------------------- +Mon Apr 27 10:41:20 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: prepend the EXTRAVERSION to + the rpm release string (note that this won't have any effect in + the openSUSE:* projects). + +------------------------------------------------------------------- +Fri Apr 24 19:28:44 CEST 2009 - gregkh(a)suse.de + +- Update config files. + - build rtc_cmos driver into the kernel for i386 and x86-64 default + kernels. This should automatically take care of the rtc/system time + syncing so we don't need to do it in a boot script and should speed + up booting time a lot. + +------------------------------------------------------------------- +Fri Apr 24 19:24:53 CEST 2009 - gregkh(a)suse.de + ++++ 49490 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-legacy.changes --- kernel-source/kernel-ppc64.changes 2009-03-24 17:53:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-ppc64.changes 2009-05-19 18:06:51.000000000 +0200 @@ -1,0 +2,591 @@ +Tue May 19 18:03:44 CEST 2009 - jeffm(a)suse.com + +- Set CONFIG_FRAMEBUFFER_CONSOLE=y + +------------------------------------------------------------------- +Tue May 19 17:27:45 CEST 2009 - jeffm(a)suse.com + +- Restored CONFIG_BOOTSPLASH=y and CONFIG_FB_VESA=y on + x86/x86_64 (bnc#504608) + +------------------------------------------------------------------- +Tue May 19 16:17:34 CEST 2009 - jbeulich(a)novell.com + +- patches.xen/sfc-endianness: fix building with gcc 4.4. + +------------------------------------------------------------------- +Tue May 19 12:04:26 CEST 2009 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.30/rc6-git3 and c/s 873. + +------------------------------------------------------------------- +Mon May 18 16:52:37 CEST 2009 - jeffm(a)suse.com + +- Updated to 2.6.30-rc6-git3. + - Eliminated 4 patches. + +------------------------------------------------------------------- +Fri May 15 19:16:23 CEST 2009 - jeffm(a)suse.de + +- doc/README.SUSE: Updated to reflect building in an external + directory so as not to contaminate /usr/src/linux + +------------------------------------------------------------------- +Thu May 14 14:09:10 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: fix path in + /usr/src/linux-obj/.../Makefile. + +------------------------------------------------------------------- +Thu May 14 11:09:01 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: provide kernel-$flavor-devel = + %version-%source_rel in the -devel packages (bnc#503280). + +------------------------------------------------------------------- +Wed May 13 15:42:49 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: also fix kernel-$flavor-devel requires + (bnc#503280). + +------------------------------------------------------------------- +Wed May 13 15:32:58 CEST 2009 - mmarek(a)suse.cz + +- rpm/mkspec: fix kernel-syms requires (bnc#503280). + +------------------------------------------------------------------- +Mon May 11 21:11:59 CEST 2009 - jeffm(a)suse.com + +- patches.fixes/dup2-retval-fix: dup2: Fix return value with + oldfd == newfd and invalid fd (bnc#498042). + +------------------------------------------------------------------- +Mon May 11 21:11:19 CEST 2009 - jeffm(a)suse.com + +- patches.fixes/reiserfs-xattr-fixup: reiserfs: clean up ifdefs. +- patches.fixes/reiserfs-xattr-root-fixup: reiserfs: deal with + NULL xattr root w/ xattrs disabled. +- patches.fixes/reiserfs-xattrs-disabled-perms: reiserfs: fixup + perms when xattrs are disabled. +- patches.fixes/reiserfs-expose-privroot: reiserfs: allow exposing + privroot w/ xattrs enabled. + +------------------------------------------------------------------- +Mon May 11 19:41:25 CEST 2009 - jeffm(a)suse.de + +- Updated to 2.6.30-rc5-git1. + - Eliminated 4 patches. + +------------------------------------------------------------------- +Wed May 6 17:38:57 CEST 2009 - gregkh(a)suse.de + +- Update config files. update vanilla configs so that the build works. + +------------------------------------------------------------------- +Wed May 6 17:19:56 CEST 2009 - gregkh(a)suse.de + +- Update config files. +- patches.suse/devtmpfs.patch: driver-core: devtmpfs - driver-core + maintained /dev tmpfs. + +------------------------------------------------------------------- +Tue May 5 17:17:21 CEST 2009 - jeffm(a)suse.com + +- Update config files. + +------------------------------------------------------------------- +Tue May 5 16:46:08 CEST 2009 - jeffm(a)suse.com + +- Update to 2.6.30-rc4-git1. +- patches.rpmify/fix-unexpected-non-allocable-warnings-with-suse-gcc: + kbuild, modpost: fix "unexpected non-allocatable" warning with + SUSE gcc. + +------------------------------------------------------------------- +Tue May 5 14:31:59 CEST 2009 - jbeulich(a)novell.com + +- patches.fixes/iwl3945-build: iwl3945: fix ia64/ppc build. + +------------------------------------------------------------------- +Tue May 5 11:05:37 CEST 2009 - jbeulich(a)novell.com + +- patches.xen/xen3-patch-2.6.30-rc4: Fix ia64 build. + +------------------------------------------------------------------- +Tue May 5 10:08:12 CEST 2009 - jbeulich(a)novell.com + +- patches.suse/stack-unwind: Also initialize PT_GS() on 32-bit. +- patches.arch/x86_64-unwind-annotations: Refresh. + +------------------------------------------------------------------- +Tue May 5 10:02:41 CEST 2009 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.29-rc4 and c/s 867. +- Update i386 and x86_64 config files. +- config.conf: Re-enable Xen. + +------------------------------------------------------------------- +Tue May 5 05:22:16 CEST 2009 - teheo(a)suse.de + +- patches.suse/kbuild-icecream-workaround: kbuild: add workaround + for icecream bug (bnc#495786). + +------------------------------------------------------------------- +Fri May 1 20:01:16 CEST 2009 - jeffm(a)suse.com + +- patches.fixes/reiserfs-xattr-locking: reiserfs: Expand i_mutex + to enclose lookup_one_len. + +------------------------------------------------------------------- +Fri May 1 20:00:48 CEST 2009 - jeffm(a)suse.com + +- Update to 2.6.30-rc4. + - Eliminated 2 patches. + +------------------------------------------------------------------- +Fri May 1 19:58:07 CEST 2009 - jeffm(a)suse.com + +- patches.drivers/libata-prefer-over-ide: libata: prefer libata + drivers over ide ones (bnc#433105). +- patches.fixes/reiserfs-xattr-locking: reiserfs: Expand i_mutex + to enclose lookup_one_len. +- patches.kernel.org/patch-2.6.30-rc3-rc4: +- patches.suse/no-frame-pointer-select: Fix stack unwinder Kconfig + (bnc#402518). +- patches.arch/s390-08-05-af_iucv-msgpeek-fix.patch: Delete. +- patches.fixes/fix-periodic-mode-programming-on-amd81xx: Delete. + +------------------------------------------------------------------- +Thu Apr 30 16:56:17 CEST 2009 - mmarek(a)suse.cz + +- scripts/submit-to-bs: tentative script to submit a new kernel to + openSUSE:Factory + +------------------------------------------------------------------- +Tue Apr 28 11:19:41 CEST 2009 - npiggin(a)suse.de + +- patches.apparmor/unambiguous-__d_path.diff: Put a reminder in here + to fix the lock order problem when the patch is updated to HEAD. + +------------------------------------------------------------------- +Mon Apr 27 13:48:49 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: Fix prepending EXTRAVERSION, + rename the variable back to @RELEASE_PREFIX@. + +------------------------------------------------------------------- +Mon Apr 27 10:41:20 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: prepend the EXTRAVERSION to + the rpm release string (note that this won't have any effect in + the openSUSE:* projects). + +------------------------------------------------------------------- +Fri Apr 24 19:28:44 CEST 2009 - gregkh(a)suse.de + +- Update config files. + - build rtc_cmos driver into the kernel for i386 and x86-64 default + kernels. This should automatically take care of the rtc/system time + syncing so we don't need to do it in a boot script and should speed + up booting time a lot. + +------------------------------------------------------------------- +Fri Apr 24 19:24:53 CEST 2009 - gregkh(a)suse.de + +- Update config files. change CONFIG_ATA=y and CONFIG_SATA_AHCI=y ++++ 394 more lines (skipped) ++++ between kernel-source/kernel-ppc64.changes ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-ppc64.changes 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 kernel-xen.changes: same change calling whatdependson for head-i586 Old: ---- build-source-timestamp get_release_number.sh kernel-pae.changes kernel-pae.spec source-pre.sh New: ---- compute-PATCHVERSION.sh config.sh devel-post.sh devel-pre.sh kernel-binary.spec.in kernel-legacy.changes kernel-legacy.spec kernel-source.spec.in kernel-syms.spec.in mkspec old-packages.conf package-descriptions README.KSYMS source-timestamp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ ++++ 776 lines (skipped) ++++ between kernel-source/kernel-debug.spec ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-debug.spec kernel-default.spec: same change kernel-kdump.spec: same change ++++++ kernel-legacy.spec ++++++ ++++ 29358 lines (skipped) ++++++ kernel-ppc64.spec ++++++ ++++ 781 lines (skipped) ++++ between kernel-source/kernel-ppc64.spec ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-ppc64.spec kernel-ps3.spec: same change kernel-s390.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.zL7515/_old 2009-05-20 10:55:59.000000000 +0200 +++ /var/tmp/diff_new_pack.zL7515/_new 2009-05-20 10:55:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 2.6.29) +# spec file for package kernel-source (Version 2.6.30) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,41 +19,51 @@ # icecream 0 Url: http://www.kernel.org/ -%if 0%{?opensuse_bs} +%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.29 +%define patchversion 2.6.30-rc6-git3 +%define variant %{nil} +%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") +%define kernelrelease %patchversion-%release_major +%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 +%define tolerate_unknown_new_config_options @TOLERATE_UNKNOWN_NEW_CONFIG_OPTIONS@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 2.6.29 -Release: 6 +Version: 2.6.30 +Release: 1 +%if %using_buildservice +%else +%endif License: GPL v2 only Group: Development/Sources AutoReqProv: off BuildRequires: coreutils sed BuildRequires: fdupes Requires(post): coreutils sed -ExclusiveArch: %ix86 ppc ppc64 s390 s390x ia64 x86_64 Provides: linux -Provides: kernel-source = 2.6.29-%source_rel -%if "kernel-source" == "kernel-source" -Provides: linux lx_suse lx_sus22 lx_sus24 -Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24 -%endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 -Source1: source-pre.sh +Provides: %name = %version-%source_rel +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source2: source-post.sh -Source3: kernel-source.rpmlintrc +Source3: %name.rpmlintrc +Source8: devel-pre.sh +Source9: devel-post.sh Source10: preun.sh Source11: postun.sh Source12: pre.sh Source13: post.sh Source14: series.conf -Source15: arch-symbols Source16: guards Source21: config.conf Source23: supported.conf @@ -61,7 +71,8 @@ Source33: check-for-config-changes Source34: check-supported-list Source37: README.SUSE -Source40: build-source-timestamp +Source38: README.KSYMS +Source40: source-timestamp Source41: built-in-where Source44: find-provides Source45: module-renames @@ -70,17 +81,16 @@ Source48: macros.kernel-source Source49: kernel-module-subpackage Source50: symsets.pl -Source50: kernel-syms.spec -Source51: kernel-debug.spec -Source52: kernel-default.spec -Source53: kernel-kdump.spec -Source54: kernel-pae.spec -Source55: kernel-ppc64.spec -Source56: kernel-ps3.spec -Source57: kernel-s390.spec -Source58: kernel-trace.spec -Source59: kernel-vanilla.spec -Source60: kernel-xen.spec +Source51: mkspec +Source52: kernel-source%variant.changes +Source53: kernel-source.spec.in +Source54: kernel-binary.spec.in +Source55: kernel-syms.spec.in +Source56: config.sh +Source57: compute-PATCHVERSION.sh +Source58: old-packages.conf +Source59: arch-symbols +Source60: package-descriptions Source100: config.tar.bz2 Source101: patches.arch.tar.bz2 Source102: patches.drivers.tar.bz2 @@ -96,14 +106,16 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 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/{arch-symbols,guards,config-subst,check-for-config-changes,symsets.pl}) -%define symbols %(set -- $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) -%define tolerate_unknown_new_config_options 0 +%(chmod +x %_sourcedir/{guards,config-subst,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" == "" %description Linux kernel sources with many fixes and improvements. @@ -116,16 +128,31 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-03-24 15:38:18 +0100 -GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db -GIT Branch: master +%source_timestamp +%package vanilla +License: GPL v2 only +Summary: The Linux Kernel Sources +Group: Development/Sources +AutoReqProv: off + +%description vanilla +Linux kernel sources with many fixes and improvements. + + +Authors: +-------- + Linus Torvalds <torvalds(a)osdl.org> + + see /usr/src/linux/CREDITS for more details. + +%source_timestamp %prep -if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then - echo "Please get a copy of linux-2.6.29.tar.bz2 from" \ +if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then + echo "Please get a copy of linux-%srcversion.tar.bz2 from" \ "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/." fi -echo "Architecture symbol(s): %symbols" +echo "Symbol(s): %symbols" # Unpack all sources and patches %setup -q -c -T -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 @@ -135,158 +162,75 @@ while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do RELEASE=${RELEASE#[^0-9]*.} done -KERNELRELEASE=2.6.29-$RELEASE -case kernel-source in -(*-rt) - variant=-rt - variant_symbols=RT - ;; -(*) - variant= - variant_symbols= - ;; -esac -cat > %_builddir/%{name}-%{version}/.rpm-defs <<EOF -KERNELRELEASE=$KERNELRELEASE -variant=$variant -EOF mkdir -p $RPM_BUILD_ROOT/usr/src cd $RPM_BUILD_ROOT/usr/src -ln -sf linux$variant linux$variant # dummy symlink -mkdir linux-obj +ln -sf linux%variant linux%variant # dummy symlink # Unpack the vanilla kernel sources -bzip2 -cd %_sourcedir/linux-2.6.29.tar.bz2 \ +bzip2 -cd %_sourcedir/linux-%srcversion.tar.bz2 \ | tar xf - -mv linux-2.6.29 linux-$KERNELRELEASE$variant -cd linux-$KERNELRELEASE$variant -chmod -x arch/arm/mach-at91/board-yl-9200.c # executable by accident (fixed in 2.6.27) -%_sourcedir/guards $variant_symbols %symbols < %_sourcedir/series.conf \ - > .patches +mv linux-%srcversion linux-%kernelrelease%variant +%if %do_vanilla +cp -al linux-%kernelrelease%variant linux-%kernelrelease-vanilla +cd linux-%kernelrelease-vanilla +%_sourcedir/guards %variant_symbols %symbols < %_sourcedir/series.conf | + egrep kernel.org\|rpmify > .patches for patch in $(< .patches); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch \ - -i %_builddir/kernel-source-2.6.29/$patch; then + -i %_builddir/%name-%version/$patch; then echo "*** Patch $patch failed ***" exit 1 fi done -if [ -f %_sourcedir/localversion ] ; then - cat %_sourcedir/localversion > localversion -fi -cat > %my_builddir/kernel-source.files <<EOF -%%defattr(-, root, root) -%%ghost /usr/src/linux$variant -%%dir /usr/src/linux-obj -/usr/src/linux-$KERNELRELEASE$variant -/usr/src/linux-$KERNELRELEASE$variant-obj -/usr/share/doc/packages/%name -/etc/rpm/macros.kernel-source -/usr/lib/rpm/kernel-module-subpackage -/lib/modules/* -EOF -for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep -v vanilla); do - cpu_arch=${config%/*} - flavor=${config#*/} - config=%_builddir/%buildsubdir/config/$config - if [ ! -d ../linux-obj/$cpu_arch ]; then - mkdir ../linux-obj/$cpu_arch - echo "%%dir /usr/src/linux-obj/$cpu_arch" >>%my_builddir/%name.files - fi - ln -s $flavor ../linux-obj/$cpu_arch/$flavor # dummy symlink - echo "%%ghost /usr/src/linux-obj/$cpu_arch/$flavor" >>%my_builddir/%name.files - case "$flavor" in - *-*) - echo "Flavor '$flavor' must not contain dashes." >&2 - exit 1 - ;; - esac - set -- kernel-$flavor $flavor - case $flavor in - (rt|rt_*) - set -- "$@" RT - ;; - esac - diff -q .patches \ - <(%_sourcedir/guards $* %symbols < %_sourcedir/series.conf) \ - || continue -# source_tree=linux-$KERNELRELEASE$variant - o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE$variant-obj/$cpu_arch/$flavor - mkdir -p $o - cat $config \ - | %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-$flavor'"' \ - | %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ -%if 0%{?__debug_package:1} - | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ +rm -f .patches $(find . -name ".gitignore") +cd .. %endif - > $o/.config - MAKE_ARGS="O=$o" - # Works around a "fix" in mainline that ends up causing the makefile - # to not be regenerated. - echo "Automatically" > $o/Makefile -%if %{tolerate_unknown_new_config_options} - yes '' | make oldconfig $MAKE_ARGS -%else - cp $o/.config $o/.config.before - make silentoldconfig $MAKE_ARGS < /dev/null - %_sourcedir/check-for-config-changes $o/.config.before $o/.config - rm -r $o/.config.before -%endif - make prepare $MAKE_ARGS - make scripts $MAKE_ARGS - krel=$(make -s kernelrelease $MAKE_ARGS) - if [ $KERNELRELEASE != "${krel%%-*}" ]; then - echo "Kernel release mismatch: $KERNELRELEASE != ${krel%%-*}" >&2 +cd linux-%kernelrelease%variant +%_sourcedir/guards %variant_symbols %symbols < %_sourcedir/series.conf \ + > .patches +for patch in $(< .patches); do + if ! patch -s -F0 -E -p1 --no-backup-if-mismatch \ + -i %_builddir/%name-%version/$patch; then + echo "*** Patch $patch failed ***" exit 1 fi - make clean $MAKE_ARGS - mkdir -p $RPM_BUILD_ROOT/lib/modules/$krel - ln -s ../../../usr/src/linux-$KERNELRELEASE$variant \ - $RPM_BUILD_ROOT/lib/modules/$krel/source - # Replace the absolute with a relative path - sed -e "s,$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE$variant,../../../linux-$KERNELRELEASE$variant,g" \ - -i $o/Makefile - rm -f $o/.config.old done -rm -f linux-$KERNELRELEASE$variant/.patches +rm -f .patches $(find . -name ".gitignore") +if [ -f %_sourcedir/localversion ] ; then + cat %_sourcedir/localversion > localversion +fi # Hardlink duplicate files automatically (from package fdupes). %fdupes $RPM_BUILD_ROOT -cd $RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE$variant-obj -set -- * -if [ ! -e %_target_cpu ]; then - ln -s $1 %_target_cpu - ln -s $1 ../linux-obj/%_target_cpu - echo "/usr/src/linux-obj/%_target_cpu" >>%my_builddir/%name.files -fi -cd $RPM_BUILD_ROOT/usr/src -rm -f `find linux-$KERNELRELEASE$variant -name ".gitignore"` -# Remove $RPM_BUILD_ROOT prefix from symlinks. -for link in $(find $RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE$variant-obj -type l); do - target=$(readlink $link) - rm -f $link - ln -s ${target/$RPM_BUILD_ROOT/} $link -done %install -source .rpm-defs # Install the documentation and example Kernel Module Package. DOC=$RPM_BUILD_ROOT/usr/share/doc/packages/%name mkdir -p $DOC cp %_sourcedir/README.SUSE $DOC -ln -s /usr/share/doc/packages/%name/README.SUSE \ - $RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE$variant/ +ln -s /usr/share/doc/packages/%name/README.SUSE %buildroot/%src_install_dir/ install -m 755 -d $RPM_BUILD_ROOT/etc/rpm install -m 644 %_sourcedir/macros.kernel-source $RPM_BUILD_ROOT/etc/rpm/ install -m 755 -d $RPM_BUILD_ROOT/usr/lib/rpm install -m 644 %_sourcedir/kernel-module-subpackage \ $RPM_BUILD_ROOT/usr/lib/rpm/ -for script in pre post; do - sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ - -e "s:@VARIANT@:$variant:g" \ - %_sourcedir/source-$script.sh > kernel-source-$script.sh +for script in post; do + sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ + -e "s:@SRCVARIANT@:%variant:g" \ + %_sourcedir/source-$script.sh > %name-$script.sh done -%pre -f kernel-source-pre.sh +%post -f %name-post.sh -%post -f kernel-source-post.sh +%files +%defattr(-, root, root) +%ghost /usr/src/linux%variant +/usr/share/doc/packages/%name +/etc/rpm/macros.kernel-source +/usr/lib/rpm/kernel-module-subpackage +/%src_install_dir +%if %do_vanilla -%files -f kernel-source.files +%files vanilla +%defattr(-, root, root) +/usr/src/linux-%kernelrelease-vanilla +%endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.zL7515/_old 2009-05-20 10:56:00.000000000 +0200 +++ /var/tmp/diff_new_pack.zL7515/_new 2009-05-20 10:56:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms (Version 2.6.29) +# spec file for package kernel-syms (Version 2.6.30) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,62 +18,61 @@ # norootforbuild Url: http://www.kernel.org/ -%if 0%{?opensuse_bs} +%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} Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 2.6.29 -Release: 6 +Version: 2.6.30 +Release: 1 +%if %using_buildservice +%else +%define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) +%endif License: GPL v2 only Group: Development/Sources AutoReqProv: off BuildRequires: coreutils -ExclusiveArch: %ix86 ppc ppc64 s390 s390x ia64 x86_64 -%ifarch %ix86 -BuildRequires: kernel-debug kernel-default kernel-pae kernel-trace kernel-xen -%else -%ifarch ppc -BuildRequires: kernel-default kernel-kdump kernel-ppc64 kernel-ps3 -%else -%ifarch ppc64 -BuildRequires: kernel-debug kernel-default kernel-kdump kernel-ppc64 -%else -%ifarch s390 -BuildRequires: kernel-s390 -%else -%ifarch s390x -BuildRequires: kernel-default -%else -%ifarch ia64 -BuildRequires: kernel-debug kernel-default kernel-trace -%else -%ifarch x86_64 -BuildRequires: kernel-debug kernel-default kernel-trace kernel-xen +%ifarch %ix86 ia64 ppc64 x86_64 +Requires: kernel-debug-devel = %version-%source_rel %endif +%ifarch %ix86 ia64 ppc ppc64 s390x x86_64 +Requires: kernel-default-devel = %version-%source_rel %endif +%ifarch ppc ppc64 +Requires: kernel-kdump-devel = %version-%source_rel %endif +%ifarch %ix86 +Requires: kernel-legacy-devel = %version-%source_rel %endif +%ifarch ppc ppc64 +Requires: kernel-ppc64-devel = %version-%source_rel %endif +%ifarch ppc +Requires: kernel-ps3-devel = %version-%source_rel %endif +%ifarch s390 +Requires: kernel-s390-devel = %version-%source_rel %endif -# the packages above do require other things, but none of those are needed during package build -#!BuildIgnore: irqbalance xen -#!BuildIgnore: perl-Bootloader mkinitrd -Requires: linux -Requires: kernel-source = 2.6.29-%source_rel -Source11: arch-symbols -Source12: guards -Source21: config.conf +%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 Prefix: /usr/src -%(chmod +x %_sourcedir/{arch-symbols,guards}) -%define symbols %(set -- $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %description Kernel symbols, such as functions and variables, have version @@ -91,58 +90,14 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-03-24 15:38:18 +0100 -GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db -GIT Branch: master - +%source_timestamp %prep -echo "Architecture symbol(s):" %symbols %install -rm -rf $RPM_BUILD_ROOT -mkdir $RPM_BUILD_ROOT -set -- %symbols -case kernel-syms in -(*-rt) - set -- RT "$@" - ;; -esac -%_sourcedir/guards "$@" < %_sourcedir/series.conf > %_builddir/kernel-syms.patches -for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf) ; do - arch="${config%%/*}" - flavor="${config#*/}" - rpm -q --quiet kernel-$flavor || continue - # Don't add the build infrastructure for kernels that are based - # on a different set of patches. - set -- kernel-$flavor $flavor $(case $flavor in (rt|rt_*) echo RT ;; esac) - %_sourcedir/guards $* %symbols < %_sourcedir/series.conf \ - > %_builddir/kernel-$flavor.patches - diff -q %_builddir/{kernel-syms,kernel-$flavor}.patches || continue - # Make sure that all the kernel-$flavor release numbers match the - # kernel-syms release number. - set -- %version-%release \ - $(rpm -q --qf '%{VERSION}-%{RELEASE}' kernel-$flavor) -%if 0%{?opensuse_bs} - set -- ${1%.*} ${2%.*} -%endif - if [ "$1" != "$2" ]; then - echo "Version / release numbers $1 and $2 do not match" >&2 - exit 1 - fi - shopt -s nullglob - for symvers in /usr/src/linux-*-obj/$arch/$flavor/Module.symvers; do - cp -p --parents $symvers $RPM_BUILD_ROOT/ - for file in /lib/modules/*-$flavor/modules.alias; do - cp -p $file $(dirname $RPM_BUILD_ROOT$symvers) - done - done - for file in /lib/modules/*-$flavor/build; do - cp -pd --parents $file $RPM_BUILD_ROOT/ - done -done +install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE %files %defattr(-, root, root) -/usr/src/linux-*-obj -/lib/modules/*/build +%dir %_docdir/%name +%_docdir/%name/README.SUSE ++++++ kernel-trace.spec ++++++ ++++ 790 lines (skipped) ++++ between kernel-source/kernel-trace.spec ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-trace.spec kernel-vanilla.spec: same change kernel-xen.spec: same change ++++++ arch-symbols ++++++ --- /var/tmp/diff_new_pack.zL7515/_old 2009-05-20 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.zL7515/_new 2009-05-20 10:56:02.000000000 +0200 @@ -1,6 +1,7 @@ #!/bin/sh -# Generate architecture specific patch selection symbols +# With --list, list all known architectures, otherwise print the generic +# name for this architecture (or the one specified on command line). if [ "$1" = "--list" ]; then # List all known architectures @@ -8,28 +9,17 @@ exit 0 fi -if [ -z "$SYMBOLS" ]; then - if [ -n "$1" ]; then - ARCH="$1" - elif [ -n "$PATCH_ARCH" ]; then - ARCH="$PATCH_ARCH" - else - ARCH="`arch`" - fi - SYMBOLS="$ARCH" - case "$ARCH" in - (i?86) SYMBOLS="$SYMBOLS IA32" ;; - (mips*) SYMBOLS="$SYMBOLS MIPS" ;; - (sparc*) SYMBOLS="$SYMBOLS SPARC" ;; - (ppc*) SYMBOLS="$SYMBOLS PPC" ;; - (s390*) SYMBOLS="$SYMBOLS S390" ;; - (ia64) ;; - (x86_64) ;; - (alpha) ;; - (parisc) ;; - (*) # not a recognized architeture! - exit - ;; - esac +if [ -n "$1" ]; then + ARCH="$1" +else + ARCH="`arch`" fi -echo $SYMBOLS +case "$ARCH" in + # from rpm --eval '%ix86' + i?86 | pentium3 | pentium4 | athlon | geode) + echo i386 + ;; + *) + echo "$ARCH" + ;; +esac ++++++ compute-PATCHVERSION.sh ++++++ #! /bin/sh export LANG=POSIX if ! test -d patches.kernel.org; then if test -e patches.kernel.org.tar.bz2; then tar xjf patches.kernel.org.tar.bz2 trap 'rm -rf patches.kernel.org' EXIT else echo "Can't find patches.kernel.org" >&2 fi fi source $(dirname $0)/config.sh set -- $(echo $SRCVERSION | sed -ne 's/$[0-9]\+$.$[0-9]\+$.$[0-9]\+$$.*$/\1 \2 \3 \4/p') VERSION=$1 PATCHLEVEL=$2 SUBLEVEL=$3 EXTRAVERSION=$4 EXTRA_SYMBOLS=$(set -- $([ -e $(dirname $0)/extra-symbols ] && cat $(dirname $0)/extra-symbols) ; echo $*) # Parse all the changes to KERNELRELEASE out of all patches and # convert them to shell code that can be evaluated. Evaluate it. eval "$( $(dirname $0)/guards $EXTRA_SYMBOLS < series.conf | grep '^patches\.kernel\.org' \ | xargs awk ' /^--- |^+++ / \ { M = match($2, /^[^\/]+\/Makefile( \t|$)/) } M && /^+(VERSION|PATCHLEVEL|SUBLEVEL|EXTRAVERSION)/ \ { print } ' \ | sed -e 's,^+,,' -e 's, *= *$.*$,="\1",' )" KERNELRELEASE="$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" echo "$KERNELRELEASE" ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.zL7515/_old 2009-05-20 10:56:03.000000000 +0200 +++ /var/tmp/diff_new_pack.zL7515/_new 2009-05-20 10:56:03.000000000 +0200 @@ -6,14 +6,12 @@ # kernel-binary and kernel-source rely on this # -+IA32 i386/default -+IA32 i386/pae -+IA32 i386/debug -+IA32 i386/xen -+IA32 i386/vanilla -+IA32 - i386/rt -+IA32 - i386/rt_debug -+IA32 i386/trace ++i386 i386/legacy ++i386 i386/default ++i386 i386/debug ++i386 i386/xen ++i386 i386/vanilla ++i386 - i386/trace +ia64 ia64/default +ia64 ia64/debug @@ -24,10 +22,7 @@ +x86_64 x86_64/xen +x86_64 x86_64/debug +x86_64 x86_64/vanilla -+x86_64 - x86_64/rt -+x86_64 - x86_64/rt_debug -+x86_64 - x86_64/rt_timing -+x86_64 x86_64/trace ++x86_64 - x86_64/trace # openSuSE: # G3 G4 bPlan @@ -54,9 +49,8 @@ +ppc64 ppc64/debug # maybe the kernels above were patched to death? +ppc64 ppc64/vanilla -# ? -+ppc - ppc/rt +s390 s390/s390 +s390x s390/default -+S390 s390/vanilla ++s390 s390/vanilla ++s390x s390/vanilla ++++++ config.sh ++++++ # The version of the main tarball to use SRCVERSION=2.6.29 # variant of the kernel-source package, either empty or "-rt" VARIANT= ++++++ config.tar.bz2 ++++++ ++++ 75617 lines of diff (skipped) ++++++ devel-post.sh ++++++ relink() { if [ -h "$2" ]; then local old=$(readlink "$2") [ "$old" = "$1" ] && return 0 echo "Changing symlink $2 from $old to $1" elif [ -e "$2" ]; then echo "Replacing file $2 with symlink to $1" fi rm -f "$2" \ && ln -s "$1" "$2" } release="@KERNELRELEASE@@SRCVARIANT@-obj" arch_flavor="@CPU_ARCH_FLAVOR@" relink ../../linux-$release/"$arch_flavor" /usr/src/linux-obj/"$arch_flavor" ++++++ devel-pre.sh ++++++ # handle update from an older kernel-source with linux-obj as symlink if [ -h /usr/src/linux-obj ]; then rm -vf /usr/src/linux-obj fi ++++++ kernel-binary.spec.in ++++++ ++++ 851 lines (skipped) ++++++ kernel-source.spec.in ++++++ # # spec file for package kernel-source@VARIANT@ (Version @RPMVERSION@) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild # icecream 0 # FIXME: this check will go before the next release ... %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 %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 %define tolerate_unknown_new_config_options @TOLERATE_UNKNOWN_NEW_CONFIG_OPTIONS@ Name: kernel-source@VARIANT@ Summary: The Linux Kernel Sources Version: @RPMVERSION@ %if %using_buildservice Release: @RELEASE_PREFIX@<RELEASE> %else Release: @RELEASE_PREFIX@0 %endif License: GPL Group: Development/Sources AutoReqProv: off BuildRequires: coreutils sed BuildRequires: fdupes Requires(post): coreutils sed Provides: linux Provides: %name = %version-%source_rel Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: %name.rpmlintrc Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh Source11: postun.sh Source12: pre.sh Source13: post.sh Source14: series.conf Source16: guards Source21: config.conf Source23: supported.conf Source30: config-subst Source33: check-for-config-changes Source34: check-supported-list Source37: README.SUSE Source38: README.KSYMS Source40: source-timestamp Source41: built-in-where Source44: find-provides Source45: module-renames Source46: modversions Source47: extract-modaliases Source48: macros.kernel-source Source49: kernel-module-subpackage Source50: symsets.pl Source51: mkspec Source52: kernel-source%variant.changes Source53: kernel-source.spec.in Source54: kernel-binary.spec.in Source55: kernel-syms.spec.in Source56: config.sh Source57: compute-PATCHVERSION.sh Source58: old-packages.conf Source59: arch-symbols Source60: package-descriptions Source100: config.tar.bz2 Source101: patches.arch.tar.bz2 Source102: patches.drivers.tar.bz2 Source103: patches.fixes.tar.bz2 Source104: patches.rpmify.tar.bz2 Source105: patches.suse.tar.bz2 Source107: patches.xen.tar.bz2 Source108: patches.addon.tar.bz2 Source109: patches.kernel.org.tar.bz2 Source110: patches.apparmor.tar.bz2 Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 BuildRoot: %_tmppath/%name-%version-build BuildArchitectures: 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}) %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" == "" %description Linux kernel sources with many fixes and improvements. %source_timestamp %package vanilla Summary: Vanilla Linux kernel sources with minor build fixes. Group: Development/Sources AutoReqProv: off %description vanilla Vanilla Linux kernel sources with minor build fixes. %source_timestamp %prep if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then echo "Please get a copy of linux-%srcversion.tar.bz2 from" \ "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/." fi echo "Symbol(s): %symbols" # Unpack all sources and patches %setup -q -c -T -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 %build # Release number without the EXTRAVERSION RELEASE=%source_rel while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do RELEASE=${RELEASE#[^0-9]*.} done mkdir -p $RPM_BUILD_ROOT/usr/src cd $RPM_BUILD_ROOT/usr/src ln -sf linux%variant linux%variant # dummy symlink # Unpack the vanilla kernel sources bzip2 -cd %_sourcedir/linux-%srcversion.tar.bz2 \ | tar xf - mv linux-%srcversion linux-%kernelrelease%variant %if %do_vanilla cp -al linux-%kernelrelease%variant linux-%kernelrelease-vanilla cd linux-%kernelrelease-vanilla %_sourcedir/guards %variant_symbols %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify > .patches for patch in $(< .patches); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch \ -i %_builddir/%name-%version/$patch; then echo "*** Patch $patch failed ***" exit 1 fi done rm -f .patches $(find . -name ".gitignore") cd .. %endif cd linux-%kernelrelease%variant %_sourcedir/guards %variant_symbols %symbols < %_sourcedir/series.conf \ > .patches for patch in $(< .patches); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch \ -i %_builddir/%name-%version/$patch; then echo "*** Patch $patch failed ***" exit 1 fi done rm -f .patches $(find . -name ".gitignore") if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi # Hardlink duplicate files automatically (from package fdupes). %fdupes $RPM_BUILD_ROOT %install # Install the documentation and example Kernel Module Package. DOC=$RPM_BUILD_ROOT/usr/share/doc/packages/%name mkdir -p $DOC cp %_sourcedir/README.SUSE $DOC ln -s /usr/share/doc/packages/%name/README.SUSE %buildroot/%src_install_dir/ install -m 755 -d $RPM_BUILD_ROOT/etc/rpm install -m 644 %_sourcedir/macros.kernel-source $RPM_BUILD_ROOT/etc/rpm/ install -m 755 -d $RPM_BUILD_ROOT/usr/lib/rpm install -m 644 %_sourcedir/kernel-module-subpackage \ $RPM_BUILD_ROOT/usr/lib/rpm/ for script in post; do sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ -e "s:@SRCVARIANT@:%variant:g" \ %_sourcedir/source-$script.sh > %name-$script.sh done %post -f %name-post.sh %files %defattr(-, root, root) %ghost /usr/src/linux%variant /usr/share/doc/packages/%name /etc/rpm/macros.kernel-source /usr/lib/rpm/kernel-module-subpackage /%src_install_dir %if %do_vanilla %files vanilla %defattr(-, root, root) /usr/src/linux-%kernelrelease-vanilla %endif %changelog ++++++ kernel-syms.spec.in ++++++ # # spec file for package kernel-syms@VARIANT@ (Version @RPMVERSION@) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild # ( kernel-binary-packages is expanded into the list of all binary kernel # packages for each architecture by Autobuild. ) %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} Name: kernel-syms@VARIANT@ Summary: Kernel Symbol Versions (modversions) Version: @RPMVERSION@ %if %using_buildservice Release: @RELEASE_PREFIX@<RELEASE> %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) Release: %kernel_source_release %endif License: GPL Group: Development/Sources AutoReqProv: off BuildRequires: coreutils @REQUIRES@ Source: README.KSYMS Requires: kernel-source%variant = %version-%source_rel BuildRoot: %_tmppath/%name-%version-build Prefix: /usr/src %description Kernel symbols, such as functions and variables, have version information attached to them. This package contains the symbol versions for the standard kernels. This package is needed for compiling kernel module packages with proper package dependencies. %source_timestamp %prep %install install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE %files %defattr(-, root, root) %dir %_docdir/%name %_docdir/%name/README.SUSE %changelog ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.zL7515/_old 2009-05-20 10:56:13.000000000 +0200 +++ /var/tmp/diff_new_pack.zL7515/_new 2009-05-20 10:56:13.000000000 +0200 @@ -1 +1 @@ -2096000 +1048576 ++++++ mkspec ++++++ #!/usr/bin/perl use strict; use warnings; use File::Copy; use Data::Dumper; my $dir = "."; # flavor -> [supported archs] my %flavor_archs = parse_config_conf(); # template name -> template body my %templates = read_spec_templates(); # config.sh variables my %vars = parse_config_sh(); my ($srcversion, $variant) = ($vars{'SRCVERSION'}, $vars{'VARIANT'}); # rpm changelog my $changelog = convert_changes(); # package name -> [summary, description] my %binary_descriptions = parse_descriptions(); my $patchversion = `$dir/compute-PATCHVERSION.sh`; chomp $patchversion; my ($rpmversion, $rpmrelease) = split(/-/, $patchversion, 2); if (defined($rpmrelease)) { $rpmrelease =~ s/-/./g; $rpmrelease .= "."; } else { $rpmrelease = ""; } my %macros = ( VARIANT => $variant, SRCVERSION => $srcversion, PATCHVERSION => $patchversion, RPMVERSION => $rpmversion, RELEASE_PREFIX => $rpmrelease, ); # 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"; $summary = "The Linux Kernel"; $description = "The Linux Kernel."; } else { $summary = $binary_descriptions{"kernel-$flavor"}->[0]; $description = $binary_descriptions{"kernel-$flavor"}->[1]; } do_spec('binary', "kernel-$flavor.spec", %macros, FLAVOR => $flavor, SUMMARY => $summary, DESCRIPTION => $description, ARCHS => join(" ", arch2rpm(@{$flavor_archs{$flavor}})), PROVIDES_OBSOLETES => provides_obsoletes($flavor, @{$flavor_archs{$flavor}}), ); } # kernel-source.spec do_spec('source', "kernel-source$variant.spec", %macros); # kernel-syms.spec { my $requires = ""; for my $flavor (sort keys(%flavor_archs)) { next if $flavor eq "vanilla"; my @archs = arch2rpm(@{$flavor_archs{$flavor}}); $requires .= "%ifarch @archs\n"; $requires .= "Requires: kernel-$flavor-devel = \%version-\%source_rel\n"; $requires .= "%endif\n"; } chomp $requires; do_spec('syms', "kernel-syms$variant.spec", %macros, REQUIRES => $requires); } exit 0; sub parse_config_conf { my %res; for my $arch (split(/\s+/, `$dir/arch-symbols --list`)) { my @flavors = `$dir/guards $arch < $dir/config.conf`; next if @flavors == 0; chomp @flavors; @flavors = map { s/.*\///; $_ } @flavors; for my $flavor (@flavors) { $res{$flavor} ||= []; push(@{$res{$flavor}}, $arch); } } return %res; } sub read_spec_templates { my %res; for my $template qw(binary source syms) { xopen(my $fh, '<', "$dir/kernel-$template.spec.in"); my @lines = <$fh>; $res{$template} = join("", @lines); close($fh); } return %res; } # return a hash of config.sh variables sub parse_config_sh { my %res; xopen(my $fh, '<', "$dir/config.sh"); while (<$fh>) { chomp; if (/^\s*([A-Z_]+)=(.*)/) { $res{$1} = $2; } } close($fh); return %res; } # convert kernel-source.changes to rpm changelog sub convert_changes { my $res = "\%changelog\n"; my @progs = qw(/usr/lib/build/changelog2spec /work/src/bin/tools/convert_changes_to_rpm_changelog); my $changesfile = "$dir/kernel-source$variant.changes"; if (-e $changesfile) { for my $prog (@progs) { if (-x $prog) { $res .= `$prog $changesfile`; last; } } } chomp $res; return $res; } sub parse_descriptions { my %res; my $current; my $blank = ""; # 0 - expect summary, 1 - eating blank lines, 2 - reading description my $state = 0; xopen(my $fh, '<', "$dir/package-descriptions"); while (<$fh>) { next if /^\s*#/; if (/^==+\s+([^\s]+)\s+==+\s*$/) { my $package = $1; if ($current) { chomp $current->[1]; } $current = ["", ""]; $res{$package} = $current; $state = 0; next; } if (/^$/) { if ($state == 2) { $blank .= $_; } next; } # non-blank line and not === package === if ($state == 0) { chomp; $current->[0] = $_; $state = 1; } elsif ($state == 1) { $current->[1] = $_; $blank = ""; $state = 2; } else { $current->[1] .= $blank; $blank = ""; $current->[1] .= $_; } } if ($current) { chomp $current->[1]; } close($fh); return %res; } sub arch2rpm { if (wantarray) { return map { _arch2rpm($_) } @_; } return _arch2rpm($_[0]); } sub _arch2rpm { my $arch = shift; return "\%ix86" if $arch eq "i386"; return $arch; } sub append_changelog { my $changelog = $_[1]; if ($_[0] =~ s/\%changelog$/$changelog/) { return; } $_[0] .= $changelog; } sub provides_obsoletes { my $flavor = shift; my @archs = @_; my $res = ""; for my $arch (@archs) { my @packs = `$dir/guards $arch $flavor <$dir/old-packages.conf`; chomp @packs; next if (!@packs); my $rpmarch = arch2rpm($arch); chomp $rpmarch; $res .= "\%ifarch $rpmarch\n"; $res .= "Provides: @packs\n"; $res .= "Obsoletes: @packs\n"; $res .= "\%endif\n"; } chomp $res; return $res; } sub do_spec { my $template = shift; my $specfile = shift; my %macros = @_; my $text = $templates{$template}; for my $m (keys %macros) { $text =~ s/\@$m\@/$macros{$m}/g; } append_changelog($text, $changelog); print "$specfile\n"; xopen(my $fh, '>', "$dir/$specfile"); print $fh $text; close($fh); return if $specfile eq "kernel-source$variant.spec"; my $changesfile = $specfile; $changesfile =~ s/\.spec$//; $changesfile .= ".changes"; copy("$dir/kernel-source$variant.changes", $changesfile); } sub xopen { open($_[0], $_[1], $_[2]) or die "$_[2]: $!\n"; } ++++++ modversions ++++++ --- /var/tmp/diff_new_pack.zL7515/_old 2009-05-20 10:56:13.000000000 +0200 +++ /var/tmp/diff_new_pack.zL7515/_new 2009-05-20 10:56:13.000000000 +0200 @@ -47,6 +47,7 @@ my @files; $ext = ".symtypes" unless defined $ext; + $dir =~ s/\/+$//; find(sub ($) { /\Q$ext\E$/ && push @files, $File::Find::name}, $dir); map { s/^\Q$dir\E\/(.*)\Q$ext\E$/$1/ } @files; @@ -83,6 +84,7 @@ delete $override{$sym}; } else { $override{$sym} = 1; + $_ = "$override$_"; } } } ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.zL7515/_old 2009-05-20 10:56:13.000000000 +0200 +++ /var/tmp/diff_new_pack.zL7515/_new 2009-05-20 10:56:13.000000000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ old-packages.conf ++++++ # Defines which package names to include in the Provides and # Obsoletes tags of spec files. # # When generating Provides, `p' is defined. When generating # Obsoletes, `o' is defined. # # +ARCH: include only for this architecture. # -!symbol: exclude unless symbol is also defined. # # Guards are always evaluated from left to right; the last # guard that matches determines whether a line is included # or not. # # For testing this file, run scripts/old-config.sh. # # i386 ================================================================= +i386 -!default smp kernel-smp kernel-pae kernel-bigsmp # x86_64 =============================================================== +x86_64 -!default smp kernel-smp # ia64 ================================================================= +ia64 -!default kernel-sn2 # ppc/ppc64 ============================================================ +ppc -!ppc64 kernel-pmac64 kernel-pseries64 kernel-iseries64 # s390/s390x =========================================================== +s390 -!s390 kernel-32bit +s390x -!s390x kernel-64bit ++++++ package-descriptions ++++++ # Descriptions of the binary kernel packages. The format is # # === <package name> === # Summary (single line) # # Long description (multiple # lines) # # Descriptions of the -base and -extra subpackages are derived from the # main descriptions. === kernel-debug === A Debug Version of the Kernel This kernel has several debug facilities enabled that hurt performance. Only use this kernel when investigating problems. === kernel-default === The Standard Kernel The standard kernel for both uniprocessor and multiprocessor systems. === kernel-legacy === The Legacy Kernel The kernel for both uniprocessor and multiprocessor systems to run on older hardware. It contains support for ISA devices and has the Physical Addressing Extension (PAE) feature disabled. === kernel-kdump === kernel for kdump This kernel is intended for kdump. It can not be booted with a normal bootloader, the kexec tool has to be used to load it. Once the system crashes, the loaded kernel will be started to grab debug info from the crashed kernel. === kernel-ppc64 === Kernel for ppc64 Systems This package contains the kernel for: IBM pSeries 64bit machines IBM iSeries 64bit machines Apple G5 machines Sony Playstation 3 The boot file is /boot/vmlinux. The home page of the ppc64 project is http://www.penguinppc.org/ === kernel-ps3 === kernel for ps3 bootloader This package contains the kernel for the PS3 bootloader. PS3 systems only have 4MB of flash memory for the bootloader, so this kernel needs to be as small as possible and is _not_ meant to be installed in the final system. === kernel-s390 === The Standard Kernel The standard kernel. === kernel-trace === The Realtime Linux Kernel This kernel is compiled for realtime applications. === kernel-vanilla === The Standard Kernel - without any SUSE patches The standard kernel - without any SUSE patches === kernel-xen === The Xen Kernel The Linux kernel for Xen paravirtualization. This kernel can be used both as the domain0 ("xen0") and as an unprivileged ("xenU") kernel. ++++++ patches.addon.tar.bz2 ++++++ ++++++ patches.apparmor.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/unambiguous-__d_path.diff new/patches.apparmor/unambiguous-__d_path.diff --- old/patches.apparmor/unambiguous-__d_path.diff 2009-02-02 17:36:17.000000000 +0100 +++ new/patches.apparmor/unambiguous-__d_path.diff 2009-04-28 11:20:09.000000000 +0200 @@ -24,6 +24,9 @@ Signed-off-by: John Johansen <jjohansen(a)suse.de> Acked-by: Alan Cox <alan(a)lxorguk.ukuu.org.uk> +XXX: note! Must fix lock order reversal and take vfsmount_lock inside +dcache_lock (see bnc#490902). + --- fs/dcache.c | 126 +++++++++++++++++++++++++++---------------------- fs/seq_file.c | 4 - ++++++ patches.arch.tar.bz2 ++++++ 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-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch 2009-05-05 10:09:06.000000000 +0200 @@ -18,7 +18,7 @@ --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -711,6 +711,11 @@ and is between 256 and 4096 characters. +@@ -647,6 +647,11 @@ and is between 256 and 4096 characters. eata= [HW,SCSI] @@ -41,7 +41,7 @@ static int EC_FLAGS_MSI; /* Out-of-spec MSI controller */ /* -------------------------------------------------------------------------- -@@ -884,6 +886,8 @@ static int ec_install_handlers(struct ac +@@ -898,6 +900,8 @@ static int ec_install_handlers(struct ac &acpi_ec_gpe_handler, ec); if (ACPI_FAILURE(status)) return -ENODEV; @@ -50,7 +50,7 @@ acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME); acpi_enable_gpe(NULL, ec->gpe); status = acpi_install_address_space_handler(ec->handle, -@@ -1104,3 +1108,14 @@ static void __exit acpi_ec_exit(void) +@@ -1113,3 +1117,14 @@ static void __exit acpi_ec_exit(void) return; } #endif /* 0 */ 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-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/acpi-export-hotplug_execute 2009-05-05 10:09:06.000000000 +0200 @@ -13,7 +13,7 @@ --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c -@@ -786,6 +786,7 @@ acpi_status acpi_os_hotplug_execute(acpi +@@ -793,6 +793,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_thermal_passive_blacklist.patch new/patches.arch/acpi_thermal_passive_blacklist.patch --- old/patches.arch/acpi_thermal_passive_blacklist.patch 2009-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/acpi_thermal_passive_blacklist.patch 2009-05-05 10:09:06.000000000 +0200 @@ -9,15 +9,15 @@ --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -42,6 +42,7 @@ - #include <linux/kmod.h> #include <linux/seq_file.h> #include <linux/reboot.h> + #include <linux/device.h> +#include <linux/dmi.h> #include <asm/uaccess.h> #include <linux/thermal.h> #include <acpi/acpi_bus.h> -@@ -1649,6 +1650,66 @@ static int acpi_thermal_get_info(struct - return 0; +@@ -1334,6 +1335,66 @@ static int acpi_thermal_get_info(struct + tz->kelvin_offset = 2732; } +static struct dmi_system_id thermal_psv_dmi_table[] = { @@ -83,7 +83,7 @@ static int acpi_thermal_add(struct acpi_device *device) { int result = 0; -@@ -1679,6 +1740,18 @@ static int acpi_thermal_add(struct acpi_ +@@ -1364,6 +1425,18 @@ static int acpi_thermal_add(struct acpi_ if (result) goto free_memory; 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-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch 2009-05-05 10:09:06.000000000 +0200 @@ -16,34 +16,21 @@ a warning that acpi=rsdt is the prefered method of forcing. * Moved the dmi table stuff to the main dmi table in x86/kernel/acpi/boot. +Update: Apr 10 2009 jeffm +* Removed documentation, since it's deprecated. + Signed-off-by: Thomas Renninger <trenn(a)suse.de> Tested-by: Mark Doughty <me(a)markdoughty.co.uk> CC: Yakui Zhao <yakui.zhao(a)intel.com> --- - Documentation/kernel-parameters.txt | 6 ++++ - arch/x86/kernel/acpi/boot.c | 53 ++++++++++++++++++++++++++++++++++++ - drivers/acpi/tables.c | 3 ++ - 3 files changed, 62 insertions(+) + arch/x86/kernel/acpi/boot.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ + drivers/acpi/tables.c | 3 ++ + 2 files changed, 56 insertions(+) ---- a/Documentation/kernel-parameters.txt -+++ b/Documentation/kernel-parameters.txt -@@ -258,6 +258,12 @@ and is between 256 and 4096 characters. - to assume that this machine's pmtimer latches its value - and always returns good values. - -+ acpi_root_table= [X86,ACPI] -+ { rsdt } -+ rsdt: Take RSDT address for fetching -+ ACPI tables (instead of XSDT) -+ For compatibility. Use acpi=rsdt instead. -+ - agp= [AGP] - { off | try_unsupported } - off: disable AGP support --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c -@@ -1491,6 +1491,21 @@ static int __init dmi_ignore_irq0_timer_ +@@ -1523,6 +1523,21 @@ static int __init dmi_ignore_irq0_timer_ return 0; } @@ -64,8 +51,8 @@ + /* * If your system is blacklisted here, but you find that acpi=force - * works for you, please contact acpi-devel(a)sourceforge.net -@@ -1658,6 +1673,32 @@ static struct dmi_system_id __initdata a + * works for you, please contact linux-acpi(a)vger.kernel.org +@@ -1690,6 +1705,32 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), }, }, @@ -98,7 +85,7 @@ {} }; -@@ -1858,6 +1899,18 @@ static int __init parse_acpi(char *arg) +@@ -1890,6 +1931,18 @@ static int __init parse_acpi(char *arg) } early_param("acpi", parse_acpi); @@ -119,7 +106,7 @@ { --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c -@@ -295,6 +295,9 @@ int __init acpi_table_init(void) +@@ -333,6 +333,9 @@ int __init acpi_table_init(void) { acpi_status status; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/acpi_thinkpad_remove_R40e_c-state_blacklist.patch new/patches.arch/acpi_thinkpad_remove_R40e_c-state_blacklist.patch --- old/patches.arch/acpi_thinkpad_remove_R40e_c-state_blacklist.patch 2009-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/acpi_thinkpad_remove_R40e_c-state_blacklist.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,98 +0,0 @@ -From: Thomas Renninger <trenn(a)suse.de> -Subject: Remove R40e c-state blacklist -Patch-mainline: not yet -References: http://bugzilla.kernel.org/show_bug.cgi?id=8246 - -This one is part of a patch series: -acpi_thinkpad_introduce_acpi_root_table_boot_param.patch -acpi_thinkpad_introduce_acpica_rsdt_global_variable.patch -acpi_thinkpad_remove_R40e_c-state_blacklist.patch - - -The FADT pointed to through XSDT is wrong on this (and similar) -machines. -The HW addresses to switch C-states are coming from the FADT. -When using the FADT pointed to in the RSDT the info is correct. -Previous patches blacklist this machine to use the right FADT and -C-states finally work fine. - -Signed-off-by: Thomas Renninger <trenn(a)suse.de> -Tested-by: Mark Doughty <me(a)markdoughty.co.uk> - -Remove R40e c-state blacklist - -The FADT pointed to through XSDT is wrong on this (and similar) machines. -The HW addresses to switch C-states are coming from the FADT. -When using the FADT pointed to in the RSDT the info is correct. -Previous patches blacklist this machine to use the right FADT and -C-states finally work fine. - -Signed-off-by: Thomas Renninger <trenn(a)suse.de> -Tested-by: Mark Doughty <me(a)markdoughty.co.uk> -CC: Yakui Zhao <yakui.zhao(a)intel.com> - - ---- - drivers/acpi/processor_idle.c | 51 ------------------------------------------ - 1 file changed, 51 deletions(-) - ---- a/drivers/acpi/processor_idle.c -+++ b/drivers/acpi/processor_idle.c -@@ -101,57 +101,6 @@ static int set_max_cstate(const struct d - /* Actually this shouldn't be __cpuinitdata, would be better to fix the - callers to only run once -AK */ - static struct dmi_system_id __cpuinitdata processor_power_dmi_table[] = { -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET70WW")}, (void *)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW")}, (void *)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET43WW") }, (void*)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET45WW") }, (void*)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET47WW") }, (void*)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET50WW") }, (void*)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET52WW") }, (void*)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET55WW") }, (void*)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET56WW") }, (void*)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET59WW") }, (void*)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW") }, (void*)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET61WW") }, (void*)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET62WW") }, (void*)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET64WW") }, (void*)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET65WW") }, (void*)1}, -- { set_max_cstate, "IBM ThinkPad R40e", { -- DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -- DMI_MATCH(DMI_BIOS_VERSION,"1SET68WW") }, (void*)1}, -- { set_max_cstate, "Medion 41700", { -- DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), -- DMI_MATCH(DMI_BIOS_VERSION,"R01-A1J")}, (void *)1}, - { set_max_cstate, "Clevo 5600D", { - DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), - DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")}, 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-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/ia64-page-migration 2009-05-05 10:09:06.000000000 +0200 @@ -26,7 +26,7 @@ --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig -@@ -506,6 +506,15 @@ config COMPAT_FOR_U64_ALIGNMENT +@@ -512,6 +512,15 @@ config COMPAT_FOR_U64_ALIGNMENT config IA64_MCA_RECOVERY tristate "MCA recovery from errors other than TLB." @@ -80,14 +80,14 @@ --- a/arch/ia64/kernel/Makefile +++ b/arch/ia64/kernel/Makefile -@@ -27,6 +27,7 @@ obj-$(CONFIG_PERFMON) += perfmon_defaul +@@ -31,6 +31,7 @@ obj-$(CONFIG_PERFMON) += perfmon_defaul obj-$(CONFIG_IA64_CYCLONE) += cyclone.o obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o +obj-$(CONFIG_IA64_CPE_MIGRATE) += cpe_migrate.o obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o + obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o - obj-$(CONFIG_CRASH_DUMP) += crash_dump.o --- /dev/null +++ b/arch/ia64/kernel/cpe_migrate.c @@ -0,0 +1,434 @@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ia64-rwlocks-enable-interrupts new/patches.arch/ia64-rwlocks-enable-interrupts --- old/patches.arch/ia64-rwlocks-enable-interrupts 2009-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/ia64-rwlocks-enable-interrupts 1970-01-01 01:00:00.000000000 +0100 @@ -1,112 +0,0 @@ -From: Petr Tesarik <ptesarik(a)suse.cz> -Subject: [ia64] re-enable interrupts when waiting for a rwlock -References: bnc#387784 -Mainline: no - -Re-enable interrupts for _read_lock_irqsave() and _write_lock_irqsave() -while waiting for the lock if interrupts were enabled in the caller. - -Signed-off-by: Petr Tesarik <ptesarik(a)suse.cz> - ---- - arch/ia64/include/asm/spinlock.h | 49 ++++++++++++++++++++++++++++++++++----- - 1 file changed, 43 insertions(+), 6 deletions(-) - ---- a/arch/ia64/include/asm/spinlock.h -+++ b/arch/ia64/include/asm/spinlock.h -@@ -120,6 +120,35 @@ do { \ - #define __raw_read_can_lock(rw) (*(volatile int *)(rw) >= 0) - #define __raw_write_can_lock(rw) (*(volatile int *)(rw) == 0) - -+#ifdef ASM_SUPPORTED -+#define __raw_read_lock_flags(rw, flags) \ -+do { \ -+ __asm__ __volatile__ ( \ -+ "tbit.nz p6,p0 = %1,%2\n" \ -+ "br.few 3f\n" \ -+ "1:\n" \ -+ "fetchadd4.rel r2 = [%0],-1;;\n" \ -+ "(p6) ssm psr.i\n" \ -+ "2:\n" \ -+ "hint @pause\n" \ -+ "ld4 r2 = [%0];;\n" \ -+ "cmp4.lt p7,p0 = r2,r0\n" \ -+ "(p7) br.cond.spnt.few 2b\n" \ -+ "(p6) rsm psr.i;;\n" \ -+ "3:\n" \ -+ "fetchadd4.acq r2 = [%0],1;;\n" \ -+ "cmp4.lt p7,p0 = r2,r0\n" \ -+ "(p7) br.cond.spnt.few 1b\n" \ -+ :: "r"(rw), "r"(flags), "i"(IA64_PSR_I_BIT) \ -+ : "p6", "p7", "r2", "memory"); \ -+} while(0) -+ -+#define __raw_read_lock(lock) __raw_read_lock_flags(lock, 0) -+ -+#else /* !ASM_SUPPORTED */ -+ -+#define __raw_read_lock_flags(rw, flags) __raw_read_lock(rw) -+ - #define __raw_read_lock(rw) \ - do { \ - raw_rwlock_t *__read_lock_ptr = (rw); \ -@@ -131,6 +160,8 @@ do { \ - } \ - } while (0) - -+#endif /* !ASM_SUPPORTED */ -+ - #define __raw_read_unlock(rw) \ - do { \ - raw_rwlock_t *__read_lock_ptr = (rw); \ -@@ -138,21 +169,28 @@ do { \ - } while (0) - - #ifdef ASM_SUPPORTED --#define __raw_write_lock(rw) \ -+#define __raw_write_lock_flags(rw, flags) \ - do { \ - __asm__ __volatile__ ( \ - "mov ar.ccv = r0\n" \ -+ "tbit.nz p6,p0 = %1,%2\n" \ - "dep r29 = -1, r0, 31, 1;;\n" \ - "1:\n" \ -+ "(p6) ssm psr.i\n" \ -+ "2:\n" \ - "ld4 r2 = [%0];;\n" \ - "cmp4.eq p0,p7 = r0,r2\n" \ -- "(p7) br.cond.spnt.few 1b \n" \ -+ "(p7) br.cond.spnt.few 2b \n" \ -+ "(p6) rsm psr.i;;\n" \ - "cmpxchg4.acq r2 = [%0], r29, ar.ccv;;\n" \ - "cmp4.eq p0,p7 = r0, r2\n" \ - "(p7) br.cond.spnt.few 1b;;\n" \ -- :: "r"(rw) : "ar.ccv", "p7", "r2", "r29", "memory"); \ -+ :: "r"(rw), "r"(flags), "i"(IA64_PSR_I_BIT) \ -+ : "ar.ccv", "p6", "p7", "r2", "r29", "memory"); \ - } while(0) - -+#define __raw_write_lock(rw) __raw_write_lock_flags(rw, 0) -+ - #define __raw_write_trylock(rw) \ - ({ \ - register long result; \ -@@ -174,6 +212,8 @@ static inline void __raw_write_unlock(ra - - #else /* !ASM_SUPPORTED */ - -+#define __raw_write_lock_flags(l, flags) __raw_write_lock(l) -+ - #define __raw_write_lock(l) \ - ({ \ - __u64 ia64_val, ia64_set_val = ia64_dep_mi(-1, 0, 31, 1); \ -@@ -213,9 +253,6 @@ static inline int __raw_read_trylock(raw - return (u32)ia64_cmpxchg4_acq((__u32 *)(x), new.word, old.word) == old.word; - } - --#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock) --#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock) -- - #define _raw_spin_relax(lock) cpu_relax() - #define _raw_read_relax(lock) cpu_relax() - #define _raw_write_relax(lock) cpu_relax() 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-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/mm-avoid-bad-page-on-lru 2009-05-05 10:09:06.000000000 +0200 @@ -21,15 +21,15 @@ --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h -@@ -84,6 +84,7 @@ enum pageflags { - PG_private, /* If pagecache, has fs-private data */ +@@ -85,6 +85,7 @@ enum pageflags { + PG_private_2, /* If pagecache, has fs aux data */ PG_writeback, /* Page is under writeback */ #ifdef CONFIG_PAGEFLAGS_EXTENDED + PG_memerror, /* Page has a physical memory error */ PG_head, /* A head page */ PG_tail, /* A tail page */ #else -@@ -152,15 +153,21 @@ static inline int TestSetPage##uname(str +@@ -161,15 +162,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) \ -@@ -365,6 +372,12 @@ static inline void __ClearPageTail(struc +@@ -382,6 +389,12 @@ static inline void __ClearPageTail(struc #endif /* !PAGEFLAGS_EXTENDED */ @@ -64,7 +64,7 @@ + #ifdef CONFIG_UNEVICTABLE_LRU #define __PG_UNEVICTABLE (1 << PG_unevictable) - #define __PG_MLOCKED (1 << PG_mlocked) + #else --- a/mm/migrate.c +++ b/mm/migrate.c @@ -52,6 +52,7 @@ int migrate_prep(void) @@ -137,7 +137,7 @@ /* --- a/mm/vmscan.c +++ b/mm/vmscan.c -@@ -1035,6 +1035,7 @@ int isolate_lru_page(struct page *page) +@@ -1042,6 +1042,7 @@ int isolate_lru_page(struct page *page) } return ret; } 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-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/ppc64-xmon-dmesg-printing.patch 2009-05-05 10:09:06.000000000 +0200 @@ -106,7 +106,7 @@ { --- a/kernel/printk.c +++ b/kernel/printk.c -@@ -387,6 +387,21 @@ SYSCALL_DEFINE3(syslog, int, type, char +@@ -405,6 +405,21 @@ SYSCALL_DEFINE3(syslog, int, type, char return do_syslog(type, buf, len); } 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-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/ppc-efika-mpc52xx-ac97.patch 2009-05-05 10:09:06.000000000 +0200 @@ -29,7 +29,7 @@ #define MPC52xx_PSC_SR_RXFULL 0x0200 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c -@@ -2122,6 +2122,7 @@ static void __init fixup_device_tree_efi +@@ -2124,6 +2124,7 @@ static void __init fixup_device_tree_efi static void __init fixup_device_tree_efika(void) { @@ -37,7 +37,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, -@@ -2177,6 +2178,8 @@ static void __init fixup_device_tree_efi +@@ -2179,6 +2180,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)); @@ -48,7 +48,7 @@ --- a/sound/ppc/Kconfig +++ b/sound/ppc/Kconfig -@@ -48,4 +48,19 @@ config SND_PS3_DEFAULT_START_DELAY +@@ -49,4 +49,19 @@ config SND_PS3_DEFAULT_START_DELAY depends on SND_PS3 default "2000" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ipic-suspend-without-83xx-fix new/patches.arch/ppc-ipic-suspend-without-83xx-fix --- old/patches.arch/ppc-ipic-suspend-without-83xx-fix 2009-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/ppc-ipic-suspend-without-83xx-fix 2009-05-05 10:09:06.000000000 +0200 @@ -15,7 +15,7 @@ --- a/arch/powerpc/sysdev/ipic.c +++ b/arch/powerpc/sysdev/ipic.c -@@ -920,6 +920,7 @@ static int ipic_suspend(struct sys_devic +@@ -918,6 +918,7 @@ static int ipic_suspend(struct sys_devic ipic_saved_state.sermr = ipic_read(ipic->regs, IPIC_SERMR); ipic_saved_state.sercr = ipic_read(ipic->regs, IPIC_SERCR); @@ -23,7 +23,7 @@ if (fsl_deep_sleep()) { /* In deep sleep, make sure there can be no * pending interrupts, as this can cause -@@ -930,6 +931,7 @@ static int ipic_suspend(struct sys_devic +@@ -928,6 +929,7 @@ static int ipic_suspend(struct sys_devic ipic_write(ipic->regs, IPIC_SEMSR, 0); ipic_write(ipic->regs, IPIC_SERMR, 0); } 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-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/ppc-prom-nodisplay.patch 2009-05-05 10:09:06.000000000 +0200 @@ -76,7 +76,7 @@ #ifdef CONFIG_PPC64 opt = strstr(RELOC(prom_cmd_line), RELOC("iommu=")); if (opt) { -@@ -2336,6 +2343,7 @@ unsigned long __init prom_init(unsigned +@@ -2340,6 +2347,7 @@ unsigned long __init prom_init(unsigned /* * Initialize display devices */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-spufs-07-Don-t-spu_acquire_saved-unnecessarily.patch new/patches.arch/ppc-spufs-07-Don-t-spu_acquire_saved-unnecessarily.patch --- old/patches.arch/ppc-spufs-07-Don-t-spu_acquire_saved-unnecessarily.patch 2009-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/ppc-spufs-07-Don-t-spu_acquire_saved-unnecessarily.patch 2009-05-05 10:09:06.000000000 +0200 @@ -18,7 +18,7 @@ --- a/arch/powerpc/platforms/cell/spufs/file.c +++ b/arch/powerpc/platforms/cell/spufs/file.c -@@ -607,6 +607,11 @@ spufs_fpcr_read(struct file *file, char +@@ -608,6 +608,11 @@ spufs_fpcr_read(struct file *file, char int ret; struct spu_context *ctx = file->private_data; 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-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/s390-08-02-zfcp-gpn-align-fix.diff 2009-05-05 10:09:06.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 -@@ -319,6 +319,14 @@ struct ct_iu_gid_pn_resp { +@@ -315,6 +315,14 @@ struct ct_iu_gid_pn_resp { u32 d_id; } __attribute__ ((packed)); @@ -82,7 +82,7 @@ struct gpn_ft_resp_acc { u8 control; u8 port_id[3]; -@@ -449,7 +441,8 @@ static void zfcp_free_sg_env(struct zfcp +@@ -469,7 +461,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); -@@ -464,7 +457,7 @@ static struct zfcp_gpn_ft *zfcp_alloc_sg +@@ -484,7 +477,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/s390-08-05-af_iucv-msgpeek-fix.patch new/patches.arch/s390-08-05-af_iucv-msgpeek-fix.patch --- old/patches.arch/s390-08-05-af_iucv-msgpeek-fix.patch 2009-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/s390-08-05-af_iucv-msgpeek-fix.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -From: Gerald Schaefer <geraldsc(a)de.ibm.com> -Subject: af_iucv: System hang if recvmsg() is used with MSG_PEEK -References: bnc#466462,LTC#51136 - -Symptom: Receiving socket data with MSG_PEEK flag set causes systen hang -Problem: If iucv_sock_recvmsg() is called with MSG_PEEK flag set, - the skb is enqueued twice. If the socket is then closed, the - pointer to the skb is also freed twice and causes a kernel oops. -Solution: Remove the skb_queue_head() call for MSG_PEEK, because the - skb_recv_datagram() function already handles MSG_PEEK (it - actually does not dequeue the skb). - -Acked-by: John Jolly <jjolly(a)suse.de> ---- - net/iucv/af_iucv.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/net/iucv/af_iucv.c -+++ b/net/iucv/af_iucv.c -@@ -811,6 +811,8 @@ static int iucv_sock_recvmsg(struct kioc - - target = sock_rcvlowat(sk, flags & MSG_WAITALL, len); - -+ /* receive/dequeue next skb: -+ * the function understands MSG_PEEK and, thus, does not dequeue skb */ - skb = skb_recv_datagram(sk, flags, noblock, &err); - if (!skb) { - if (sk->sk_shutdown & RCV_SHUTDOWN) -@@ -858,9 +860,7 @@ static int iucv_sock_recvmsg(struct kioc - iucv_process_message_q(sk); - spin_unlock_bh(&iucv->message_q.lock); - } -- -- } else -- skb_queue_head(&sk->sk_receive_queue, skb); -+ } - - done: - return err ? : copied; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86_64-hpet-64bit-timer.patch new/patches.arch/x86_64-hpet-64bit-timer.patch --- old/patches.arch/x86_64-hpet-64bit-timer.patch 2009-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/x86_64-hpet-64bit-timer.patch 2009-05-05 10:09:06.000000000 +0200 @@ -45,8 +45,8 @@ --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -497,6 +497,8 @@ and is between 256 and 4096 characters. - force: allow force enabled of undocumented chips (ICH4, - VIA, nVidia) + Range: 0 - 8192 + Default: 64 + hpet64 [X86-64,HPET] enable 64-bit mode of the HPET timer (bnc#456700) + @@ -162,14 +162,7 @@ /* * The mult factor is defined as (include/linux/clockchips.h) -@@ -266,28 +334,30 @@ static void hpet_set_mode(enum clock_eve - case CLOCK_EVT_MODE_PERIODIC: - delta = ((uint64_t)(NSEC_PER_SEC/HZ)) * evt->mult; - delta >>= evt->shift; -- now = hpet_readl(HPET_COUNTER); -+ now = hpet_read_value(HPET_COUNTER); - cmp = now + (unsigned long) delta; - cfg = hpet_readl(HPET_Tn_CFG(timer)); +@@ -266,20 +334,22 @@ static void hpet_set_mode(enum clock_eve /* Make sure we use edge triggered interrupts */ cfg &= ~HPET_TN_LEVEL; cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC | 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-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/x86_64-unwind-annotations 2009-05-05 10:09:06.000000000 +0200 @@ -4,48 +4,12 @@ References: bnc#472783 --- - arch/x86/kernel/entry_64.S | 2 -- - arch/x86/kernel/head_64.S | 13 +++++++++++++ - 2 files changed, 13 insertions(+), 2 deletions(-) + arch/x86/kernel/entry_64.S | 193 +++++++++++++++++++++++---------------------- + arch/x86/kernel/head_64.S | 13 +++ + 2 files changed, 115 insertions(+), 91 deletions(-) ---- a/arch/x86/kernel/head_64.S 2009-03-10 16:26:21.000000000 +0100 -+++ b/arch/x86/kernel/head_64.S 2009-02-18 13:38:09.000000000 +0100 -@@ -280,6 +280,8 @@ early_idt_handlers: - - ENTRY(early_idt_handler) - #ifdef CONFIG_EARLY_PRINTK -+#include <asm/calling.h> -+#include <asm/dwarf2.h> - cmpl $2,early_recursion_flag(%rip) - jz 1f - incl early_recursion_flag(%rip) -@@ -295,6 +297,16 @@ ENTRY(early_idt_handler) - testl $0x27d00,%eax - je 0f - popq %r8 # get error code -+ -+ CFI_STARTPROC simple -+ CFI_SIGNAL_FRAME -+ CFI_DEF_CFA rsp, SS+8-RIP -+# CFI_REL_OFFSET ss, SS-RIP -+ CFI_REL_OFFSET rsp, RSP-RIP -+# CFI_REL_OFFSET rflags, EFLAGS-RIP -+# CFI_REL_OFFSET cs, CS-RIP -+ CFI_REL_OFFSET rip, RIP-RIP -+ - 0: movq 0(%rsp),%rcx # get ip - movq 8(%rsp),%rdx # get cs - xorl %eax,%eax -@@ -308,6 +320,7 @@ ENTRY(early_idt_handler) - movq 0(%rsp),%rsi # get rip again - call __print_symbol - #endif -+ CFI_ENDPROC - #endif /* EARLY_PRINTK */ - 1: hlt - jmp 1b ---- a/arch/x86/kernel/entry_64.S 2009-03-10 16:26:21.000000000 +0100 -+++ b/arch/x86/kernel/entry_64.S 2009-03-10 16:41:53.000000000 +0100 +--- a/arch/x86/kernel/entry_64.S ++++ b/arch/x86/kernel/entry_64.S @@ -38,6 +38,7 @@ */ @@ -54,7 +18,7 @@ #include <asm/segment.h> #include <asm/cache.h> #include <asm/errno.h> -@@ -255,21 +256,21 @@ ENTRY(native_usergs_sysret64) +@@ -251,21 +252,21 @@ ENDPROC(native_usergs_sysret64) /* * initial frame state for interrupts (and exceptions without error code) */ @@ -83,7 +47,7 @@ /*CFI_REL_OFFSET ss, SS+\offset-RIP*/ CFI_REL_OFFSET rsp, RSP+\offset-RIP /*CFI_REL_OFFSET rflags, EFLAGS+\offset-RIP*/ -@@ -282,15 +283,16 @@ ENTRY(native_usergs_sysret64) +@@ -278,15 +279,16 @@ ENDPROC(native_usergs_sysret64) * with vector already pushed) */ .macro XCPT_FRAME start=1 offset=0 @@ -103,7 +67,7 @@ CFI_REL_OFFSET rdi, RDI+\offset-ARGOFFSET CFI_REL_OFFSET rsi, RSI+\offset-ARGOFFSET CFI_REL_OFFSET rdx, RDX+\offset-ARGOFFSET -@@ -306,7 +308,9 @@ ENTRY(native_usergs_sysret64) +@@ -302,7 +304,9 @@ ENDPROC(native_usergs_sysret64) * frame that enables passing a complete pt_regs to a C function. */ .macro DEFAULT_FRAME start=1 offset=0 @@ -114,7 +78,7 @@ CFI_REL_OFFSET rbx, RBX+\offset CFI_REL_OFFSET rbp, RBP+\offset CFI_REL_OFFSET r12, R12+\offset -@@ -317,21 +321,23 @@ ENTRY(native_usergs_sysret64) +@@ -313,21 +317,23 @@ ENDPROC(native_usergs_sysret64) /* save partial stack frame */ ENTRY(save_args) @@ -148,13 +112,13 @@ testl $3, CS(%rdi) je 1f SWAPGS -@@ -343,11 +349,10 @@ ENTRY(save_args) +@@ -339,11 +345,10 @@ ENTRY(save_args) */ - 1: incl %gs:pda_irqcount + 1: incl PER_CPU_VAR(irq_count) jne 2f - popq_cfi %rax /* move return address... */ + popq %rax /* move return address... */ - mov %gs:pda_irqstackptr,%rsp + mov PER_CPU_VAR(irq_stack_ptr),%rsp - EMPTY_FRAME 0 - pushq_cfi %rbp /* backlink for unwinder */ - pushq_cfi %rax /* ... to the new stack */ @@ -163,7 +127,7 @@ /* * We entered an interrupt context - irqs are off: */ -@@ -357,14 +362,14 @@ ENTRY(save_args) +@@ -353,14 +358,14 @@ ENTRY(save_args) END(save_args) ENTRY(save_rest) @@ -185,9 +149,9 @@ movq %r11, 8(%rsp) /* return address */ FIXUP_TOP_OF_STACK %r11, 16 ret -@@ -373,23 +378,23 @@ END(save_rest) - +@@ -370,23 +375,23 @@ END(save_rest) /* save complete stack frame */ + .pushsection .kprobes.text, "ax" ENTRY(save_paranoid) - XCPT_FRAME 1 RDI+8 + XCPT_FRAME offset=__stringify(ORIG_RAX-R15+8) @@ -225,23 +189,7 @@ movl $1,%ebx movl $MSR_GS_BASE,%ecx rdmsr -@@ -418,7 +423,6 @@ ENTRY(ret_from_fork) - - GET_THREAD_INFO(%rcx) - -- CFI_REMEMBER_STATE - RESTORE_REST - - testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread? -@@ -430,7 +434,6 @@ ENTRY(ret_from_fork) - RESTORE_TOP_OF_STACK %rdi, -ARGOFFSET - jmp ret_from_sys_call # go to the SYSRET fastpath - -- CFI_RESTORE_STATE - CFI_ENDPROC - END(ret_from_fork) - -@@ -706,7 +709,7 @@ ENTRY(\label) +@@ -702,7 +707,7 @@ ENTRY(\label) subq $REST_SKIP, %rsp CFI_ADJUST_CFA_OFFSET REST_SKIP call save_rest @@ -250,7 +198,7 @@ leaq 8(%rsp), \arg /* pt_regs pointer */ call \func jmp ptregscall_common -@@ -723,12 +726,12 @@ END(\label) +@@ -719,12 +724,12 @@ END(\label) ENTRY(ptregscall_common) DEFAULT_FRAME 1 8 /* offset 8: return address */ RESTORE_TOP_OF_STACK %r11, 8 @@ -269,7 +217,7 @@ ret $REST_SKIP /* pop extended registers */ CFI_ENDPROC END(ptregscall_common) -@@ -817,10 +820,12 @@ END(interrupt) +@@ -813,10 +818,12 @@ END(interrupt) /* 0(%rsp): ~(interrupt number) */ .macro interrupt func @@ -285,7 +233,7 @@ call \func .endm -@@ -1037,10 +1042,10 @@ ENTRY(\sym) +@@ -1033,10 +1040,10 @@ ENTRY(\sym) INTR_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */ @@ -299,7 +247,7 @@ movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ call \do_sym -@@ -1055,8 +1060,10 @@ ENTRY(\sym) +@@ -1051,8 +1058,10 @@ ENTRY(\sym) PARAVIRT_ADJUST_EXCEPTION_FRAME pushq $-1 /* ORIG_RAX: no syscall to restart */ CFI_ADJUST_CFA_OFFSET 8 @@ -311,7 +259,7 @@ TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ -@@ -1072,8 +1079,10 @@ ENTRY(\sym) +@@ -1068,8 +1077,10 @@ ENTRY(\sym) PARAVIRT_ADJUST_EXCEPTION_FRAME pushq $-1 /* ORIG_RAX: no syscall to restart */ CFI_ADJUST_CFA_OFFSET 8 @@ -323,7 +271,7 @@ TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ -@@ -1090,10 +1099,10 @@ END(\sym) +@@ -1086,10 +1097,10 @@ END(\sym) ENTRY(\sym) XCPT_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME @@ -337,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 */ -@@ -1108,10 +1117,10 @@ END(\sym) +@@ -1104,10 +1115,10 @@ END(\sym) ENTRY(\sym) XCPT_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME @@ -351,7 +299,7 @@ TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ -@@ -1463,7 +1472,7 @@ paranoidzeroentry machine_check do_machi +@@ -1461,7 +1472,7 @@ paranoidzeroentry machine_check do_machi /* ebx: no swapgs flag */ ENTRY(paranoid_exit) @@ -360,7 +308,7 @@ DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF testl %ebx,%ebx /* swapgs needed? */ -@@ -1510,25 +1519,24 @@ END(paranoid_exit) +@@ -1511,25 +1522,24 @@ END(paranoid_exit) * returns in "no swapgs flag" in %ebx. */ ENTRY(error_entry) @@ -402,7 +350,7 @@ xorl %ebx,%ebx testl $3,CS+8(%rsp) je error_kernelspace -@@ -1537,7 +1545,6 @@ error_swapgs: +@@ -1538,7 +1548,6 @@ error_swapgs: error_sti: TRACE_IRQS_OFF ret @@ -410,7 +358,7 @@ /* * There are two places in the kernel that can potentially fault with -@@ -1547,6 +1554,7 @@ error_sti: +@@ -1548,6 +1557,7 @@ error_sti: * compat mode. Check for these here too. */ error_kernelspace: @@ -418,7 +366,7 @@ incl %ebx leaq irq_return(%rip),%rcx cmpq %rcx,RIP+8(%rsp) -@@ -1557,6 +1565,7 @@ error_kernelspace: +@@ -1558,6 +1568,7 @@ error_kernelspace: cmpq $gs_change,RIP+8(%rsp) je error_swapgs jmp error_sti @@ -426,7 +374,7 @@ END(error_entry) -@@ -1585,10 +1594,10 @@ ENTRY(nmi) +@@ -1586,10 +1597,10 @@ ENTRY(nmi) INTR_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME pushq_cfi $-1 @@ -440,3 +388,39 @@ /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */ movq %rsp,%rdi movq $-1,%rsi +--- a/arch/x86/kernel/head_64.S ++++ b/arch/x86/kernel/head_64.S +@@ -286,6 +286,8 @@ early_idt_handlers: + + ENTRY(early_idt_handler) + #ifdef CONFIG_EARLY_PRINTK ++#include <asm/calling.h> ++#include <asm/dwarf2.h> + cmpl $2,early_recursion_flag(%rip) + jz 1f + incl early_recursion_flag(%rip) +@@ -301,6 +303,16 @@ ENTRY(early_idt_handler) + testl $0x27d00,%eax + je 0f + popq %r8 # get error code ++ ++ CFI_STARTPROC simple ++ CFI_SIGNAL_FRAME ++ CFI_DEF_CFA rsp, SS+8-RIP ++# CFI_REL_OFFSET ss, SS-RIP ++ CFI_REL_OFFSET rsp, RSP-RIP ++# CFI_REL_OFFSET rflags, EFLAGS-RIP ++# CFI_REL_OFFSET cs, CS-RIP ++ CFI_REL_OFFSET rip, RIP-RIP ++ + 0: movq 0(%rsp),%rcx # get ip + movq 8(%rsp),%rdx # get cs + xorl %eax,%eax +@@ -314,6 +326,7 @@ ENTRY(early_idt_handler) + movq 0(%rsp),%rsi # get rip again + call __print_symbol + #endif ++ CFI_ENDPROC + #endif /* EARLY_PRINTK */ + 1: hlt + jmp 1b 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-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/x86_agpgart-g33-stoeln-fix-2.patch 2009-05-05 10:09:06.000000000 +0200 @@ -58,7 +58,7 @@ --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c -@@ -564,6 +564,13 @@ static void intel_i830_init_gtt_entries( +@@ -573,6 +573,13 @@ static void intel_i830_init_gtt_entries( } else { switch (gmch_ctrl & I855_GMCH_GMS_MASK) { case I855_GMCH_GMS_STOLEN_1M: 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-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/x86-apic-force-bigsmp-apic-on-IBM-EXA3-4.patch 2009-05-05 10:09:06.000000000 +0200 @@ -6,13 +6,13 @@ Signed-off-by: Thomas Renninger <trenn(a)suse.de> - arch/x86/mach-generic/bigsmp.c | 26 +++++++++++++++++++++++--- - arch/x86/mach-generic/probe.c | 4 ++-- - 2 files changed, 25 insertions(+), 5 deletions(-) + arch/x86/kernel/apic/bigsmp_32.c | 30 +++++++++++++++++++++++++++--- + arch/x86/kernel/apic/probe_32.c | 4 ++-- + 2 files changed, 29 insertions(+), 5 deletions(-) ---- a/arch/x86/mach-generic/bigsmp.c -+++ b/arch/x86/mach-generic/bigsmp.c -@@ -21,7 +21,7 @@ +--- a/arch/x86/kernel/apic/bigsmp_32.c ++++ b/arch/x86/kernel/apic/bigsmp_32.c +@@ -164,7 +164,7 @@ static void bigsmp_send_IPI_all(int vect static int dmi_bigsmp; /* can be set by dmi scanners */ @@ -21,61 +21,67 @@ { printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident); dmi_bigsmp = 1; -@@ -30,15 +30,35 @@ static int hp_ht_bigsmp(const struct dmi +@@ -174,17 +174,41 @@ static int hp_ht_bigsmp(const struct dmi static const struct dmi_system_id bigsmp_dmi_table[] = { - { hp_ht_bigsmp, "HP ProLiant DL760 G2", + { force_bigsmp_apic, "HP ProLiant DL760 G2", - { DMI_MATCH(DMI_BIOS_VENDOR, "HP"), - DMI_MATCH(DMI_BIOS_VERSION, "P44-"),} + { DMI_MATCH(DMI_BIOS_VENDOR, "HP"), + DMI_MATCH(DMI_BIOS_VERSION, "P44-"), + } }, - { hp_ht_bigsmp, "HP ProLiant DL740", + { force_bigsmp_apic, "HP ProLiant DL740", - { DMI_MATCH(DMI_BIOS_VENDOR, "HP"), - DMI_MATCH(DMI_BIOS_VERSION, "P47-"),} + { DMI_MATCH(DMI_BIOS_VENDOR, "HP"), + DMI_MATCH(DMI_BIOS_VERSION, "P47-"), + } }, + + { force_bigsmp_apic, "IBM x260 / x366 / x460", -+ { DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION, "-[ZT"),} ++ { DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION, "-[ZT"), ++ } + }, + + { force_bigsmp_apic, "IBM x3800 / x3850 / x3950", -+ { DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION, "-[ZU"),} ++ { DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION, "-[ZU"), ++ } + }, + + { force_bigsmp_apic, "IBM x3800 / x3850 / x3950", -+ { DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION, "-[ZS"),} ++ { DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION, "-[ZS"), ++ } + }, + + { force_bigsmp_apic, "IBM x3850 M2 / x3950 M2", -+ { DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION, "-[A3"),} ++ { DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION, "-[A3"), ++ } + }, - { } + { } /* NULL entry stops DMI scanning */ }; ---- a/arch/x86/mach-generic/probe.c -+++ b/arch/x86/mach-generic/probe.c -@@ -115,7 +115,7 @@ int __init mps_oem_check(struct mpc_tabl - int i; - for (i = 0; apic_probe[i]; ++i) { - if (apic_probe[i]->mps_oem_check(mpc, oem, productid)) { -- if (!cmdline_apic) { -+ if (!cmdline_apic && genapic == &apic_default) { - genapic = apic_probe[i]; - if (x86_quirks->update_genapic) - x86_quirks->update_genapic(); -@@ -133,7 +133,7 @@ int __init acpi_madt_oem_check(char *oem - int i; - for (i = 0; apic_probe[i]; ++i) { - if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) { -- if (!cmdline_apic) { -+ if (!cmdline_apic && genapic == &apic_default) { - genapic = apic_probe[i]; - if (x86_quirks->update_genapic) - x86_quirks->update_genapic(); +--- 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 * + if (!apic_probe[i]->mps_oem_check(mpc, oem, productid)) + continue; + +- if (!cmdline_apic) { ++ if (!cmdline_apic && apic == &apic_default) { + 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 + if (!apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) + continue; + +- if (!cmdline_apic) { ++ if (!cmdline_apic && apic == &apic_default) { + apic = apic_probe[i]; + printk(KERN_INFO "Switched to APIC driver `%s'.\n", + apic->name); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86-hpet-pre-read new/patches.arch/x86-hpet-pre-read --- old/patches.arch/x86-hpet-pre-read 2009-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/x86-hpet-pre-read 2009-05-05 10:09:06.000000000 +0200 @@ -16,7 +16,7 @@ --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c -@@ -319,6 +319,7 @@ static int hpet_next_event(unsigned long +@@ -366,6 +366,7 @@ static int hpet_next_event(unsigned long cnt += (u32) delta; hpet_writel(cnt, HPET_Tn_CMP(timer)); 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-03-12 11:03:15.000000000 +0100 +++ new/patches.arch/x86-self-ptrace.patch 2009-05-05 10:09:06.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 +@@ -1409,6 +1409,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; -@@ -1437,6 +1448,9 @@ asmregparm long syscall_trace_enter(stru +@@ -1439,6 +1450,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 -@@ -782,6 +782,11 @@ handle_signal(unsigned long sig, siginfo +@@ -761,6 +761,11 @@ handle_signal(unsigned long sig, siginfo tracehook_signal_handler(sig, info, ka, regs, test_thread_flag(TIF_SINGLESTEP)); ++++++ patches.drivers.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/add-via-chrome9-drm-support.patch new/patches.drivers/add-via-chrome9-drm-support.patch --- old/patches.drivers/add-via-chrome9-drm-support.patch 2009-02-13 21:17:04.000000000 +0100 +++ new/patches.drivers/add-via-chrome9-drm-support.patch 2009-05-01 20:00:55.000000000 +0200 @@ -14,17 +14,17 @@ drivers/gpu/drm/via_chrome9/via_chrome9_dma.h | 69 + drivers/gpu/drm/via_chrome9/via_chrome9_drm.c | 950 +++++++++++++++ drivers/gpu/drm/via_chrome9/via_chrome9_drm.h | 443 +++++++ - drivers/gpu/drm/via_chrome9/via_chrome9_drv.c | 224 +++ + drivers/gpu/drm/via_chrome9/via_chrome9_drv.c | 218 +++ drivers/gpu/drm/via_chrome9/via_chrome9_drv.h | 150 ++ drivers/gpu/drm/via_chrome9/via_chrome9_mm.c | 435 +++++++ drivers/gpu/drm/via_chrome9/via_chrome9_mm.h | 67 + drivers/gpu/drm/via_chrome9/via_chrome9_verifier.c | 982 ++++++++++++++++ drivers/gpu/drm/via_chrome9/via_chrome9_verifier.h | 61 - 14 files changed, 5089 insertions(+) + 14 files changed, 5083 insertions(+) --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig -@@ -117,6 +117,13 @@ config DRM_VIA +@@ -116,6 +116,13 @@ config DRM_VIA Choose this option if you have a Via unichrome or compatible video chipset. If M is selected the module will be called via. @@ -40,7 +40,7 @@ depends on DRM --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile -@@ -25,4 +25,5 @@ obj-$(CONFIG_DRM_I915) += i915/ +@@ -26,4 +26,5 @@ obj-$(CONFIG_DRM_I915) += i915/ obj-$(CONFIG_DRM_SIS) += sis/ obj-$(CONFIG_DRM_SAVAGE)+= savage/ obj-$(CONFIG_DRM_VIA) +=via/ @@ -3229,7 +3229,7 @@ +#endif /* _VIA_CHROME9_DRM_H_ */ --- /dev/null +++ b/drivers/gpu/drm/via_chrome9/via_chrome9_drv.c -@@ -0,0 +1,224 @@ +@@ -0,0 +1,218 @@ +/* + * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. + * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved. @@ -3267,11 +3267,6 @@ +#define RING_BUFFER_INIT_FLAG 1 +#define RING_BUFFER_CLEANUP_FLAG 2 + -+static int dri_library_name(struct drm_device *dev, char *buf) -+{ -+ return snprintf(buf, PAGE_SIZE, "via_chrome9"); -+} -+ +int via_chrome9_drm_authmagic(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ @@ -3399,7 +3394,6 @@ + .load = via_chrome9_driver_load, + .unload = via_chrome9_driver_unload, + .device_is_agp = via_chrome9_is_agp, -+ .dri_library_name = dri_library_name, + .reclaim_buffers = drm_core_reclaim_buffers, + .reclaim_buffers_locked = NULL, + .reclaim_buffers_idlelocked = via_chrome9_reclaim_buffers_locked, @@ -3506,7 +3500,7 @@ + +/*typedef struct drm_via_chrome9_shadow_map drm_via_chrome9_shadow_map_t;*/ +struct drm_via_chrome9_shadow_map { -+ struct drm_map *shadow; ++ struct drm_local_map *shadow; + unsigned int shadow_size; + unsigned int *shadow_handle; +}; @@ -3539,16 +3533,16 @@ + /* bit[31]:0:indicate no alignment needed,1:indicate + alignment needed and size is bit[0:30]*/ + -+ struct drm_map *sarea; ++ struct drm_local_map *sarea; + struct drm_via_chrome9_sarea *sarea_priv; + -+ struct drm_map *mmio; -+ struct drm_map *hostBlt; -+ struct drm_map *fb; -+ struct drm_map *front; -+ struct drm_map *back; -+ struct drm_map *depth; -+ struct drm_map *agp_tex; ++ struct drm_local_map *mmio; ++ struct drm_local_map *hostBlt; ++ struct drm_local_map *fb; ++ struct drm_local_map *front; ++ struct drm_local_map *back; ++ struct drm_local_map *depth; ++ struct drm_local_map *agp_tex; + unsigned int agp_size; + unsigned int agp_offset; + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/disable-catas_reset-by-default-to-avoid-problems-with-eeh.patch new/patches.drivers/disable-catas_reset-by-default-to-avoid-problems-with-eeh.patch --- old/patches.drivers/disable-catas_reset-by-default-to-avoid-problems-with-eeh.patch 2009-02-13 21:17:04.000000000 +0100 +++ new/patches.drivers/disable-catas_reset-by-default-to-avoid-problems-with-eeh.patch 2009-05-01 20:00:55.000000000 +0200 @@ -33,8 +33,8 @@ --- a/drivers/net/mlx4/catas.c +++ b/drivers/net/mlx4/catas.c -@@ -45,7 +45,7 @@ static LIST_HEAD(catas_list); - static struct workqueue_struct *catas_wq; +@@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(catas_lock); + static LIST_HEAD(catas_list); static struct work_struct catas_work; -static int internal_err_reset = 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/elousb.patch new/patches.drivers/elousb.patch --- old/patches.drivers/elousb.patch 2009-02-13 21:17:04.000000000 +0100 +++ new/patches.drivers/elousb.patch 2009-05-01 20:00:55.000000000 +0200 @@ -18,7 +18,7 @@ --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c -@@ -1503,6 +1503,8 @@ static const struct hid_device_id hid_ig +@@ -1515,6 +1515,8 @@ static const struct hid_device_id hid_ig { HID_USB_DEVICE(USB_VENDOR_ID_DEALEXTREAME, USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701) }, { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) }, { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) }, @@ -29,8 +29,8 @@ { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) }, --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -149,7 +149,9 @@ - #define USB_DEVICE_ID_DMI_ENC 0x5fab +@@ -154,7 +154,9 @@ + #define USB_VENDOR_ID_DRAGONRISE 0x0079 #define USB_VENDOR_ID_ELO 0x04E7 +#define USB_DEVICE_ID_ELO_4000U 0x0009 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-ata_piix-clear-spurious-IRQ new/patches.drivers/libata-ata_piix-clear-spurious-IRQ --- old/patches.drivers/libata-ata_piix-clear-spurious-IRQ 2009-02-13 21:17:04.000000000 +0100 +++ new/patches.drivers/libata-ata_piix-clear-spurious-IRQ 2009-05-01 20:00:55.000000000 +0200 @@ -74,7 +74,7 @@ static int piix_sidpr_scr_write(struct ata_link *link, unsigned int reg, u32 val) { -@@ -1528,7 +1580,7 @@ static int __devinit piix_init_one(struc +@@ -1572,7 +1624,7 @@ static int __devinit piix_init_one(struc } pci_set_master(pdev); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-prefer-over-ide new/patches.drivers/libata-prefer-over-ide --- old/patches.drivers/libata-prefer-over-ide 2009-02-13 21:17:04.000000000 +0100 +++ new/patches.drivers/libata-prefer-over-ide 2009-05-01 20:00:55.000000000 +0200 @@ -14,14 +14,14 @@ --- a/drivers/Makefile +++ b/drivers/Makefile -@@ -40,9 +40,9 @@ obj-y += base/ block/ misc/ mfd/ net/ +@@ -39,9 +39,9 @@ obj-$(CONFIG_PARPORT) += parport/ + obj-y += base/ block/ misc/ mfd/ obj-$(CONFIG_NUBUS) += nubus/ - obj-$(CONFIG_ATM) += atm/ obj-y += macintosh/ -obj-$(CONFIG_IDE) += ide/ obj-$(CONFIG_SCSI) += scsi/ obj-$(CONFIG_ATA) += ata/ +obj-$(CONFIG_IDE) += ide/ + obj-y += net/ + obj-$(CONFIG_ATM) += atm/ obj-$(CONFIG_FUSION) += message/ - obj-$(CONFIG_FIREWIRE) += firewire/ - obj-y += ieee1394/ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-unlock-hpa-by-default new/patches.drivers/libata-unlock-hpa-by-default --- old/patches.drivers/libata-unlock-hpa-by-default 2009-02-13 21:17:04.000000000 +0100 +++ new/patches.drivers/libata-unlock-hpa-by-default 2009-05-01 20:00:55.000000000 +0200 @@ -12,7 +12,7 @@ --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c -@@ -138,7 +138,7 @@ int libata_fua = 0; +@@ -139,7 +139,7 @@ int libata_fua = 0; module_param_named(fua, libata_fua, int, 0444); MODULE_PARM_DESC(fua, "FUA support (0=off, 1=on)"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/qla4xxx-5.01.00-k8_sles11-03-update new/patches.drivers/qla4xxx-5.01.00-k8_sles11-03-update --- old/patches.drivers/qla4xxx-5.01.00-k8_sles11-03-update 2009-02-13 21:17:04.000000000 +0100 +++ new/patches.drivers/qla4xxx-5.01.00-k8_sles11-03-update 2009-05-01 20:00:55.000000000 +0200 @@ -18,10 +18,10 @@ drivers/scsi/qla4xxx/ql4_iocb.c | 161 +----------- drivers/scsi/qla4xxx/ql4_isr.c | 32 +- drivers/scsi/qla4xxx/ql4_mbx.c | 7 - drivers/scsi/qla4xxx/ql4_os.c | 495 ++++++++++++++++++++----------------- + drivers/scsi/qla4xxx/ql4_os.c | 491 ++++++++++++++++++++----------------- drivers/scsi/qla4xxx/ql4_os.h | 125 +++++++++ drivers/scsi/qla4xxx/ql4_version.h | 3 - 12 files changed, 727 insertions(+), 521 deletions(-) + 12 files changed, 725 insertions(+), 519 deletions(-) --- a/drivers/scsi/qla4xxx/ql4_dbg.c +++ b/drivers/scsi/qla4xxx/ql4_dbg.c @@ -2015,18 +2015,6 @@ { int retval; -@@ -1401,9 +1450,9 @@ static void qla4xxx_config_dma_addressin - if (pci_set_consistent_dma_mask(ha->pdev, DMA_64BIT_MASK)) { - dev_dbg(&ha->pdev->dev, - "Failed to set 64 bit PCI consistent mask; " -- "using 32 bit.\n"); -+ "using 32 bit.\n"); - retval = pci_set_consistent_dma_mask(ha->pdev, -- DMA_32BIT_MASK); -+ DMA_32BIT_MASK); - } - } else - retval = pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK); @@ -1411,7 +1460,7 @@ static void qla4xxx_config_dma_addressin static int qla4xxx_slave_alloc(struct scsi_device *sdev) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/qla4xxx-sles11-update new/patches.drivers/qla4xxx-sles11-update --- old/patches.drivers/qla4xxx-sles11-update 2009-02-13 21:17:04.000000000 +0100 +++ new/patches.drivers/qla4xxx-sles11-update 2009-05-01 20:00:55.000000000 +0200 @@ -2779,13 +2779,13 @@ qla4xxx_free_ddb_list(ha); @@ -1373,7 +1401,7 @@ static void qla4xxx_config_dma_addressin - if (pci_set_consistent_dma_mask(ha->pdev, DMA_64BIT_MASK)) { + if (pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) { dev_dbg(&ha->pdev->dev, "Failed to set 64 bit PCI consistent mask; " - "using 32 bit.\n"); + "using 32 bit.\n"); retval = pci_set_consistent_dma_mask(ha->pdev, - DMA_32BIT_MASK); + DMA_BIT_MASK(32)); } @@ -1384,23 +1412,22 @@ static void qla4xxx_config_dma_addressin static int qla4xxx_slave_alloc(struct scsi_device *sdev) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/tg3_libphy_workaround new/patches.drivers/tg3_libphy_workaround --- old/patches.drivers/tg3_libphy_workaround 2009-02-13 21:17:04.000000000 +0100 +++ new/patches.drivers/tg3_libphy_workaround 2009-05-01 20:00:55.000000000 +0200 @@ -35,7 +35,7 @@ {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57780)}, {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57760)}, {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57790)}, -@@ -12088,8 +12087,7 @@ static int __devinit tg3_get_invariants( +@@ -12218,8 +12217,7 @@ static int __devinit tg3_get_invariants( GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5700_BX) tp->coalesce_mode |= HOSTCC_MODE_32BYTE; @@ -45,7 +45,7 @@ tp->tg3_flags3 |= TG3_FLG3_USE_PHYLIB; err = tg3_mdio_init(tp); -@@ -12839,6 +12837,7 @@ static char * __devinit tg3_phy_string(s +@@ -12965,6 +12963,7 @@ static char * __devinit tg3_phy_string(s case PHY_ID_BCM5756: return "5722/5756"; case PHY_ID_BCM5906: return "5906"; case PHY_ID_BCM5761: return "5761"; @@ -55,7 +55,7 @@ default: return "unknown"; --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h -@@ -2683,6 +2683,7 @@ struct tg3 { +@@ -2701,6 +2701,7 @@ struct tg3 { #define PHY_ID_BCM5761 0xbc050fd0 #define PHY_ID_BCM5906 0xdc00ac40 #define PHY_ID_BCM8002 0x60010140 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/via-unichrome-drm-bugfixes.patch new/patches.drivers/via-unichrome-drm-bugfixes.patch --- old/patches.drivers/via-unichrome-drm-bugfixes.patch 2009-02-13 21:17:04.000000000 +0100 +++ new/patches.drivers/via-unichrome-drm-bugfixes.patch 2009-05-01 20:00:55.000000000 +0200 @@ -461,7 +461,7 @@ int via_max_ioctl = DRM_ARRAY_SIZE(via_ioctls); --- a/drivers/gpu/drm/via/via_drv.c +++ b/drivers/gpu/drm/via/via_drv.c -@@ -37,10 +37,16 @@ static struct pci_device_id pciidlist[] +@@ -32,10 +32,16 @@ static struct pci_device_id pciidlist[] viadrv_PCI_IDS }; @@ -478,7 +478,7 @@ .load = via_driver_load, .unload = via_driver_unload, .context_dtor = via_final_context, -@@ -72,6 +78,8 @@ static struct drm_driver driver = { +@@ -66,6 +72,8 @@ static struct drm_driver driver = { .pci_driver = { .name = DRIVER_NAME, .id_table = pciidlist, @@ -810,7 +810,7 @@ +EXPORT_SYMBOL(via_fb_free); --- a/include/drm/via_drm.h +++ b/include/drm/via_drm.h -@@ -51,6 +51,12 @@ +@@ -53,6 +53,12 @@ #define VIA_LOG_MIN_TEX_REGION_SIZE 16 #endif @@ -823,7 +823,7 @@ #define VIA_UPLOAD_TEX0IMAGE 0x1 /* handled clientside */ #define VIA_UPLOAD_TEX1IMAGE 0x2 /* handled clientside */ #define VIA_UPLOAD_CTX 0x4 -@@ -67,7 +73,7 @@ +@@ -69,7 +75,7 @@ #define DRM_VIA_FB_INIT 0x03 #define DRM_VIA_MAP_INIT 0x04 #define DRM_VIA_DEC_FUTEX 0x05 @@ -832,7 +832,7 @@ #define DRM_VIA_DMA_INIT 0x07 #define DRM_VIA_CMDBUFFER 0x08 #define DRM_VIA_FLUSH 0x09 -@@ -77,6 +83,9 @@ +@@ -79,6 +85,9 @@ #define DRM_VIA_WAIT_IRQ 0x0d #define DRM_VIA_DMA_BLIT 0x0e #define DRM_VIA_BLIT_SYNC 0x0f @@ -842,7 +842,7 @@ #define DRM_IOCTL_VIA_ALLOCMEM DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_ALLOCMEM, drm_via_mem_t) #define DRM_IOCTL_VIA_FREEMEM DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_FREEMEM, drm_via_mem_t) -@@ -84,6 +93,8 @@ +@@ -86,6 +95,8 @@ #define DRM_IOCTL_VIA_FB_INIT DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_FB_INIT, drm_via_fb_t) #define DRM_IOCTL_VIA_MAP_INIT DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_MAP_INIT, drm_via_init_t) #define DRM_IOCTL_VIA_DEC_FUTEX DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_DEC_FUTEX, drm_via_futex_t) @@ -851,7 +851,7 @@ #define DRM_IOCTL_VIA_DMA_INIT DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_DMA_INIT, drm_via_dma_init_t) #define DRM_IOCTL_VIA_CMDBUFFER DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_CMDBUFFER, drm_via_cmdbuffer_t) #define DRM_IOCTL_VIA_FLUSH DRM_IO( DRM_COMMAND_BASE + DRM_VIA_FLUSH) -@@ -91,8 +102,14 @@ +@@ -93,8 +104,14 @@ #define DRM_IOCTL_VIA_CMDBUF_SIZE DRM_IOWR( DRM_COMMAND_BASE + DRM_VIA_CMDBUF_SIZE, \ drm_via_cmdbuf_size_t) #define DRM_IOCTL_VIA_WAIT_IRQ DRM_IOWR( DRM_COMMAND_BASE + DRM_VIA_WAIT_IRQ, drm_via_irqwait_t) @@ -866,7 +866,7 @@ /* Indices into buf.Setup where various bits of state are mirrored per * context and per buffer. These can be fired at the card as a unit, -@@ -112,6 +129,13 @@ +@@ -114,6 +131,13 @@ #define VIA_MEM_SYSTEM 2 #define VIA_MEM_MIXED 3 #define VIA_MEM_UNKNOWN 4 @@ -879,8 +879,8 @@ +}; typedef struct { - uint32_t offset; -@@ -141,6 +165,8 @@ typedef struct _drm_via_init { + __u32 offset; +@@ -143,6 +167,8 @@ typedef struct _drm_via_init { unsigned long fb_offset; unsigned long mmio_offset; unsigned long agpAddr; @@ -889,7 +889,7 @@ } drm_via_init_t; typedef struct _drm_via_futex { -@@ -245,6 +271,12 @@ typedef union drm_via_irqwait { +@@ -247,6 +273,12 @@ typedef union drm_via_irqwait { struct drm_wait_vblank_reply reply; } drm_via_irqwait_t; @@ -900,9 +900,9 @@ +} ; + typedef struct drm_via_blitsync { - uint32_t sync_handle; + __u32 sync_handle; unsigned engine; -@@ -272,4 +304,13 @@ typedef struct drm_via_dmablit { +@@ -274,4 +306,13 @@ typedef struct drm_via_dmablit { drm_via_blitsync_t sync; } drm_via_dmablit_t; ++++++ patches.fixes.tar.bz2 ++++++ ++++ 2280 lines of diff (skipped) ++++++ patches.kabi.tar.bz2 ++++++ ++++++ 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: byte 11, line 1 ++++++ patches.rpmify.tar.bz2 ++++++ 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-02-20 01:52:37.000000000 +0100 +++ new/patches.rpmify/firmware-path 2009-04-15 06:43:32.000000000 +0200 @@ -14,7 +14,7 @@ --- a/Makefile +++ b/Makefile -@@ -1052,7 +1052,7 @@ depend dep: +@@ -1065,7 +1065,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-02-20 01:52:37.000000000 +0100 +++ new/patches.rpmify/no-include-asm 2009-04-15 06:43:32.000000000 +0200 @@ -18,7 +18,7 @@ --- a/Makefile +++ b/Makefile -@@ -945,7 +945,11 @@ ifneq ($(KBUILD_SRC),) +@@ -958,7 +958,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/rpm-kernel-config new/patches.rpmify/rpm-kernel-config --- old/patches.rpmify/rpm-kernel-config 2009-02-20 01:52:37.000000000 +0100 +++ new/patches.rpmify/rpm-kernel-config 2009-04-15 06:43:32.000000000 +0200 @@ -12,14 +12,11 @@ --- a/init/Kconfig +++ b/init/Kconfig -@@ -101,6 +101,10 @@ config LOCALVERSION_AUTO - - which is done within the script "scripts/setlocalversion".) - +@@ -1,3 +1,7 @@ +config SUSE_KERNEL + bool + default y + - config SWAP - bool "Support for paging of anonymous memory (swap)" - depends on MMU && BLOCK + config ARCH + string + option env="ARCH" 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-02-20 01:52:37.000000000 +0100 +++ new/patches.rpmify/spin_is_contended-fix 2009-04-15 06:43:32.000000000 +0200 @@ -80,7 +80,7 @@ default y --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig -@@ -58,7 +58,7 @@ config IOMMU_HELPER +@@ -61,7 +61,7 @@ config IOMMU_HELPER config GENERIC_LOCKBREAK bool default y @@ -102,7 +102,7 @@ bool --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig -@@ -27,7 +27,7 @@ config STACK_GROWSUP +@@ -31,7 +31,7 @@ config STACK_GROWSUP config GENERIC_LOCKBREAK bool default y @@ -135,7 +135,7 @@ bool --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig -@@ -43,6 +43,11 @@ config RWSEM_GENERIC_SPINLOCK +@@ -44,6 +44,11 @@ config RWSEM_GENERIC_SPINLOCK config RWSEM_XCHGADD_ALGORITHM bool @@ -147,7 +147,7 @@ config GENERIC_BUG def_bool y depends on BUG && SUPERH32 -@@ -82,7 +87,7 @@ config GENERIC_CLOCKEVENTS_BROADCAST +@@ -83,7 +88,7 @@ config GENERIC_CLOCKEVENTS_BROADCAST config GENERIC_LOCKBREAK def_bool y @@ -158,7 +158,7 @@ bool --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig -@@ -298,7 +298,7 @@ config US3_MC +@@ -301,7 +301,7 @@ config US3_MC config GENERIC_LOCKBREAK bool default y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/split-package new/patches.rpmify/split-package --- old/patches.rpmify/split-package 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/split-package 2009-04-15 06:43:32.000000000 +0200 @@ -0,0 +1,33 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: Add SPLIT_PACKAGE option +Patch-mainline: Never + + This patch adds a SPLIT_PACKAGE option which allows the packager to + make decisions on a per-config basis. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + init/Kconfig | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -2,6 +2,18 @@ config SUSE_KERNEL + bool + default y + ++config SPLIT_PACKAGE ++ bool "Split the kernel package into multiple RPMs" ++ depends on SUSE_KERNEL && MODULES ++ help ++ This is an option used by the kernel packaging infrastructure ++ to split kernel modules into different packages. It isn't used ++ by the kernel itself, but allows the the packager to make ++ decisions on a per-config basis. ++ ++ If you aren't packaging a kernel for distribution, it's safe to ++ say n. ++ + config ARCH + string + option env="ARCH" ++++++ patches.rt.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ ++++ 142614 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-03-13 23:38:34.000000000 +0100 +++ new/patches.trace/ftrace-framepointer.diff 2009-05-11 19:51:30.000000000 +0200 @@ -12,19 +12,19 @@ --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig -@@ -51,7 +51,6 @@ config FUNCTION_TRACER +@@ -78,7 +78,6 @@ menu "Tracers" + config FUNCTION_TRACER bool "Kernel Function Tracer" depends on HAVE_FUNCTION_TRACER - depends on DEBUG_KERNEL - select FRAME_POINTER select KALLSYMS select TRACING select CONTEXT_SWITCH_TRACER -@@ -127,6 +126,7 @@ config SYSPROF_TRACER +@@ -151,6 +150,7 @@ config SYSPROF_TRACER bool "Sysprof Tracer" depends on X86 select TRACING + select FRAME_POINTER + select CONTEXT_SWITCH_TRACER help This tracer provides the trace needed by the 'Sysprof' userspace - tool. 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-03-13 23:38:34.000000000 +0100 +++ new/patches.trace/utrace-core 2009-05-11 19:51:30.000000000 +0200 @@ -623,8 +623,8 @@ --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -81,6 +81,7 @@ - #include <linux/seq_file.h> #include <linux/pid_namespace.h> + #include <linux/ptrace.h> #include <linux/tracehook.h> +#include <linux/utrace.h> @@ -641,7 +641,7 @@ fdt = files_fdtable(p->files); --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1288,6 +1288,11 @@ struct task_struct { +@@ -1290,6 +1290,11 @@ struct task_struct { #endif seccomp_t seccomp; @@ -791,18 +791,18 @@ if (stepping) ptrace_notify(SIGTRAP); } -@@ -400,6 +444,8 @@ static inline int tracehook_consider_ign - int sig, - void __user *handler) +@@ -397,6 +441,8 @@ static inline void tracehook_signal_hand + static inline int tracehook_consider_ignored_signal(struct task_struct *task, + int sig) { + if (unlikely(task_utrace_flags(task) & UTRACE_EVENT(SIGNAL_IGN))) + return 1; return (task_ptrace(task) & PT_PTRACED) != 0; } -@@ -421,6 +467,9 @@ static inline int tracehook_consider_fat - int sig, - void __user *handler) +@@ -416,6 +462,9 @@ static inline int tracehook_consider_ign + static inline int tracehook_consider_fatal_signal(struct task_struct *task, + int sig) { + if (unlikely(task_utrace_flags(task) & (UTRACE_EVENT(SIGNAL_TERM) | + UTRACE_EVENT(SIGNAL_CORE)))) @@ -810,7 +810,7 @@ return (task_ptrace(task) & PT_PTRACED) != 0; } -@@ -435,6 +484,8 @@ static inline int tracehook_consider_fat +@@ -430,6 +479,8 @@ static inline int tracehook_consider_fat */ static inline int tracehook_force_sigpending(void) { @@ -819,7 +819,7 @@ return 0; } -@@ -464,6 +515,8 @@ static inline int tracehook_get_signal(s +@@ -459,6 +510,8 @@ static inline int tracehook_get_signal(s siginfo_t *info, struct k_sigaction *return_ka) { @@ -828,7 +828,7 @@ return 0; } -@@ -484,6 +537,8 @@ static inline int tracehook_get_signal(s +@@ -479,6 +532,8 @@ static inline int tracehook_get_signal(s */ static inline int tracehook_notify_jctl(int notify, int why) { @@ -837,7 +837,7 @@ return notify || (current->ptrace & PT_PTRACED); } -@@ -507,6 +562,10 @@ static inline int tracehook_notify_jctl( +@@ -502,6 +557,10 @@ static inline int tracehook_notify_jctl( static inline int tracehook_notify_death(struct task_struct *task, void **death_cookie, int group_dead) { @@ -845,10 +845,10 @@ + *death_cookie = task_utrace_struct(task); +#endif + - if (task->exit_signal == -1) + if (task_detached(task)) return task->ptrace ? SIGCHLD : DEATH_REAP; -@@ -543,6 +602,12 @@ static inline void tracehook_report_deat +@@ -538,6 +597,12 @@ static inline void tracehook_report_deat int signal, void *death_cookie, int group_dead) { @@ -861,7 +861,7 @@ } #ifdef TIF_NOTIFY_RESUME -@@ -572,10 +637,14 @@ static inline void set_notify_resume(str +@@ -567,10 +632,14 @@ static inline void set_notify_resume(str * asynchronously, this will be called again before we return to * user mode. * @@ -1593,7 +1593,7 @@ +#endif /* linux/utrace.h */ --- a/init/Kconfig +++ b/init/Kconfig -@@ -1064,6 +1064,16 @@ config STOP_MACHINE +@@ -1157,6 +1157,16 @@ config STOP_MACHINE help Need stop_machine() primitive. ++++++ patches.xen.tar.bz2 ++++++ ++++ 84780 lines of diff (skipped) ++++++ post.sh ++++++ --- /var/tmp/diff_new_pack.zL7515/_old 2009-05-20 10:56:23.000000000 +0200 +++ /var/tmp/diff_new_pack.zL7515/_new 2009-05-20 10:56:23.000000000 +0200 @@ -32,11 +32,11 @@ esac for x in /boot/@IMAGE@ /boot/initrd; do rm -f $x$suffix - ln -s ${x##*/}-@KERNELRELEASE@ $x$suffix + ln -s ${x##*/}-@KERNELRELEASE@-@FLAVOR@ $x$suffix done -if [ -e /lib/modules/@KERNELRELEASE@ ]; then - echo Setting up /lib/modules/@KERNELRELEASE@ +if [ -e /lib/modules/@KERNELRELEASE@-@FLAVOR@ ]; then + echo Setting up /lib/modules/@KERNELRELEASE@-@FLAVOR@ if [ -x /sbin/module_upgrade ]; then /sbin/module_upgrade --rename mptscsih="mptspi mptfc mptsas" @@ -48,18 +48,18 @@ wm2=/usr/lib/module-init-tools/weak-modules2 if [ -x $wm2 ]; then if [ @BASE_PACKAGE@ = 1 ]; then - /bin/bash -${-/e/} $wm2 --add-kernel @KERNELRELEASE@ + /bin/bash -${-/e/} $wm2 --add-kernel @KERNELRELEASE@-@FLAVOR@ else nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@ - rpm -ql $nvr | /bin/bash -${-/e/} $wm2 --add-kernel-modules @KERNELRELEASE@ + rpm -ql $nvr | /bin/bash -${-/e/} $wm2 --add-kernel-modules @KERNELRELEASE@-@FLAVOR@ fi elif [ -x $wm ]; then # pre CODE11 compatibility - $wm --add-kernel @KERNELRELEASE@ - /sbin/depmod -a -F /boot/System.map-@KERNELRELEASE@ @KERNELRELEASE@ + $wm --add-kernel @KERNELRELEASE@-@FLAVOR@ + /sbin/depmod -a -F /boot/System.map-@KERNELRELEASE@-@FLAVOR@ @KERNELRELEASE@-@FLAVOR@ if [ -f /etc/fstab -a ! -e /.buildenv -a -x /sbin/mkinitrd ] ; then - /sbin/mkinitrd -k /boot/@IMAGE@-@KERNELRELEASE@ \ - -i /boot/initrd-@KERNELRELEASE@ + /sbin/mkinitrd -k /boot/@IMAGE@-@KERNELRELEASE@-@FLAVOR@ \ + -i /boot/initrd-@KERNELRELEASE@-@FLAVOR@ if [ $? -ne 0 ]; then echo "/sbin/mkinitrd failed" >&2 case @SUBPACKAGE@ in @@ -95,8 +95,8 @@ if [ -f /etc/fstab -a ! -e /.buildenv ] ; then # only run the bootloader if the usual bootloader configuration # files are there -- this is different on every architecture - initrd=initrd-@KERNELRELEASE@ - if [ -e /boot/$initrd -o ! -e /lib/modules/@KERNELRELEASE@ ] && \ + initrd=initrd-@KERNELRELEASE@-@FLAVOR@ + if [ -e /boot/$initrd -o ! -e /lib/modules/@KERNELRELEASE@-@FLAVOR@ ] && \ run_bootloader ; then [ -e /boot/$initrd ] || initrd= # handle 10.2 and SLES10 SP1 or later @@ -104,8 +104,8 @@ /usr/lib/bootloader/bootloader_entry \ add \ @FLAVOR@ \ - @KERNELRELEASE@ \ - @IMAGE@-@KERNELRELEASE@ \ + @KERNELRELEASE@-@FLAVOR@ \ + @IMAGE@-@KERNELRELEASE@-@FLAVOR@ \ $initrd # handle 10.1 and SLES10 GA ++++++ postun.sh ++++++ --- /var/tmp/diff_new_pack.zL7515/_old 2009-05-20 10:56:23.000000000 +0200 +++ /var/tmp/diff_new_pack.zL7515/_new 2009-05-20 10:56:23.000000000 +0200 @@ -3,17 +3,17 @@ if [ @BASE_PACKAGE@ = 0 ]; then if [ -x $wm2 ]; then nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@ - /bin/bash -${-/e/} $wm2 --remove-kernel-modules @KERNELRELEASE@ < /var/run/rpm-$nvr-modules + /bin/bash -${-/e/} $wm2 --remove-kernel-modules @KERNELRELEASE@-@FLAVOR@ < /var/run/rpm-$nvr-modules fi rm -f /var/run/rpm-$nvr-modules exit 0 fi # Remove symlinks from /lib/modules/$krel/weak-updates/. if [ -x $wm2 ]; then - /bin/bash -${-/e/} $wm2 --remove-kernel @KERNELRELEASE@ + /bin/bash -${-/e/} $wm2 --remove-kernel @KERNELRELEASE@-@FLAVOR@ elif [ -x $wm ]; then # pre CODE11 compatibility - $wm --remove-kernel @KERNELRELEASE@ + $wm --remove-kernel @KERNELRELEASE@-@FLAVOR@ fi # remove /boot/@IMAGE@.previous entry on a 10.1 and SLES10 GA system @@ -28,13 +28,13 @@ # Created in %post of old kernels case "$(readlink /boot/@IMAGE@$suffix.previous)" in -@IMAGE@-@KERNELRELEASE@|$(readlink /boot/@IMAGE@$suffix)) +@IMAGE@-@KERNELRELEASE@-@FLAVOR@|$(readlink /boot/@IMAGE@$suffix)) remove_previos_entry=yes rm -f /boot/@IMAGE@$suffix.previous ;; esac case "$(readlink /boot/initrd$suffix.previous)" in -initrd-@KERNELRELEASE@|$(readlink /boot/initrd$suffix)) +initrd-@KERNELRELEASE@-@FLAVOR@|$(readlink /boot/initrd$suffix)) rm -f /boot/initrd$suffix.previous ;; esac @@ -46,9 +46,9 @@ /usr/lib/bootloader/bootloader_entry \ remove \ @FLAVOR@ \ - @KERNELRELEASE@ \ - @IMAGE@-@KERNELRELEASE@ \ - initrd-@KERNELRELEASE@ + @KERNELRELEASE@-@FLAVOR@ \ + @IMAGE@-@KERNELRELEASE@-@FLAVOR@ \ + initrd-@KERNELRELEASE@-@FLAVOR@ # handle 10.1 and SLES10 GA elif [ -x /sbin/update-bootloader ]; then ++++++ README.KSYMS ++++++ This file is a place holder for the kernel-syms{,-rt} package. It is used to group build dependencies for all kernel flavors. The KMP build process will build KMPs against all installed kernel flavors automatically. If you don't need to build against other flavors than the ones you've already installed - it is safe to uninstall this package. ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.zL7515/_old 2009-05-20 10:56:24.000000000 +0200 +++ /var/tmp/diff_new_pack.zL7515/_new 2009-05-20 10:56:24.000000000 +0200 @@ -51,6 +51,11 @@ packages are all generated from the same kernel sources, and differ in the kernel configurations used. + * kernel-$FLAVOR-devel + + The files used for generating kernel module packages for use with + kernel-$FLAVOR. + * kernel-syms Kernel symbol version information for compiling external modules: @@ -72,7 +77,7 @@ * /usr/src/linux-$VERSION-$RELEASE/ The kernel sources. - + * /usr/src/linux A symbolic link to /usr/src/linux-$VERSION-$RELEASE. @@ -104,21 +109,27 @@ (1) Install kernel-source.$ARCH.rpm. Change to the /usr/src/linux directory. - (2) Configure the kernel (for example, ``make oldconfig'' or ``make - cloneconfig'', see HOW TO CONFIGURE THE KERNEL SOURCES). + (2) Create a build directory for use in configuring and building + the kernel. Using /usr/src/linux directly requires root priviledges + and will cause problems if you need to build kernel modules for + other installed kernels. + + (2) Configure the kernel (for example, ``make -C /usr/src/linux + O=$(pwd) oldconfig'' or ``make -C /usr/src/linux O=$(pwd) cloneconfig'', + see HOW TO CONFIGURE THE KERNEL SOURCES). (3) Build the kernel and all its modules (``make''). - (5) Install the kernel and the modules (``make modules_install'', - followed by ``make install''). This will automatically create - an initrd for the new kernel as well (see ``mkinitrd -h''). - - (6) Make sure that /etc/modprobe.d/unsupported-modules contains + (5) Make sure that /etc/modprobe.d/unsupported-modules contains allow_unsupported_modules 1 otherwise modprobe will refuse to load any modules. + (6) Install the kernel and the modules (``make modules_install'', + followed by ``make install''). This will automatically create + an initrd for the new kernel as well (see ``mkinitrd -h''). + (7) Add the kernel to the boot manager. When using lilo, run ``lilo'' to update the boot map. @@ -147,8 +158,8 @@ Additional kernel modules for one of the SUSE kernel flavors can be built in three different ways: - (1) by configuring the kernel sources in /usr/src/linux (or a copy, - see HOW TO CONFIGURE THE KERNEL SOURCES), or + (1) by configuring the kernel sources in a separate build directory + (see HOW TO CONFIGURE THE KERNEL SOURCES), or (2) by using one of the standard configurations in /usr/src/linux-obj/$ARCH/$FLAVOR, or @@ -160,19 +171,17 @@ The first method involves the following steps: (1) Install kernel-source.$ARCH.rpm. - - (2) Change to the /usr/src/linux directory. Configure the kernel - (for example, ``make oldconfig'' or ``make cloneconfig'', see - HOW TO CONFIGURE THE KERNEL SOURCES). + + (2) Configure the kernel, see HOW TO CONFIGURE THE KERNEL SOURCES. (3) Create files required for compiling external modules: ``make scripts'' and ``make prepare''. (4) Compile the module(s) by changing into the module source directory - and typing ``make -C /usr/src/linux M=$(pwd)''. + and typing ``make -C $(your_build_dir) M=$(pwd)''. (5) Install the module(s) by typing - ``make -C /usr/src/linux M=$(pwd) modules_install''. + ``make -C $(your_build_dir) M=$(pwd) modules_install''. The second method involves the following steps: @@ -350,20 +359,21 @@ - Locate the configuration file you want to use. (See WHERE TO FIND CONFIGURATION FILES above). - - Copy the configuration to the file .config in the kernel source - tree. The kernel-source package installs its source tree in - /usr/src/linux. + - Copy the configuration to the file .config in your build directory. - Run the following commands in sequence to apply the configuration, generate version information files, etc.: - make clean - make oldconfig + make -C /usr/src/linux O=$PWD clean + make -C /usr/src/linux O=$PWD oldconfig Alternatively to ``make oldconfig'', you can also use ``make menuconfig'' for a text menu oriented user interface. If the kernel sources do not match the configuration file exactly, ``make - oldconfig'' will prompt for settings that are undefined. + oldconfig'' will prompt for settings that are undefined. Once this + step is completed, a Makefile will have been created that eliminates + the need to specify the locations of the kernel source and the build + directory. For configuring the kernel to match the running kernel, there is a shortcut ``make cloneconfig'' that expands the file /proc/config.gz ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.zL7515/_old 2009-05-20 10:56:25.000000000 +0200 +++ /var/tmp/diff_new_pack.zL7515/_new 2009-05-20 10:56:25.000000000 +0200 @@ -27,6 +27,13 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## + patches.kernel.org/patch-2.6.30-rc1 + patches.kernel.org/patch-2.6.30-rc1-rc2 + patches.kernel.org/patch-2.6.30-rc2-rc3 + patches.kernel.org/patch-2.6.30-rc3-rc4 + patches.kernel.org/patch-2.6.30-rc4-rc5 + patches.kernel.org/patch-2.6.30-rc5-rc6 + patches.kernel.org/patch-2.6.30-rc6-git3 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -41,6 +48,7 @@ patches.kernel.org/gdth-section-conflict patches.kernel.org/arch-include-asm-fixes patches.rpmify/spin_is_contended-fix + patches.kernel.org/staging-pci-deps ######################################################## # kABI consistency patches @@ -59,6 +67,7 @@ patches.rpmify/no-include-asm patches.rpmify/rpm-kernel-config + patches.rpmify/split-package patches.rpmify/buildhost patches.rpmify/cloneconfig.diff patches.suse/genksyms-add-override-flag.diff @@ -69,6 +78,7 @@ patches.suse/supported-flag patches.suse/supported-flag-sysfs patches.suse/modpost-filter-out-built-in-depends + patches.suse/kbuild-icecream-workaround ######################################################## # Simple export additions/removals @@ -92,7 +102,6 @@ patches.suse/sysctl-add-affinity_load_balancing patches.fixes/seccomp-disable-tsc-option patches.suse/self-ptrace.patch --RT patches.suse/rwlocks-enable-interrupts ######################################################## # Architecture-specific patches. These used to be all @@ -105,7 +114,6 @@ # ia64 ######################################################## patches.fixes/ia64-sparse-fixes.diff --RT patches.arch/ia64-rwlocks-enable-interrupts patches.fixes/nr-irqs-file patches.arch/mm-avoid-bad-page-on-lru patches.arch/ia64-page-migration @@ -129,8 +137,8 @@ ######################################################## patches.arch/x86-self-ptrace.patch patches.arch/x86-hpet-pre-read - patches.arch/x86_64-hpet-64bit-timer.patch - patches.suse/x86-mark_rodata_rw.patch ++needs_update patches.arch/x86_64-hpet-64bit-timer.patch ++needs_to_go_away patches.suse/x86-mark_rodata_rw.patch ######################################################## # x86_64/4096CPUS - from SGI @@ -182,14 +190,12 @@ patches.arch/s390-add-FREE_PTE_NR patches.arch/s390-08-02-zfcp-gpn-align-fix.diff - patches.arch/s390-08-05-af_iucv-msgpeek-fix.patch ######################################################## # VM/FS patches ######################################################## --RT patches.suse/unmap_vmas-lat -+andrea patches.suse/silent-stack-overflow + patches.suse/unmap_vmas-lat patches.suse/silent-stack-overflow-2.patch patches.fixes/do_anonymous_page-race patches.fixes/oom-warning @@ -229,19 +235,18 @@ # Check resource conflicts between hwmon and ACPI OpRegs patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch - patches.arch/acpi_thinkpad_remove_R40e_c-state_blacklist.patch - patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch ++needs_update patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch patches.arch/acpi_thermal_passive_blacklist.patch - patches.arch/thinkpad_fingers_off_backlight_igd.patch - patches.arch/acpi_video_thinkpad_exclude_IGD_devices.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 - patches.suse/acpi_osi_sle11_ident.patch ++still_needed? patches.suse/acpi_osi_sle11_ident.patch ######################################################## @@ -255,10 +260,6 @@ +trenn patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch +trenn patches.drivers/cpufreq_add_idle_microaccounting_6.patch - patches.fixes/cpufreq_export_latency.patch - patches.fixes/cpufreq_ondemand_adjust_sampling_rate_limit.patch - patches.fixes/cpufreq_ondemand_performance_optimise_default_settings.patch - ######################################################## # AGP, graphics related stuff ######################################################## @@ -269,7 +270,7 @@ ######################################################## # TIOCGDEV - suse special patches.fixes/tiocgdev - patches.suse/mm-increase-dirty-limits.patch ++still_needed? patches.suse/mm-increase-dirty-limits.patch ######################################################## # Networking, IPv6 @@ -302,56 +303,8 @@ ######################################################## # Reiserfs Patches ######################################################## - - # From -mm - - patches.suse/reiserfs-mount-count - patches.suse/reiserfs-inode-init - patches.fixes/reiserfs-prealloc-fix - patches.fixes/reiserfs-commit-ids-unsigned-ints - - # Better error handling and reporting - patches.suse/reiserfs-buffer-info-for-balance.diff - patches.suse/reiserfs-consistent-messages.diff - patches.suse/reiserfs-reiserfs_info.diff - patches.suse/reiserfs-reiserfs-warning.diff - patches.suse/reiserfs_warning-reentrant - patches.suse/reiserfs-reiserfs_panic.diff - patches.suse/reiserfs-rearrange-journal-abort.diff - patches.suse/reiserfs-add-reiserfs_error.diff - patches.suse/reiserfs-use-reiserfs_error.diff - - # Extended attribute rework - patches.suse/reiserfs-remove-xinode - patches.suse/reiserfs-xattr-get-page - patches.suse/reiserfs-remove-link-detection.diff - patches.suse/reiserfs-xattr-S_PRIVATE - patches.suse/reiserfs-clean-up-xattrs - patches.suse/reiserfs-simplify-xattr-internal-file-lookups-opens.diff - patches.suse/reiserfs-eliminate-per-super-xattr-lock.diff - patches.suse/reiserfs-make-per-inode-xattr-locking-more-fine-grained.diff - patches.suse/reiserfs-remove-i_has_xattr_dir.diff - patches.suse/reiserfs-use-generic-xattr-handlers.diff - patches.suse/reiserfs-journaled-xattrs.diff - patches.suse/reiserfs-kill-xattr-readdir.diff - patches.suse/reiserfs-selinux.diff - - # Code cleanups - patches.suse/reiserfs-simplify-buffer-info.diff - patches.suse/reiserfs-cleanup-path-funcs.diff - patches.suse/reiserfs-strip-whitespace.diff - patches.suse/reiserfs-rename-p_s_sb.diff - patches.suse/reiserfs-rename-p_s_bh.diff - patches.suse/reiserfs-rename-p_s_inode.diff - patches.suse/reiserfs-rename-p_s_tb.diff - patches.suse/reiserfs-rename-p_._.diff - patches.suse/reiserfs-rename-._.diff - - # Fixes - patches.fixes/reiserfs-varargs-fix - patches.fixes/reiserfs-error-buffer-locking - patches.fixes/reiserfs-debug-1036 patches.suse/reiserfs-barrier-default + patches.fixes/reiserfs-expose-privroot ######################################################## # ocfs2 @@ -366,20 +319,12 @@ patches.suse/xfs-nfsd-dmapi-aware patches.fixes/xfs-dmapi-fixes patches.fixes/xfs-redirty-ENOSPC.patch + patches.fixes/xfs-export-debug ######################################################## # novfs ######################################################## - patches.suse/novfs-add-the-novell-filesystem-client-kernel-module.patch - patches.suse/convert-novfs-to-open-soure-coding-standards.patch - patches.suse/novfs-merge-changes.diff - patches.suse/novfs-stupid-DbgPrint - patches.suse/novfs-patch-2.6.27 - patches.suse/novfs-patch-2.6.29 - patches.suse/novfs-gregorian-day-fix - patches.suse/novfs-map-drives-correctly.diff - patches.suse/novfs-clear-mappeddrives.patch - patches.suse/novfs-creds-change-2.6.29 + patches.suse/novfs-client-module ######################################################## # other filesystem stuff @@ -398,8 +343,6 @@ # filtering purposes. ######################################################## - # anyone want to refresh this one? - patches.suse/netfilter-ipv4options patches.suse/netfilter-ipt_LOG-mac patches.suse/netfilter-ip_conntrack_slp.patch @@ -442,9 +385,6 @@ patches.fixes/scsi-dh-alua-send-stpg patches.fixes/scsi-check-host-lookup-failure - patches.suse/scsi-check-removed-device-for-offline - patches.fixes/scsi_dh-retry-on-UNIT_ATTENTION - # Remaining SCSI patches (garloff) patches.suse/scsi-error-test-unit-ready-timeout @@ -456,7 +396,6 @@ patches.fixes/sd_liberal_28_sense_invalid.diff patches.fixes/scsi-ibmvscsi-module_alias.patch - patches.fixes/scsi-ibmvfc_prli_initiator_fix.patch ######################################################## # DRM/Video @@ -478,13 +417,8 @@ # Wireless Networking ######################################################## patches.suse/wireless-no-aes-select - patches.fixes/iwl3945-fix-rfkill.patch - patches.fixes/iwlagn-fix-rfkill.patch - patches.fixes/b43legacy-fix-led_device_naming.diff - patches.fixes/iwlwifi-fix-iwl-3945_led_device_naming.diff - patches.fixes/iwlwifi-fix-iwl-led_device_naming.diff - patches.fixes/rt2x00-fix-led_device_naming.diff - patches.fixes/ath9k-fix-led_device_naming.diff ++still_needed? patches.fixes/iwl3945-fix-rfkill.patch ++still_needed? patches.fixes/iwlagn-fix-rfkill.patch ######################################################## # iSCSI @@ -500,6 +434,7 @@ ######################################################## # sysfs / driver core ######################################################## + patches.suse/devtmpfs.patch ######################################################## # USB @@ -603,7 +538,7 @@ +needs_update patches.apparmor/security-listxattr.diff +needs_update patches.apparmor/vfs-removexattr.diff +needs_update patches.apparmor/security-removexattr.diff -+needs_update patches.apparmor/unambiguous-__d_path.diff ++needs_update patches.apparmor/unambiguous-__d_path.diff #see bnc#490902 +needs_update patches.apparmor/d_namespace_path.diff +needs_update patches.apparmor/d_namespace_path_oops_fix.diff +needs_update patches.apparmor/fsetattr.diff @@ -642,10 +577,8 @@ patches.suse/kdb-common patches.suse/kdb-x86 patches.suse/kdb-ia64 - patches.suse/kdb-serial-8250 ++still_needed? patches.suse/kdb-serial-8250 patches.fixes/kdb-fix-stack-overflow.patch - patches.suse/kdb-resolve-uv-conflict.diff - patches.fixes/kdb-read-CR.diff ######################################################## # Other patches for debugging @@ -656,19 +589,8 @@ patches.arch/x86_64-unwind-annotations ######################################################## - # Perfmon - ######################################################## - patches.suse/perfmon2.patch - patches.suse/perfmon2-fix_disabled.patch - patches.suse/perfmon2-remove_syscalls.patch - patches.suse/perfmon2-remove_get_base_syscall_attr.patch - patches.suse/perfmon2-add_ioctl_interface.patch - - ######################################################## # Kdump ######################################################## - patches.fixes/kdb-kdump.diff - patches.fixes/kdb-oops-panic.diff patches.suse/kdump-dump_after_notifier.patch patches.fixes/firmware-memmap-64bit.diff @@ -683,60 +605,25 @@ # Tracing ######################################################## - patches.trace/lttng-instrumentation-irq.patch - patches.trace/lttng-instrumentation-timer.patch - patches.trace/lttng-instrumentation-kernel.patch - patches.trace/lttng-instrumentation-filemap.patch - patches.trace/lttng-instrumentation-swap.patch - patches.trace/lttng-instrumentation-memory.patch - patches.trace/lttng-instrumentation-page_alloc.patch - patches.trace/lttng-instrumentation-hugetlb.patch - patches.trace/lttng-instrumentation-net.patch - patches.trace/lttng-instrumentation-ipv4.patch - patches.trace/lttng-instrumentation-ipv6.patch - patches.trace/lttng-instrumentation-socket.patch - patches.trace/lttng-instrumentation-fs.patch - patches.trace/lttng-instrumentation-ipc.patch ++needs_updating patches.trace/lttng-instrumentation-irq.patch ++needs_updating patches.trace/lttng-instrumentation-timer.patch ++needs_updating patches.trace/lttng-instrumentation-kernel.patch ++needs_updating patches.trace/lttng-instrumentation-filemap.patch ++needs_updating patches.trace/lttng-instrumentation-swap.patch ++needs_updating patches.trace/lttng-instrumentation-memory.patch ++needs_updating patches.trace/lttng-instrumentation-page_alloc.patch ++needs_updating patches.trace/lttng-instrumentation-hugetlb.patch ++needs_updating patches.trace/lttng-instrumentation-net.patch ++needs_updating patches.trace/lttng-instrumentation-ipv4.patch ++needs_updating patches.trace/lttng-instrumentation-ipv6.patch ++needs_updating patches.trace/lttng-instrumentation-socket.patch ++needs_updating patches.trace/lttng-instrumentation-fs.patch ++needs_updating patches.trace/lttng-instrumentation-ipc.patch patches.trace/ftrace-framepointer.diff patches.trace/utrace-core - ######################################################## - # Swap over NFS - ######################################################## - - patches.suse/SoN-01-mm-gfp-to-alloc_flags.patch - patches.suse/SoN-02-mm-setup_per_zone_pages_min.patch - patches.suse/SoN-05-doc.patch - patches.suse/SoN-06-mm-gfp-to-alloc_flags-expose.patch - patches.suse/SoN-07-page_alloc-reserve.patch - patches.suse/SoN-08-reserve-slub.patch - patches.suse/SoN-fix-uninitialized-variable.patch - patches.suse/SoN-09-mm-kmem_estimate_pages.patch - patches.suse/SoN-10-mm-PF_MEMALLOC-softirq.patch - patches.suse/SoN-11-mm-page_alloc-emerg.patch - patches.suse/SoN-12-global-ALLOC_NO_WATERMARKS.patch - patches.suse/SoN-13-mm-page_alloc-GFP_EMERGENCY.patch - patches.suse/SoN-14-mm-reserve.patch - patches.suse/SoN-15-mm-selinux-emergency.patch - patches.suse/SoN-17-net-ps_rx.patch - patches.suse/SoN-18-net-sk_allocation.patch - patches.suse/SoN-19-netvm-reserve.patch - patches.suse/SoN-20-netvm-reserve-inet.patch - patches.suse/SoN-20-netvm-reserve-inet.patch-fix - patches.suse/SoN-21-netvm-skbuff-reserve.patch - patches.suse/SoN-22-netvm-sk_filter.patch - patches.suse/SoN-23-netvm-tcp-deadlock.patch - patches.suse/SoN-24-emergency-nf_queue.patch - patches.suse/SoN-25-netvm.patch - patches.suse/SoN-26-mm-swapfile.patch - patches.suse/SoN-fix-sync - patches.suse/SoN-27-mm-page_file_methods.patch - patches.suse/SoN-28-nfs-swapcache.patch - patches.suse/SoN-29-nfs-swapper.patch - patches.suse/SoN-30-nfs-swap_ops.patch - patches.suse/SoN-31-nfs-alloc-recursions.patch patches.fixes/nfs-write.c-bug-removal.patch patches.fixes/ia64-configure-HAVE_UNSTABLE_SCHED_CLOCK-for-SGI_SN.patch @@ -769,11 +656,11 @@ 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-reassign-resources patches.xen/pci-guestdev patches.xen/sfc-driverlink patches.xen/sfc-resource-driver patches.xen/sfc-driverlink-conditional + patches.xen/sfc-external-sram # bulk stuff, new files for xen patches.xen/xen3-auto-xen-arch.diff @@ -792,13 +679,15 @@ # 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 - patches.xen/xen3-fixup-sfc # ports of other patches patches.xen/xen3-patch-2.6.18 @@ -812,19 +701,14 @@ 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-rc4 - patches.xen/xen3-patch-2.6.29-rc4-rc5 - patches.xen/xen3-patch-2.6.29-rc5-rc6 - patches.xen/xen3-patch-2.6.29-rc6-rc7 - patches.xen/xen3-patch-2.6.29-rc7-rc8 + patches.xen/xen3-patch-2.6.29 + patches.xen/xen3-patch-2.6.30-rc4 + patches.xen/xen3-patch-2.6.30-rc4-rc5 patches.xen/xen3-seccomp-disable-tsc-option - patches.xen/xen3-rwlocks-enable-interrupts - patches.xen/xen3-x86-mark_rodata_rw.patch -+andrea patches.xen/xen3-silent-stack-overflow ++needs_to_go_away patches.xen/xen3-x86-mark_rodata_rw.patch + patches.xen/xen3-devtmpfs.patch patches.xen/xen3-kdb-x86 patches.xen/xen3-stack-unwind - patches.xen/xen3-perfmon2.patch - patches.xen/xen3-perfmon2-remove_syscalls.patch patches.xen/xen3-panic-on-io-nmi.diff patches.xen/xen3-x86_64-unwind-annotations @@ -856,7 +740,6 @@ patches.xen/xen-x86-pmd-handling patches.xen/xen-x86-bigmem patches.xen/xen-x86-machphys-prediction - patches.xen/xen-x86-no-lazy-tlb patches.xen/xen-x86-exit-mmap patches.xen/xen-x86-exports patches.xen/xen-x86_64-pgd-pin ++++++ source-post.sh ++++++ --- /var/tmp/diff_new_pack.zL7515/_old 2009-05-20 10:56:25.000000000 +0200 +++ /var/tmp/diff_new_pack.zL7515/_new 2009-05-20 10:56:25.000000000 +0200 @@ -10,15 +10,4 @@ && ln -s "$1" "$2" } -relink linux-@KERNELRELEASE@@VARIANT@ /usr/src/linux@VARIANT@ -cd /usr/src -for a in linux-@KERNELRELEASE@@VARIANT@-obj/*; do - if [ ! -d "$a" -o -h "$a" ]; then - # skip symlinks like i586 -> i386 - continue - fi - for d in "$a"/*; do - arch_flavor=${d#*/} - relink ../../"$d" /usr/src/linux-obj/"$arch_flavor" - done -done +relink linux-@KERNELRELEASE@@SRCVARIANT@ /usr/src/linux@SRCVARIANT@ ++++++ source-timestamp ++++++ 2009-05-19 18:03:55 +0200 GIT Revision: 15e77baed5e8a3bf8b01fe7e216779ce8fde3382 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

commit audacity for openSUSE:Factory
by root＠Hilbert.suse.de 20 May '09

20 May '09

Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at Wed May 20 03:10:41 CEST 2009. -------- --- audacity/audacity.changes 2009-04-08 17:02:16.000000000 +0200 +++ audacity/audacity.changes 2009-05-11 23:10:23.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 11 23:08:12 CEST 2009 - cmorve69(a)yahoo.es + +- removed unneeded BuildRequires +- make ffmpeg, mad and twolame support build options +- use upstream .desktop file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- audacity.desktop New: ---- audacity-1.3.7-desktop_file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.Dp8190/_old 2009-05-20 03:10:04.000000000 +0200 +++ /var/tmp/diff_new_pack.Dp8190/_new 2009-05-20 03:10:04.000000000 +0200 @@ -16,22 +16,32 @@ # +%bcond_with ffmpeg +%bcond_with mad +%bcond_with twolame Name: audacity -BuildRequires: SDL-devel flac-devel gcc-c++ glib-devel id3lib-devel jack-devel -BuildRequires: libexpat-devel libid3tag-devel libmspack-devel libsamplerate-devel -BuildRequires: libsndfile-devel libtiff-devel libvorbis-devel soundtouch-devel -BuildRequires: unixODBC-devel update-desktop-files wxGTK-devel zip -%define DISTRIBUTABLE 1 +BuildRequires: flac-devel gcc-c++ glib-devel jack-devel libexpat-devel +BuildRequires: libid3tag-devel libsamplerate-devel libsndfile-devel +BuildRequires: libvorbis-devel soundtouch-devel update-desktop-files +BuildRequires: wxGTK-devel +%if %{with ffmpeg} +BuildRequires: libffmpeg-devel +%endif +%if %{with mad} +BuildRequires: libmad-devel +%endif +%if %{with twolame} +BuildRequires: libtwolame-devel +%endif Summary: A Free, Cross-Platform Digital Audio Editor Version: 1.3.7 -Release: 2 +Release: 3 License: GPL v2 or later Group: Productivity/Multimedia/Sound/Editors and Convertors BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://audacity.sourceforge.net/ Source: %{name}-minsrc-%{version}.tar.bz2 -Source1: %{name}.desktop Source2: %{name}.png #PATCH-FIX-OPENSUSE return_non_void.patch fixed non-void return value (bnc#477654) Patch1: %{name}-%{version}-return_non_void.patch @@ -42,6 +52,7 @@ #PATCH-FIX-UPSTREAM fix build issues when linked wxGTK configured with --enable-stl flag Patch8: %{name}-%{version}-wxGTK_with_stl.patch Patch9: %{name}-%{version}-modal-help-dialog.patch +Patch10: %{name}-%{version}-desktop_file.patch %description Audacity is a program that manipulates digital audio wave forms. In @@ -77,29 +88,39 @@ %patch6 %patch8 %patch9 +%patch10 %build %{?suse_update_config:%{suse_update_config -f . lib-src/*/.}} export AUTOMAKE="automake --foreign" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure \ --enable-unicode \ - --with-vorbis=system \ -%if %DISTRIBUTABLE - --without-libmad \ + --with-libvorbis=system \ +%if %{with ffmpeg} + --with-ffmpeg=system \ %else + --without-ffmpeg \ +%endif +%if %{with mad} --with-libmad=system \ +%else + --without-libmad \ +%endif +%if %{with twolame} + --with-libtwolame=system \ +%else + --without-libtwolame \ %endif --with-libsndfile=system \ - --with-flac=system \ - --with-id3tag=system \ + --with-libflac=system \ + --with-libid3tag=system \ --with-libsamplerate=system \ --with-portaudio=v19 -make +make %{?jobs:-j %jobs} %install make DESTDIR=$RPM_BUILD_ROOT install -%suse_update_desktop_file -i audacity AudioVideo AudioVideoEditing +%suse_update_desktop_file audacity install -d -m755 $RPM_BUILD_ROOT%{_datadir}/pixmaps install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps # we will add docs later in %files section @@ -120,6 +141,10 @@ %{_datadir}/mime/packages/audacity.xml %changelog +* Mon May 11 2009 cmorve69(a)yahoo.es +- removed unneeded BuildRequires +- make ffmpeg, mad and twolame support build options +- use upstream .desktop file * Wed Apr 08 2009 mseben(a)suse.cz - added wxGTK_with_stl.patch to fix build issues when linking wxGTK configured with --enable-stl flag ++++++ audacity-1.3.7-desktop_file.patch ++++++ --- src/audacity.desktop +++ src/audacity.desktop @@ -1,6 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 - Name=Audacity Sound Editor Name[de]=Audacity Audio-Editor Name[ru]=Audacity @@ -11,10 +9,10 @@ Comment[de]=Audio-Dateien aufnehmen und bearbeiten Comment[ru]=Запись и редактирование звуковых файлов -Icon=/usr/share/audacity/audacity.xpm +Icon=audacity Type=Application -Categories=Application;AudioVideo;Audio;AudioVideoEditing; +Categories=AudioVideo;Audio;AudioVideoEditing; Exec=audacity StartupNotify=false ++++++ audacity.png ++++++ Files audacity/audacity.png and audacity/audacity.png differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 clanlib for openSUSE:Factory
by root＠Hilbert.suse.de 20 May '09

20 May '09

Hello community, here is the log from the commit of package clanlib for openSUSE:Factory checked in at Wed May 20 03:08:54 CEST 2009. -------- --- clanlib/clanlib.changes 2009-04-30 14:33:43.000000000 +0200 +++ clanlib/clanlib.changes 2009-05-19 15:10:05.000000000 +0200 @@ -1,0 +2,11 @@ +Tue May 19 12:46:08 CEST 2009 - prusnak(a)suse.cz + +- updated to 2.0.2 + * New (revived) display target: SDL + * New example: GUICustomComponent (game-gui) + * New example: PostProcessing (using shaders) +- fixed missing includes (includes.patch) +- removed obsoleted patches: + * used-twice.patch (mainline) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ClanLib-2.0.1.tar.bz2 clanlib-2.0.1-used-twice.patch New: ---- clanlib-2.0.2-includes.patch ClanLib-2.0.2-repack.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clanlib.spec ++++++ --- /var/tmp/diff_new_pack.OT3378/_old 2009-05-20 03:06:44.000000000 +0200 +++ /var/tmp/diff_new_pack.OT3378/_new 2009-05-20 03:06:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package clanlib (Version 2.0.1) +# spec file for package clanlib (Version 2.0.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,13 +23,18 @@ License: Other uncritical OpenSource License Group: System/Libraries Url: http://www.clanlib.org/ -Version: 2.0.1 +Version: 2.0.2 Release: 1 Summary: A Portable Interface for Writing Games -Source: ClanLib-%{version}.tar.bz2 -Patch0: %{name}-%{version}-used-twice.patch +# upstream tarball ClanLib-%{version}.tar.gz after removing these files: +# * ClanLib-2.0.2/Examples/DiceWar/Resources/accid___.ttf +# * ClanLib-2.0.2/Examples/DiceWar/Resources/accid___.txt +# * ClanLib-2.0.2/Tests/Display/SpriteSpeed1/SpriteSpeed1-CL08.exe +# * ClanLib-2.0.2/Tests/Display/SpriteSpeed1/SpriteSpeed1-CL09.exe +Source: ClanLib-%{version}-repack.tar.bz2 +Patch0: %{name}-%{version}-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: Mesa-devel alsa-devel fontconfig-devel freetype2-devel libjpeg-devel libmikmod-devel libogg-devel libpng-devel libstdc++-devel libvorbis-devel libxslt pcre-devel sqlite3-devel zlib-devel +BuildRequires: Mesa-devel SDL-devel SDL_gfx-devel alsa-devel fontconfig-devel freetype2-devel libjpeg-devel libmikmod-devel libogg-devel libpng-devel libstdc++-devel libvorbis-devel libxslt pcre-devel sqlite3-devel zlib-devel BuildRequires: doxygen gcc-c++ %description @@ -127,7 +132,7 @@ %files devel %defattr(-, root, root) -%doc CODING_STYLE PATCHES PERFORMANCE.txt README.anjuta README.kdevelop TODO.txt +%doc CODING_STYLE PATCHES README.anjuta README.kdevelop TODO.txt %{_includedir}/* %{_libdir}/pkgconfig/* %{_libdir}/libclan*.so @@ -144,6 +149,14 @@ %{_datadir}/doc/clanlib-%{clan_ver}/Examples/* %changelog +* Tue May 19 2009 prusnak(a)suse.cz +- updated to 2.0.2 + * New (revived) display target: SDL + * New example: GUICustomComponent (game-gui) + * New example: PostProcessing (using shaders) +- fixed missing includes (includes.patch) +- removed obsoleted patches: + * used-twice.patch (mainline) * Thu Apr 30 2009 prusnak(a)suse.cz - updated to 2.0.1 * changes too numerous to list ++++++ clanlib-2.0.2-includes.patch ++++++ --- Sources/Core/Text/string_help.cpp +++ Sources/Core/Text/string_help.cpp @@ -35,6 +35,7 @@ #include <wctype.h> #include <string.h> #include <stdlib.h> +#include <stdio.h> #else #include <string.h> #include <tchar.h> --- Sources/Display/X11/input_device_provider_x11keyboard.cpp +++ Sources/Display/X11/input_device_provider_x11keyboard.cpp @@ -33,6 +33,7 @@ #include "API/Display/Window/keys.h" #include "API/Core/Text/string_help.h" #include "x11_window.h" +#include <stdio.h> ///////////////////////////////////////////////////////////////////////////// // CL_InputDeviceProvider_X11Keyboard construction: --- Sources/Display/X11/x11_window.cpp +++ Sources/Display/X11/x11_window.cpp @@ -52,6 +52,7 @@ #include "display_message_queue_x11.h" #include "timer_provider_x11.h" #include <X11/Xatom.h> +#include <stdio.h> CL_X11Window::CL_X11Window(CL_DisplayMessageQueue_X11 *message_queue) : window(0), window_last_focus(0), cmap(0), allow_resize(false), bpp(0), message_queue(message_queue), fullscreen(false), --- Sources/GL/GLX/opengl_window_provider_glx.cpp +++ Sources/GL/GLX/opengl_window_provider_glx.cpp @@ -48,6 +48,7 @@ #include "../opengl_graphic_context_provider.h" #include "../opengl_target_provider.h" #include "Display/X11/timer_provider_x11.h" +#include <stdio.h> namespace { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 clicfs for openSUSE:Factory
by root＠Hilbert.suse.de 20 May '09

20 May '09

Hello community, here is the log from the commit of package clicfs for openSUSE:Factory checked in at Wed May 20 03:03:15 CEST 2009. -------- --- clicfs/clicfs.changes 2009-05-18 13:48:13.000000000 +0200 +++ clicfs/clicfs.changes 2009-05-19 18:02:31.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 19 18:02:09 CEST 2009 - coolo(a)novell.com + +- use fseeko instead of fseek (bnc#504627) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clicfs.spec ++++++ --- /var/tmp/diff_new_pack.g27767/_old 2009-05-20 03:02:04.000000000 +0200 +++ /var/tmp/diff_new_pack.g27767/_new 2009-05-20 03:02:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package clicfs (Version 1.1.2) +# spec file for package clicfs (Version 1.1.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ BuildRequires: cmake fuse-devel gcc-c++ openssl-devel xz-devel Requires: fuse Summary: Compressed Loop Image Container -Version: 1.1.2 +Version: 1.1.3 Release: 1 License: GPL v2 only Group: System/Filesystems @@ -62,6 +62,8 @@ %_mandir/man1/* %changelog +* Tue May 19 2009 coolo(a)novell.com +- use fseeko instead of fseek (bnc#504627) * Mon May 18 2009 coolo(a)novell.com - make the file size 64bit (bnc#504627) * Mon May 18 2009 coolo(a)novell.com ++++++ clicfs.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/src/clicfs_common.c new/src/clicfs_common.c --- old/src/clicfs_common.c 2009-05-18 13:45:56.000000000 +0200 +++ new/src/clicfs_common.c 2009-05-19 18:01:14.000000000 +0200 @@ -207,8 +207,8 @@ size_t clic_readpart(unsigned char *buffer, int part) { - if (fseek(packfile, offs[part], SEEK_SET)) { - fprintf(stderr, "seek failed %d %ld\n", part, (long)offs[part]); + if (fseeko(packfile, offs[part], SEEK_SET)) { + fprintf(stderr, "seek failed %d %lld\n", part, (long long)offs[part]); return 0; } #if defined(DEBUG) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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