February 2010 - openSUSE Commits - openSUSE Mailing Lists

commit espeak for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package espeak for openSUSE:Factory checked in at Thu Feb 25 13:48:19 CET 2010. -------- --- espeak/espeak.changes 2008-10-13 23:54:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/espeak/espeak.changes 2010-02-06 11:29:43.000000000 +0100 @@ -1,0 +2,4 @@ +Fri Feb 05 19:08:03 CEST 2010 - embar(a)users.berlios.de +- fixed bug #549899 + (enabled portaudio support and disabled pulseaudio) +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- Makefile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ espeak.spec ++++++ --- /var/tmp/diff_new_pack.67x723/_old 2010-02-25 13:44:47.000000000 +0100 +++ /var/tmp/diff_new_pack.67x723/_new 2010-02-25 13:44:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package espeak (Version 1.39) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,10 +22,11 @@ Name: espeak BuildRequires: gcc-c++ jack jack-devel portaudio portaudio-devel pulseaudio-devel Version: 1.39 -Release: 2 -License: GPL v3 or later +Release: 3 +License: GPLv3+ Group: Productivity/Other Source: espeak-1.39.tbz2 +Patch: Makefile.patch Summary: TTS system for English/German and other languages PreReq: %insserv_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,10 +41,10 @@ Jonathan Duddington <jonsd(a)users.sourceforge.net> %package devel -License: GPL v3 or later +License: GPLv3+ Summary: TTS system for English/German and other languages Group: Productivity/Other -Requires: espeak +Requires: espeak portaudio %description devel espeak is a multi-lingual text-to-speach system @@ -56,7 +57,7 @@ %prep %setup -n espeak-1.39/src -#%patch -p2 +%patch -p2 %build make CFLAGS="$RPM_OPT_FLAGS -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE" LIB_CFLAGS="$RPM_OPT_FLAGS -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -fPIC" ++++++ Makefile.patch ++++++ diff -ur espeak-1.39.orig/src/Makefile espeak-1.39/src/Makefile --- espeak-1.39.orig/src/Makefile 2008-10-14 01:17:36.000000000 +0300 +++ espeak-1.39/src/Makefile 2010-02-05 21:09:42.000000000 +0200 @@ -24,8 +24,8 @@ LN_SF = /bin/ln -sf MKDIR = mkdir -p -#AUDIO = portaudio -AUDIO = pulseaudio +AUDIO = portaudio +#AUDIO = pulseaudio #AUDIO = sada ifeq ($(AUDIO),pulseaudio) ++++++ espeak-1.39.tbz2 ++++++ Files espeak/espeak-1.39.tbz2 and /mounts/work_src_done/STABLE/espeak/espeak-1.39.tbz2 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 gcc for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package gcc for openSUSE:Factory checked in at Thu Feb 25 13:44:12 CET 2010. -------- --- gcc/gcc.changes 2010-02-16 16:45:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/gcc/gcc.changes 2010-02-25 13:14:43.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 25 13:03:44 CET 2010 - rguenther(a)suse.de + +- Re-add gcc-c++-32bit and gcc-c++-64bit packages. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcc.spec ++++++ --- /var/tmp/diff_new_pack.PcRGwJ/_old 2010-02-25 13:43:35.000000000 +0100 +++ /var/tmp/diff_new_pack.PcRGwJ/_new 2010-02-25 13:43:35.000000000 +0100 @@ -32,7 +32,7 @@ %define gcc_suffix 4.5 License: GPLv2+ Version: 4.5 -Release: 1 +Release: 2 Group: Development/Languages/C and C++ Summary: The system GNU C Compiler Provides: c_compiler @@ -132,6 +132,32 @@ The system GNU C++ Compiler. +%package -n gcc-c++-32bit +License: LGPLv2.1+ +Group: Development/Languages/C and C++ +Summary: The system GNU C++ Compiler +Provides: c++_compiler +Requires: g++ = %{version} +Requires: gcc-32bit = %{version} +Requires: libstdc++%{gcc_version}-devel-32bit + +%description -n gcc-c++-32bit +The system GNU C++ Compiler 32 bit support. + + +%package -n gcc-c++-64bit +License: LGPLv2.1+ +Group: Development/Languages/C and C++ +Summary: The system GNU C++ Compiler +Provides: c++_compiler +Requires: g++ = %{version} +Requires: gcc-64bit = %{version} +Requires: libstdc++%{gcc_version}-devel-64bit + +%description -n gcc-c++-64bit +The system GNU C++ Compiler 64 bit support. + + %package -n libstdc++-devel License: GPLv2+ @@ -168,10 +194,7 @@ Requires: gcc-fortran = %{version} %description -n gcc-fortran-32bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "32bit" ending - -The system GNU Fortran Compiler. +The system GNU Fortran Compiler 32 bit support. @@ -187,10 +210,7 @@ Requires: gcc-fortran = %{version} %description -n gcc-fortran-64bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "64bit" ending - -The system GNU Fortran Compiler. +The system GNU Fortran Compiler 64 bit support. @@ -241,10 +261,7 @@ Requires: gcc%{gcc_version}-gij-32bit %description -n gcc-gij-32bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "32bit" ending - -The system GNU Java bytecode interpreter. +The system GNU Java bytecode interpreter as 32 bit application. @@ -255,10 +272,7 @@ Requires: gcc%{gcc_version}-gij-64bit %description -n gcc-gij-64bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "64bit" ending - -The system GNU Java bytecode interpreter. +The system GNU Java bytecode interpreter as 64 bit application. @@ -285,10 +299,7 @@ Requires: gcc-objc = %{version} %description -n gcc-objc-32bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "32bit" ending - -The system GNU Objective C Compiler. +The system GNU Objective C Compiler 32 bit support. @@ -300,10 +311,7 @@ Requires: gcc-objc = %{version} %description -n gcc-objc-64bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "64bit" ending - -The system GNU Objective C Compiler. +The system GNU Objective C Compiler 64 bit support. @@ -353,9 +361,6 @@ Requires: libffi%{gcc_version}-devel-32bit %description -n libffi-devel-32bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "32bit" ending - The system GNU Foreign Function Interface library development files. @@ -367,9 +372,6 @@ Requires: libffi%{gcc_version}-devel-64bit %description -n libffi-devel-64bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "64bit" ending - The system GNU Foreign Function Interface library development files. @@ -585,6 +587,11 @@ # empty - only for the dependency %doc README +%files -n gcc-c++-32bit +%defattr(-,root,root) +# empty - only for the dependency +%doc README + %files -n gcc-fortran-32bit %defattr(-,root,root) # empty - only for the dependency @@ -611,6 +618,11 @@ %defattr(-,root,root) # empty - only for the dependency %doc README + +%files -n gcc-c++-64bit +%defattr(-,root,root) +# empty - only for the dependency +%doc README %files -n gcc-fortran-64bit %defattr(-,root,root) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gcc33 for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package gcc33 for openSUSE:Factory checked in at Thu Feb 25 13:43:30 CET 2010. -------- --- gcc33/gcc33.changes 2010-02-19 12:49:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/gcc33/gcc33.changes 2010-02-25 11:17:09.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 24 13:58:37 CET 2010 - rguenther(a)suse.de + +- fix libstdc++ testsuite-hook warning + +------------------------------------------------------------------- libgcj33.changes: same change calling whatdependson for head-i586 New: ---- testsuite-hooks.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcc33.spec ++++++ --- /var/tmp/diff_new_pack.f7lFDe/_old 2010-02-25 13:43:06.000000000 +0100 +++ /var/tmp/diff_new_pack.f7lFDe/_new 2010-02-25 13:43:06.000000000 +0100 @@ -124,7 +124,7 @@ Url: http://gcc.gnu.org/ License: GPL Version: 3.3.3 -Release: 17 +Release: 18 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -3.3 @@ -205,6 +205,7 @@ Patch84: libstdc++-config.diff Patch85: gcc44-fixes.patch Patch86: bison-errors.patch +Patch87: testsuite-hooks.patch # LIBJAVA-DELETE-BEGIN @@ -1181,6 +1182,7 @@ %patch84 %patch85 %patch86 +%patch87 %build # Avoid conflict with commercial libjawt.so ++++++ libgcj33.spec ++++++ --- /var/tmp/diff_new_pack.f7lFDe/_old 2010-02-25 13:43:06.000000000 +0100 +++ /var/tmp/diff_new_pack.f7lFDe/_new 2010-02-25 13:43:06.000000000 +0100 @@ -135,7 +135,7 @@ Url: http://gcc.gnu.org/ License: GPL Version: 3.3.3 -Release: 17 +Release: 18 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -3.3 @@ -216,6 +216,7 @@ Patch84: libstdc++-config.diff Patch85: gcc44-fixes.patch Patch86: bison-errors.patch +Patch87: testsuite-hooks.patch Summary: Java Runtime Library for gcc Group: System/Libraries @@ -579,6 +580,7 @@ %patch84 %patch85 %patch86 +%patch87 %build # Avoid conflict with commercial libjawt.so ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.f7lFDe/_old 2010-02-25 13:43:07.000000000 +0100 +++ /var/tmp/diff_new_pack.f7lFDe/_new 2010-02-25 13:43:07.000000000 +0100 @@ -199,6 +199,7 @@ Patch84: libstdc++-config.diff Patch85: gcc44-fixes.patch Patch86: bison-errors.patch +Patch87: testsuite-hooks.patch # LIBJAVA-DELETE-BEGIN @@ -790,6 +791,7 @@ %patch84 %patch85 %patch86 +%patch87 %build ++++++ testsuite-hooks.patch ++++++ --- libstdc++-v3/testsuite/testsuite_hooks.h.orig 2010-02-25 11:14:35.000000000 +0100 +++ libstdc++-v3/testsuite/testsuite_hooks.h 2010-02-25 11:15:38.000000000 +0100 @@ -254,6 +254,7 @@ if (rhs.throw_on_copy_) assignment_operator::throw_on(assignment_operator::count() + 1); assignment_operator::mark_call(); + return *this; } ~copy_tracker() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

drop gcc44 from openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, FYI: Package gcc44 was dropped from openSUSE:Factory at Thu Feb 25 13:01:55 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=gc… 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

drop sle-sdk-release-sp from openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, FYI: Package sle-sdk-release-sp was dropped from openSUSE:Factory at Thu Feb 25 12:43:07 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=sl… 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

drop sle-sdk-release from openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, FYI: Package sle-sdk-release was dropped from openSUSE:Factory at Thu Feb 25 12:42:32 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=sl… 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

drop ulogd from openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, FYI: Package ulogd was dropped from openSUSE:Factory at Thu Feb 25 12:41:14 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=ul… 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

drop kpl from openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, FYI: Package kpl was dropped from openSUSE:Factory at Thu Feb 25 12:40:07 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=kpl 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

drop hippo-canvas from openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, FYI: Package hippo-canvas was dropped from openSUSE:Factory at Thu Feb 25 12:39:54 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=hi… 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

drop dwarfextract from openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, FYI: Package dwarfextract was dropped from openSUSE:Factory at Thu Feb 25 12:39:41 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=dw… 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

drop suse-sam from openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, FYI: Package suse-sam was dropped from openSUSE:Factory at Thu Feb 25 12:39:21 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=su… 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 ttf-wqy-zenhei for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package ttf-wqy-zenhei for openSUSE:Factory checked in at Thu Feb 25 12:21:33 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/ttf-wqy-zenhei/ttf-wqy-zenhei.changes 2010-02-25 12:21:17.024478000 +0100 @@ -0,0 +1,20 @@ +------------------------------------------------------------------- +Mon Aug 31 16:04:54 CEST 2009 - tiwai(a)suse.de + +- remove unneeded / invalid entries from font config files + (bnc#519059) +- add provides: locale() + +------------------------------------------------------------------- +Fri Jul 3 15:19:59 CEST 2009 - yfeng(a)novell.com + +- Add the SUSE header + +----------------------------------------------------------------- +Thu Jul 2 00:00:00 CEST 2009 - rainwoodman(a)gmail.com + +- Remove deprecated tags +- PreReq fontconfig for fontconfig dirs +- Fix install-no-mkdir-buildroot +- Import from swyear @ build.opensuse + calling whatdependson for head-i586 New: ---- ttf-wqy-zenhei.changes ttf-wqy-zenhei.spec wqy-zenhei-0.9.41-May.tar.bz2 wqy-zenhei-font-config-fixes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ttf-wqy-zenhei.spec ++++++ # # spec file for package ttf-wqy-zenhei (Version 0.9.41) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: ttf-wqy-zenhei License: GPL v2.0 (with font embedding exception **), see COPYING for details Group: System/X11/Fonts PreReq: %suseconfig_fonts_prereq AutoReqProv: on Version: 0.9.41 Release: 1 Url: http://wenq.org Source0: wqy-zenhei-%{version}-May.tar.bz2 Patch: wqy-zenhei-font-config-fixes.diff Provides: scalable-font-zh-TW, scalable-font-zh-CN, scalable-font-zh-SG Provides: locale(zh_TW;zh_CN;zh_SG) BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: open-source Chinese font for Hei Ti PreReq: fontconfig %description The WenQuanYi Zen Hei is the first open-source Chinese font for Hei Ti, a sans-serif font style that are widely used for general purpose text formatting, and on-screen display of Chinese characters (such as in Windows Vista and Mac OS). Simple and elegant font outlines and slightly emboldened strokes makes the glyphs presenting higher contrast and therefore easy to read. The unique style of this font also provide a simple interface for adding grid-fitting information for further fine-tuning of the on-screen performance. WenQuanYi Zen Hei contains arguably the largest number of Chinese Hanzi glyphs of all known open-source outline Chinese fonts: it has 20194 Hanzi glyphs covering 97% of the Unicode CJK Unified Ideographics [4]. This font provides full coverage to the required code points for zh_cn, zh_sg, zh_tw, zh_hk and zh_mo locales. The total vector glyphs in this font is over 35000 including Latin characters, Japanese kanas, hanguls and symbols from many other languages. Highly regarded WenQuanYi Bitmap Song fonts were embedded into this font for those who prefer shaper look of the text rendering, The embedded bitmap glyphs cover font sizes at 9pt, 10pt, 11pt and 12pt. The primary purpose of developing this font is to provide CJK (Chinese-Japanese-Korean) users a visually pleasing, standard compliant, platform independent and compact solution for displaying and printing Chinese on their computers. We wish you enjoying the font, and joining us to continuously improve this font for better performance and wider applications. %prep %setup -n wqy-zenhei %patch -p1 %build # Do nothing for build %install mkdir -p $RPM_BUILD_ROOT/usr/share/fonts/truetype mkdir -p $RPM_BUILD_ROOT/etc/fonts/conf.avail mkdir -p $RPM_BUILD_ROOT/etc/fonts/conf.d install -c -m 644 wqy-zenhei.ttc $RPM_BUILD_ROOT/usr/share/fonts/truetype/ #44- is too early to include in, embeddedbitmap will be enabled later, so move to 57- install -c -m 644 44-wqy-zenhei.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail/57-wqy-zenhei.conf install -c -m 644 66-wqy-zenhei-sharp.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail/57-wqy-zenhei-sharp.conf install -c -m 644 66-wqy-zenhei-sharp-no13px.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail/57-wqy-zenhei-sharp-no13px.conf cd $RPM_BUILD_ROOT/etc/fonts/conf.d ln -s ../conf.avail/57-wqy-zenhei.conf %clean [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; %post %run_suseconfig_fonts -c %postun %run_suseconfig_fonts -c %files %defattr(-, root,root) %doc ChangeLog INSTALL AUTHORS COPYING README WQY_ZENHEI_MONTHLY_BUILD zenheiset %dir /usr/share/fonts/truetype /usr/share/fonts/truetype/wqy-zenhei.ttc /etc/fonts/conf.avail/57-wqy-zenhei.conf /etc/fonts/conf.avail/57-wqy-zenhei-sharp.conf /etc/fonts/conf.avail/57-wqy-zenhei-sharp-no13px.conf /etc/fonts/conf.d/57-wqy-zenhei.conf %changelog ++++++ wqy-zenhei-font-config-fixes.diff ++++++ --- 44-wqy-zenhei.conf | 32 -------------------------------- 66-wqy-zenhei-sharp.conf | 40 ---------------------------------------- 2 files changed, 72 deletions(-) --- a/44-wqy-zenhei.conf +++ b/44-wqy-zenhei.conf @@ -10,37 +10,5 @@ <string>文泉驛正黑</string> </test> <edit name="globaladvance"><bool>false</bool></edit> - <edit name="spacing"><int>0</int></edit> - <edit name="antialias" mode="assign"><bool>true</bool></edit> - <edit name="hinting" mode="assign"><bool>true</bool></edit> - <edit name="hintstyle" mode="assign"><const>hintnone</const></edit> - <edit name="autohint" mode="assign"><bool>false</bool></edit> - <edit name="rh_prefer_bitmaps" mode="assign"><bool>false</bool></edit> - <edit name="rgba" mode="assign"><const>none</const></edit> - <edit name="embeddedbitmap"><bool>false</bool></edit> </match> - <alias> - <family>serif</family> - <prefer> - <family>Bitstream Vera Serif</family> - <family>DejaVu Serif</family> - <family>WenQuanYi Zen Hei</family> - </prefer> - </alias> - <alias> - <family>sans-serif</family> - <prefer> - <family>DejaVu Sans</family> - <family>Bitstream Vera Sans</family> - <family>WenQuanYi Zen Hei</family> - </prefer> - </alias> - <alias> - <family>monospace</family> - <prefer> - <family>DejaVu Sans Mono</family> - <family>Bitstream Vera Sans Mono</family> - <family>WenQuanYi Zen Hei Mono</family> - </prefer> - </alias> </fontconfig> --- a/66-wqy-zenhei-sharp.conf +++ b/66-wqy-zenhei-sharp.conf @@ -10,46 +10,6 @@ </test> <test compare="more_eq" name="pixelsize"><double>12</double></test> <test compare="less_eq" name="pixelsize"><double>16</double></test> - <edit name="antialias" mode="assign"><bool>false</bool></edit> <edit name="embeddedbitmap" mode="assign"><bool>true</bool></edit> - <edit name="hinting" mode="assign"><bool>false</bool></edit> </match> - - - <alias> - <family>serif</family> - <prefer> - <family>DejaVu Serif</family> - <family>Bitstream Vera Serif</family> - <family>WenQuanYi Zen Hei Sharp</family> - </prefer> - </alias> - <alias> - <family>sans-serif</family> - <prefer> - <family>DejaVu Sans</family> - <family>Bitstream Vera Sans</family> - <family>WenQuanYi Zen Hei Sharp</family> - </prefer> - </alias> - <alias> - <family>monospace</family> - <prefer> - <family>DejaVu Sans Mono</family> - <family>Bitstream Vera Sans Mono</family> - <family>WenQuanYi Zen Hei Sharp</family> - </prefer> - </alias> - </fontconfig> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xmms2 for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package xmms2 for openSUSE:Factory checked in at Thu Feb 25 11:24:57 CET 2010. -------- --- xmms2/xmms2.changes 2009-12-11 11:50:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/xmms2/xmms2.changes 2010-02-25 10:43:14.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 25 09:44:02 UTC 2010 - andrea(a)opensuse.org + +- added xmms2-no-return.patch to make brp-checks happy + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xmms2-no-return.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmms2.spec ++++++ --- /var/tmp/diff_new_pack.wgDww1/_old 2010-02-25 11:24:54.000000000 +0100 +++ /var/tmp/diff_new_pack.wgDww1/_new 2010-02-25 11:24:54.000000000 +0100 @@ -29,7 +29,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.6 -Release: 1 +Release: 2 License: LGPLv2+ and GPLv2+ and BSD Group: Applications/Multimedia Source0: %{name}-%{version}%{codename}.tar.bz2 @@ -38,6 +38,7 @@ Patch0: xmms2-uselibdir.patch # Don't add extra CFLAGS, we're smart enough, thanks. Patch1: xmms2-no-O0.patch +Patch2: xmms2-no-return.patch Url: http://wiki.xmms2.xmms.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: flac-devel libofa-devel libvorbis-devel speex-devel sqlite-devel @@ -123,6 +124,7 @@ %setup -q -n %{name}-%{version}%{codename} %patch0 -p1 %patch1 -p1 +%patch2 -p1 # This header doesn't need to be executable chmod -x src/include/xmmsclient/xmmsclient++/dict.h # Clean up paths in wafadmin ++++++ xmms2-no-return.patch ++++++ diff -uNr old-xmms2-0.6DrMattDestruction//src/xmms/compat/signal_unix.c xmms2-0.6DrMattDestruction/src/xmms/compat/signal_unix.c --- old-xmms2-0.6DrMattDestruction//src/xmms/compat/signal_unix.c 2009-04-21 19:51:11.000000000 +0200 +++ xmms2-0.6DrMattDestruction/src/xmms/compat/signal_unix.c 2010-02-25 08:24:33.619287804 +0100 @@ -63,6 +63,8 @@ break; } } + +return; } void ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xfce4-volumed for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package xfce4-volumed for openSUSE:Factory checked in at Thu Feb 25 11:24:39 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/xfce4-volumed/xfce4-volumed.changes 2009-11-26 17:03:15.000000000 +0100 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 26 17:08:18 CET 2009 - prusnak(a)suse.cz + +- updated to 0.1.8 + +------------------------------------------------------------------- +Fri Nov 13 19:12:21 CET 2009 - prusnak(a)suse.cz + +- created package (version 0.1.7) + calling whatdependson for head-i586 New: ---- xfce4-volumed-0.1.8.tar.bz2 xfce4-volumed.changes xfce4-volumed.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-volumed.spec ++++++ # # spec file for package xfce4-volumed (Version 0.1.8) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: xfce4-volumed Version: 0.1.8 Release: 1 Url: https://launchpad.net/xfce4-volumed License: GPLv2+ Group: System/GUI/XFCE Summary: Daemon responsible for volume keys Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: glib2-devel gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel libnotify-devel libxfconf-devel %description This daemon is responsible of making the volume up/down and mute keys of the keyboard work automatically, and uses the XFCE 4 mixer's defined card and track for chosing which track to act on. It also provides volume change / mute toggle notifications if the notification server used supports x-canonical-icon-only and x-canonical-synchronous notifications. %prep %setup -q %build %configure make %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README THANKS %config %{_sysconfdir}/xdg/autostart/xfce4-volumed.desktop %{_bindir}/xfce4-volumed %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xfce4-vala for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package xfce4-vala for openSUSE:Factory checked in at Thu Feb 25 11:24:05 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/xfce4-vala/xfce4-vala.changes 2009-11-13 19:06:03.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Fri Nov 13 18:59:28 CET 2009 - prusnak(a)suse.cz + +- created package (version 4.6.0) + calling whatdependson for head-i586 New: ---- xfce4-vala-4.6.0.tar.bz2 xfce4-vala.changes xfce4-vala.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-vala.spec ++++++ # # spec file for package xfce4-vala (Version 4.6.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: xfce4-vala Version: 4.6.0 Release: 1 Url: http://www.xfce.org/ License: LGPLv2.1+ Group: System/GUI/XFCE Summary: Vala bindings to Xfce Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: exo-devel libxfce4menu-devel libxfce4util-devel libxfcegui4-devel libxfconf-devel vala-devel xfce4-panel-devel %description This package provides Vala bindings to Xfce. %prep %setup -q %build %configure make %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_libdir}//pkgconfig/xfce4-vala.pc %{_datadir}/vala/vapi/*.deps %{_datadir}/vala/vapi/*.vapi %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 util-linux for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at Thu Feb 25 11:23:41 CET 2010. -------- --- util-linux/util-linux.changes 2009-12-13 15:19:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/util-linux/util-linux.changes 2010-02-23 14:42:43.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Feb 23 12:46:07 UTC 2010 - lnussel(a)suse.de + +- new version 2.17.1 + - new commands: wipefs, unshare, fallocate + - fdisk: DOS-compatible mode marked deprecated + - honor nofail option in fsck + - libblkid overhaul + - lots of bug fixes +- fix self-obsoletes +- compile suid programs using -fpie +- drop -DCONFIG_SMP for s390 as it doesn't seem to be used anyways + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- util-linux-mount_losetup_crypto.patch util-linux-ng-2.16.tar.bz2 util-linux-ng-bnc503008.patch New: ---- util-linux-2.17.1-mount_losetup_crypto.patch util-linux-ng-2.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.upVUaH/_old 2010-02-25 11:23:15.000000000 +0100 +++ /var/tmp/diff_new_pack.upVUaH/_new 2010-02-25 11:23:15.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package util-linux (Version 2.16) +# spec file for package util-linux (Version 2.17.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,18 +21,16 @@ BuildRequires: audit-devel gettext-devel pkg-config BuildRequires: libselinux-devel libsepol-devel ncurses-devel pam-devel readline-devel zlib-devel Url: http://userweb.kernel.org/~kzak/util-linux-ng/ -Provides: util rawio raw base schedutils uuid-runtime -Obsoletes: util rawio raw base schedutils uuid-runtime Supplements: filesystem(minix) PreReq: %install_info_prereq permissions License: BSD3c(or similar) ; GPLv2+ Group: System/Base AutoReqProv: on -Version: 2.16 -Release: 9 -Requires: %name-lang = %{version} +Version: 2.17.1 +Release: 1 +Recommends: %name-lang = %{version} Summary: A collection of basic system utilities -Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2 +Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v%{version}/%name-ng-%{v… Source1: util-linux-rpmlintrc Source2: nologin.c Source3: nologin.8 @@ -43,33 +41,39 @@ %define time_ver 1.7 %define which_ver 2.19 %define adjtimex_ver 1.20 +# XXX: post upstream? Source9: adjtimex-%{adjtimex_ver}.tar.bz2 +# XXX: DROP? Source10: freeramdisk.tar.bz2 +# XXX: post upstream? Source11: klogconsole.tar.bz2 +# TODO: split to separate package Source12: which-%{which_ver}.tar.bz2 +# TODO: split to separate package Source13: time-%{time_ver}.tar.bz2 -Source15: cryptoloop.txt +# XXX: needed? Source22: setctsid.c Source23: setctsid.8 -Source26: README.raw +# XXX: ppc specific, still needed? Source28: mkzimage_cmdline.8 Source29: mkzimage_cmdline.c -Source30: README.largedisk Source31: addnote.c +# +Source26: README.raw +Source30: README.largedisk Source50: uuidd.rc Source51: blkid.conf ## ## util-linux patches ## -# add hostid +# add hostid. FIXME: use the one from coreutils Patch0: util-linux-2.12-misc_utils_hostid.patch # 241372 - remove legacy warnings from fdisk Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch # bnc#447036 Patch2: util-linux-2.14.1-mount_skip_sync.patch # crypto patch -Patch3: util-linux-mount_losetup_crypto.patch -Patch4: util-linux-ng-bnc503008.patch +Patch3: util-linux-2.17.1-mount_losetup_crypto.patch ## ## adjtimex ## @@ -89,6 +93,9 @@ Patch70: which-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq /bin/sed +# +Provides: util = %{version}-%{release} rawio = %{version}-%{release} raw = %{version}-%{release} base = %{version}-%{release} schedutils = %{version}-%{release} uuid-runtime = %{version}-%{release} +Obsoletes: util < %{version}-%{release} rawio < %{version}-%{release} raw < %{version}-%{release} base < %{version}-%{release} schedutils < %{version}-%{release} uuid-runtime < %{version}-%{release} %description This package contains a large variety of low-level system utilities @@ -154,7 +161,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 # cd adjtimex-* %patch50 -p1 @@ -162,7 +168,7 @@ # setctsid cp %{S:22} %{S:23} . # nologin -cp %{S:2} %{S:3} %{S:15} %{S:26} %{S:30} . +cp %{S:2} %{S:3} %{S:26} %{S:30} . cd ../klogconsole %patch55 -p1 -b .quiet %patch56 -p1 @@ -216,15 +222,10 @@ # # util-linux itself # -%ifarch s390 s390x -CFLAGS=-DCONFIG_SMP -%endif -# architecture dependent builds -BUILD_ENABLE= -%ifarch %ix86 x86_64 -BUILD_ENABLE="--enable-rdev" -%endif autoreconf -fi +export SUID_CFLAGS="-fpie" +export SUID_LDFLAGS="-pie" +CFLAGS="$RPM_OPT_FLAGS" \ ./configure \ --mandir=%{_mandir} \ --datadir=%{_datadir} \ @@ -240,9 +241,12 @@ --enable-write \ --disable-use-tty-group \ --disable-static \ - $BUILD_ENABLE \ - CFLAGS="$CFLAGS $RPM_OPT_FLAGS" +%ifarch %ix86 x86_64 + --enable-rdev \ +%endif +# make %{?jobs:-j%jobs} +# gcc $RPM_OPT_FLAGS -o nologin nologin.c gcc $RPM_OPT_FLAGS -o mkzimage_cmdline %{S:29} gcc $RPM_OPT_FLAGS -o chrp-addnote %{SOURCE31} @@ -361,7 +365,8 @@ %post %{fillup_and_insserv raw} -%install_info --entry="* freeramdisk: (freeramdisk). tell kernel to free allocated memory for ramdisk" --info-dir=%{_infodir} %{_infodir}/freeramdisk.info.gz +txt='* freeramdisk: (freeramdisk). tell kernel to free allocated memory for ramdisk' +%install_info --entry="$txt" --info-dir=%{_infodir} %{_infodir}/freeramdisk.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/ipc.info.gz %install_info --entry="* time: (time). summarizing used system resources" --info-dir=%{_infodir} %{_infodir}/time.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/which.info.gz @@ -455,6 +460,7 @@ /sbin/findfs /sbin/fsck /sbin/switch_root +/sbin/wipefs /usr/bin/ipcmk /bin/logger /usr/bin/cal @@ -464,6 +470,7 @@ /usr/bin/colrm /usr/bin/column /usr/bin/ddate +/usr/bin/fallocate /usr/bin/flock /usr/bin/getopt /usr/bin/hexdump @@ -496,6 +503,7 @@ /usr/bin/tailf /usr/bin/taskset /usr/bin/time +/usr/bin/unshare /usr/bin/which /usr/sbin/addpart /usr/sbin/delpart @@ -524,6 +532,7 @@ %{_mandir}/man1/column.1.gz %{_mandir}/man1/ddate.1.gz %{_mandir}/man1/dmesg.1.gz +%{_mandir}/man1/fallocate.1.gz %{_mandir}/man1/flock.1.gz %{_mandir}/man1/getopt.1.gz %{_mandir}/man1/hexdump.1.gz @@ -550,6 +559,7 @@ %{_mandir}/man1/tailf.1.gz %{_mandir}/man1/taskset.1.gz %{_mandir}/man1/ul.1.gz +%{_mandir}/man1/unshare.1.gz %{_mandir}/man1/wall.1.gz %{_mandir}/man1/whereis.1.gz %{_mandir}/man1/write.1.gz @@ -592,6 +602,7 @@ %{_mandir}/man8/swapon.8.gz %{_mandir}/man8/umount.8.gz %{_mandir}/man8/setctsid.8.gz +%{_mandir}/man8/wipefs.8.gz /usr/sbin/flushb /usr/sbin/readprofile %dir /usr/share/getopt ++++++ util-linux-2.17.1-mount_losetup_crypto.patch ++++++ ++++ 1565 lines (skipped) ++++++ util-linux-ng-2.16.tar.bz2 -> util-linux-ng-2.17.1.tar.bz2 ++++++ ++++ 309588 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 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Thu Feb 25 11:22:41 CET 2010. -------- --- kernel-source/kernel-debug.changes 2010-02-12 20:55:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2010-02-25 07:01:46.000000000 +0100 @@ -1,0 +2,62 @@ +Thu Feb 25 06:04:24 CET 2010 - jeffm(a)suse.com + +- patches.xen/xen3-patch-2.6.33-rc8-final: Build fix for the + 2.6.33-final update. + +------------------------------------------------------------------- +Wed Feb 24 21:00:52 CET 2010 - jeffm(a)suse.de + +- Updated to 2.6.33-final. + - Eliminated 4 patches. + +------------------------------------------------------------------- +Wed Feb 24 20:02:26 CET 2010 - jeffm(a)suse.de + +- patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5: + ftrace: fix ftrace_event_call alignment for use with gcc 4.5 + (bnc#582222). + +------------------------------------------------------------------- +Wed Feb 24 14:46:28 CET 2010 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.33-rc8 and c/s 997. +- patches.xen/xen-x86-time-per-cpu: fold per-CPU accounting data + into a structure. +- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock + (bnc#569014, bnc#571041, bnc#571769, bnc#572146). + +------------------------------------------------------------------- +Tue Feb 23 00:34:32 CET 2010 - jack(a)suse.de + +- patches.fixes/novfs-fix-inode-uid: novfs: Get proper UID when + looking up inode (bnc#486997). +- patches.fixes/novfs-incorrect-filesize-fix: novfs: novfs + reports incorrect file size (bnc#426536). +- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of + OO documents on NSS Volumes (bnc#508259). + +------------------------------------------------------------------- +Wed Feb 17 04:07:36 CET 2010 - nfbrown(a)suse.de + +- patches.fixes/nfs-find-crash: Fix potential oops when running + find on an NFS mount. (bnc#573107). + +------------------------------------------------------------------- +Tue Feb 16 21:21:22 CET 2010 - jeffm(a)suse.com + +- Set CONFIG_LSM_MMAP_MIN_ADDR=4096 to allow qemu to emulate + other architectures properly (bnc#574654). + +------------------------------------------------------------------- +Tue Feb 16 18:10:01 CET 2010 - jeffm(a)suse.com + +- Update to 2.6.33-rc8. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Mon Feb 15 19:15:43 CET 2010 - rgoldwyn(a)suse.de + +- patches.fixes/novfs-err_ptr-fix.diff: Oops in novfs:unlink_local + (bnc#569071). + +------------------------------------------------------------------- @@ -1847,0 +1910,5 @@ + +------------------------------------------------------------------- +Mon Dec 14 16:41:36 CET 2009 - mmarek(a)suse.cz + +- rpm/kabi.pl: Do not print harmless kabi changes by default. kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-vmi.changes: same change kernel-xen.changes: same change calling whatdependson for head-i586 Old: ---- linux-2.6.32.tar.bz2 New: ---- linux-2.6.33.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100 @@ -17,29 +17,36 @@ # norootforbuild -%define srcversion 2.6.32 -%define patchversion 2.6.33-rc7 +%define srcversion 2.6.33 +%define patchversion 2.6.33 %define variant %{nil} + %include %_sourcedir/kernel-spec-macros + %define build_flavor debug %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") + %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj + %(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) + %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor + # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") + %ifarch %ix86 x86_64 %define install_vdso 1 %else @@ -49,7 +56,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.33 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -78,6 +85,7 @@ Requires(post): perl-Bootloader >= 0.4.15 Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd + %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -96,6 +104,7 @@ %endif #!BuildIgnore: xen %endif + Provides: %name-nongpl Obsoletes: %name-nongpl %if %build_vanilla @@ -119,6 +128,7 @@ Provides: kernel-kdump Obsoletes: kernel-kdump %endif + Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -152,6 +162,7 @@ Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc64 x86_64 + # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -166,6 +177,7 @@ NoSource: 110 NoSource: 111 NoSource: 120 + # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 Obsoletes: iwlwifi-kmp-%build_flavor @@ -194,8 +206,10 @@ Obsoletes: ocfs2-kmp-%build_flavor # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 + # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -211,33 +225,43 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi + SYMBOLS= if test -e %_sourcedir/extra-symbols; then SYMBOLS=$(cat %_sourcedir/extra-symbols) echo "extra symbol(s):" $SYMBOLS fi + # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 + mkdir -p %kernel_build_dir + supported_conf() { %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } + # Generate the list of modules to be marked as supported { supported_conf base supported_conf --default=0 external | sed 's/$/ external/' } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base + cd linux-%srcversion + %_sourcedir/apply-patches \ %if %{build_vanilla} --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS + cd %kernel_build_dir + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi + cp ../config/%cpu_arch_flavor .config %build_src_dir/scripts/config \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ @@ -247,6 +271,7 @@ %else --disable CONFIG_DEBUG_INFO %endif + MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -256,27 +281,34 @@ %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi + make prepare $MAKE_ARGS make scripts $MAKE_ARGS krel=$(make -s kernelrelease $MAKE_ARGS) + if [ "$krel" != "%kernelrelease-%build_flavor" ]; then echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2 exit 1 fi + make clean $MAKE_ARGS + rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files + cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')" export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)" + # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^GIT Branch: $.*$/\1-/p' \ %_sourcedir/source-timestamp) head -n 1 %_sourcedir/source-timestamp \ | tr -dc 0-9)" + export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 export KBUILD_OVERRIDE=1 @@ -285,10 +317,12 @@ %build cd %kernel_build_dir source .kernel-binary.spec.buildenv + # create *.symref files in the tree if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi + # If the %jobs macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: @@ -308,21 +342,27 @@ %endif %install + # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary export NO_BRP_STRIP_DEBUG=true export STRIP_KEEP_SYMTAB='*/vmlinux-*' + # /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes + cd %kernel_build_dir + mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor + add_vmlinux() { local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then compressed=true fi @@ -358,10 +398,12 @@ chmod a-x %buildroot/$vmlinux.gz fi } + %if %build_kdump add_vmlinux image=vmlinux %else + # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -402,8 +444,10 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif + # end of build_kdump %endif + for sub in '-base' '' '-extra'; do case "$sub" in '-base' | '') base_package=1 ;; @@ -422,28 +466,36 @@ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh done done + %if %build_kdump || %build_xen || %build_vanilla || %build_ps3 # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix + cp .config %buildroot/boot/config-%kernelrelease-%build_flavor + %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot %endif + # Create a dummy initrd with roughly the size the real one will have. # That way, YaST will know that this package requires some additional # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 + if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor + gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then %if %supported_modules_check @@ -451,6 +503,7 @@ %endif echo "Consistency check error: please update supported.conf." fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -460,11 +513,13 @@ dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif + # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor # so that kernel-source + kernel-%build_flavor is sufficient for building # modules that have modversions as well. mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor + # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then @@ -472,6 +527,7 @@ else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi + # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. @@ -479,6 +535,7 @@ ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu fi + # We were building in %my_builddir/linux-%srcversion, but the sources will # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the # build symlink. @@ -487,12 +544,14 @@ %buildroot/lib/modules/%kernelrelease-%build_flavor/source ln -s %obj_install_dir/%cpu_arch/%build_flavor \ %buildroot/lib/modules/%kernelrelease-%build_flavor/build + # Abort if there are any undefined symbols msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \ -b %buildroot -ae %kernelrelease-%build_flavor 2>&1)" if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then exit 1 fi + %if %split_base %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ @@ -501,11 +560,13 @@ %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif + %else ( cd %buildroot find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then # check for kabi changes @@ -522,6 +583,7 @@ exit 1 fi fi + tar cf - -T %my_builddir/obj-files | \ tar xf - -C %rpm_install_dir/%cpu_arch_flavor # bnc#507084 @@ -536,6 +598,7 @@ sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile fi + add_dirs_to_filelist() { sed -rn ' # print file name @@ -552,6 +615,7 @@ ta ' "$@" | sort -u } + # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files @@ -560,15 +624,18 @@ f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done + { cd %buildroot find boot \ $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' + # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump + if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ @@ -588,6 +655,7 @@ cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ add_dirs_to_filelist >%my_builddir/kernel-base.files rm %my_builddir/tmp + %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ > %my_builddir/kernel-main.files @@ -595,6 +663,7 @@ %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files %endif + # Hardlink duplicate files automatically (from package fdupes): It doesn't save # much, but it keeps rpmlint from breaking the package build. %fdupes $RPM_BUILD_ROOT @@ -606,6 +675,7 @@ %pre -f pre.sh %post -f post.sh + %if %split_base %files -f kernel-main.files @@ -646,6 +716,7 @@ %pre base -f pre-base.sh %post base -f post-base.sh + %if %split_base %files base -f kernel-base.files @@ -686,11 +757,13 @@ %pre extra -f pre-extra.sh %post extra -f post-extra.sh + %if %split_extra %files extra -f kernel-extra.files %defattr(-, root, root) %endif + %if %CONFIG_KMSG_IDS == "y" %package man ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100 @@ -17,29 +17,36 @@ # norootforbuild -%define srcversion 2.6.32 -%define patchversion 2.6.33-rc7 +%define srcversion 2.6.33 +%define patchversion 2.6.33 %define variant %{nil} + %include %_sourcedir/kernel-spec-macros + %define build_flavor default %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") + %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj + %(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) + %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor + # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") + %ifarch %ix86 x86_64 %define install_vdso 1 %else @@ -49,7 +56,7 @@ Name: kernel-default Summary: The Standard Kernel Version: 2.6.33 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -78,6 +85,7 @@ Requires(post): perl-Bootloader >= 0.4.15 Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd + %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -96,6 +104,7 @@ %endif #!BuildIgnore: xen %endif + Provides: %name-nongpl Obsoletes: %name-nongpl %if %build_vanilla @@ -135,6 +144,7 @@ Provides: smp kernel-smp Obsoletes: smp kernel-smp %endif + Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -168,6 +178,7 @@ Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc ppc64 s390x x86_64 + # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -182,6 +193,7 @@ NoSource: 110 NoSource: 111 NoSource: 120 + # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 Obsoletes: iwlwifi-kmp-%build_flavor @@ -210,8 +222,10 @@ Obsoletes: ocfs2-kmp-%build_flavor # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 + # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -226,33 +240,43 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi + SYMBOLS= if test -e %_sourcedir/extra-symbols; then SYMBOLS=$(cat %_sourcedir/extra-symbols) echo "extra symbol(s):" $SYMBOLS fi + # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 + mkdir -p %kernel_build_dir + supported_conf() { %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } + # Generate the list of modules to be marked as supported { supported_conf base supported_conf --default=0 external | sed 's/$/ external/' } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base + cd linux-%srcversion + %_sourcedir/apply-patches \ %if %{build_vanilla} --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS + cd %kernel_build_dir + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi + cp ../config/%cpu_arch_flavor .config %build_src_dir/scripts/config \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ @@ -262,6 +286,7 @@ %else --disable CONFIG_DEBUG_INFO %endif + MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -271,27 +296,34 @@ %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi + make prepare $MAKE_ARGS make scripts $MAKE_ARGS krel=$(make -s kernelrelease $MAKE_ARGS) + if [ "$krel" != "%kernelrelease-%build_flavor" ]; then echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2 exit 1 fi + make clean $MAKE_ARGS + rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files + cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')" export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)" + # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^GIT Branch: $.*$/\1-/p' \ %_sourcedir/source-timestamp) head -n 1 %_sourcedir/source-timestamp \ | tr -dc 0-9)" + export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 export KBUILD_OVERRIDE=1 @@ -300,10 +332,12 @@ %build cd %kernel_build_dir source .kernel-binary.spec.buildenv + # create *.symref files in the tree if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi + # If the %jobs macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: @@ -323,21 +357,27 @@ %endif %install + # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary export NO_BRP_STRIP_DEBUG=true export STRIP_KEEP_SYMTAB='*/vmlinux-*' + # /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes + cd %kernel_build_dir + mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor + add_vmlinux() { local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then compressed=true fi @@ -373,10 +413,12 @@ chmod a-x %buildroot/$vmlinux.gz fi } + %if %build_kdump add_vmlinux image=vmlinux %else + # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -417,8 +459,10 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif + # end of build_kdump %endif + for sub in '-base' '' '-extra'; do case "$sub" in '-base' | '') base_package=1 ;; @@ -437,28 +481,36 @@ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh done done + %if %build_kdump || %build_xen || %build_vanilla || %build_ps3 # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix + cp .config %buildroot/boot/config-%kernelrelease-%build_flavor + %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot %endif + # Create a dummy initrd with roughly the size the real one will have. # That way, YaST will know that this package requires some additional # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 + if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor + gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then %if %supported_modules_check @@ -466,6 +518,7 @@ %endif echo "Consistency check error: please update supported.conf." fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -475,11 +528,13 @@ dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif + # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor # so that kernel-source + kernel-%build_flavor is sufficient for building # modules that have modversions as well. mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor + # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then @@ -487,6 +542,7 @@ else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi + # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. @@ -494,6 +550,7 @@ ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu fi + # We were building in %my_builddir/linux-%srcversion, but the sources will # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the # build symlink. @@ -502,12 +559,14 @@ %buildroot/lib/modules/%kernelrelease-%build_flavor/source ln -s %obj_install_dir/%cpu_arch/%build_flavor \ %buildroot/lib/modules/%kernelrelease-%build_flavor/build + # Abort if there are any undefined symbols msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \ -b %buildroot -ae %kernelrelease-%build_flavor 2>&1)" if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then exit 1 fi + %if %split_base %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ @@ -516,11 +575,13 @@ %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif + %else ( cd %buildroot find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then # check for kabi changes @@ -537,6 +598,7 @@ exit 1 fi fi + tar cf - -T %my_builddir/obj-files | \ tar xf - -C %rpm_install_dir/%cpu_arch_flavor # bnc#507084 @@ -551,6 +613,7 @@ sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile fi + add_dirs_to_filelist() { sed -rn ' # print file name @@ -567,6 +630,7 @@ ta ' "$@" | sort -u } + # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files @@ -575,15 +639,18 @@ f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done + { cd %buildroot find boot \ $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' + # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump + if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ @@ -603,6 +670,7 @@ cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ add_dirs_to_filelist >%my_builddir/kernel-base.files rm %my_builddir/tmp + %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ > %my_builddir/kernel-main.files @@ -610,6 +678,7 @@ %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files %endif + # Hardlink duplicate files automatically (from package fdupes): It doesn't save # much, but it keeps rpmlint from breaking the package build. %fdupes $RPM_BUILD_ROOT @@ -621,6 +690,7 @@ %pre -f pre.sh %post -f post.sh + %if %split_base %files -f kernel-main.files @@ -660,6 +730,7 @@ %pre base -f pre-base.sh %post base -f post-base.sh + %if %split_base %files base -f kernel-base.files @@ -699,11 +770,13 @@ %pre extra -f pre-extra.sh %post extra -f post-extra.sh + %if %split_extra %files extra -f kernel-extra.files %defattr(-, root, root) %endif + %if %CONFIG_KMSG_IDS == "y" %package man ++++++ kernel-desktop.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100 @@ -17,29 +17,36 @@ # norootforbuild -%define srcversion 2.6.32 -%define patchversion 2.6.33-rc7 +%define srcversion 2.6.33 +%define patchversion 2.6.33 %define variant %{nil} + %include %_sourcedir/kernel-spec-macros + %define build_flavor desktop %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") + %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj + %(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) + %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor + # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") + %ifarch %ix86 x86_64 %define install_vdso 1 %else @@ -49,7 +56,7 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop Version: 2.6.33 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -78,6 +85,7 @@ Requires(post): perl-Bootloader >= 0.4.15 Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd + %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -96,6 +104,7 @@ %endif #!BuildIgnore: xen %endif + Provides: %name-nongpl Obsoletes: %name-nongpl %if %build_vanilla @@ -115,6 +124,7 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel + Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -148,6 +158,7 @@ Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 + # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -162,6 +173,7 @@ NoSource: 110 NoSource: 111 NoSource: 120 + # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 Obsoletes: iwlwifi-kmp-%build_flavor @@ -190,8 +202,10 @@ Obsoletes: ocfs2-kmp-%build_flavor # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 + # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -204,11 +218,13 @@ This kernel supports up to 64GB of main memory. It requires Physical Addressing Extensions (PAE), which were introduced with the Pentium Pro processor. + PAE is not only more physical address space but also important for the "no execute" feature which disables execution of code that is marked as non-executable. Therefore, the PAE kernel should be used on any systems that support it, regardless of the amount of main memory. %endif + %source_timestamp %prep @@ -217,33 +233,43 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi + SYMBOLS= if test -e %_sourcedir/extra-symbols; then SYMBOLS=$(cat %_sourcedir/extra-symbols) echo "extra symbol(s):" $SYMBOLS fi + # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 + mkdir -p %kernel_build_dir + supported_conf() { %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } + # Generate the list of modules to be marked as supported { supported_conf base supported_conf --default=0 external | sed 's/$/ external/' } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base + cd linux-%srcversion + %_sourcedir/apply-patches \ %if %{build_vanilla} --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS + cd %kernel_build_dir + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi + cp ../config/%cpu_arch_flavor .config %build_src_dir/scripts/config \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ @@ -253,6 +279,7 @@ %else --disable CONFIG_DEBUG_INFO %endif + MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -262,27 +289,34 @@ %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi + make prepare $MAKE_ARGS make scripts $MAKE_ARGS krel=$(make -s kernelrelease $MAKE_ARGS) + if [ "$krel" != "%kernelrelease-%build_flavor" ]; then echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2 exit 1 fi + make clean $MAKE_ARGS + rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files + cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')" export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)" + # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^GIT Branch: $.*$/\1-/p' \ %_sourcedir/source-timestamp) head -n 1 %_sourcedir/source-timestamp \ | tr -dc 0-9)" + export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 export KBUILD_OVERRIDE=1 @@ -291,10 +325,12 @@ %build cd %kernel_build_dir source .kernel-binary.spec.buildenv + # create *.symref files in the tree if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi + # If the %jobs macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: @@ -314,21 +350,27 @@ %endif %install + # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary export NO_BRP_STRIP_DEBUG=true export STRIP_KEEP_SYMTAB='*/vmlinux-*' + # /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes + cd %kernel_build_dir + mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor + add_vmlinux() { local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then compressed=true fi @@ -364,10 +406,12 @@ chmod a-x %buildroot/$vmlinux.gz fi } + %if %build_kdump add_vmlinux image=vmlinux %else + # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -408,8 +452,10 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif + # end of build_kdump %endif + for sub in '-base' '' '-extra'; do case "$sub" in '-base' | '') base_package=1 ;; @@ -428,28 +474,36 @@ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh done done + %if %build_kdump || %build_xen || %build_vanilla || %build_ps3 # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix + cp .config %buildroot/boot/config-%kernelrelease-%build_flavor + %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot %endif + # Create a dummy initrd with roughly the size the real one will have. # That way, YaST will know that this package requires some additional # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 + if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor + gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then %if %supported_modules_check @@ -457,6 +511,7 @@ %endif echo "Consistency check error: please update supported.conf." fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -466,11 +521,13 @@ dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif + # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor # so that kernel-source + kernel-%build_flavor is sufficient for building # modules that have modversions as well. mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor + # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then @@ -478,6 +535,7 @@ else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi + # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. @@ -485,6 +543,7 @@ ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu fi + # We were building in %my_builddir/linux-%srcversion, but the sources will # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the # build symlink. @@ -493,12 +552,14 @@ %buildroot/lib/modules/%kernelrelease-%build_flavor/source ln -s %obj_install_dir/%cpu_arch/%build_flavor \ %buildroot/lib/modules/%kernelrelease-%build_flavor/build + # Abort if there are any undefined symbols msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \ -b %buildroot -ae %kernelrelease-%build_flavor 2>&1)" if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then exit 1 fi + %if %split_base %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ @@ -507,11 +568,13 @@ %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif + %else ( cd %buildroot find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then # check for kabi changes @@ -528,6 +591,7 @@ exit 1 fi fi + tar cf - -T %my_builddir/obj-files | \ tar xf - -C %rpm_install_dir/%cpu_arch_flavor # bnc#507084 @@ -542,6 +606,7 @@ sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile fi + add_dirs_to_filelist() { sed -rn ' # print file name @@ -558,6 +623,7 @@ ta ' "$@" | sort -u } + # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files @@ -566,15 +632,18 @@ f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done + { cd %buildroot find boot \ $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' + # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump + if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ @@ -594,6 +663,7 @@ cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ add_dirs_to_filelist >%my_builddir/kernel-base.files rm %my_builddir/tmp + %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ > %my_builddir/kernel-main.files @@ -601,6 +671,7 @@ %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files %endif + # Hardlink duplicate files automatically (from package fdupes): It doesn't save # much, but it keeps rpmlint from breaking the package build. %fdupes $RPM_BUILD_ROOT @@ -612,6 +683,7 @@ %pre -f pre.sh %post -f post.sh + %if %split_base %files -f kernel-main.files @@ -646,12 +718,15 @@ This kernel supports up to 64GB of main memory. It requires Physical Addressing Extensions (PAE), which were introduced with the Pentium Pro processor. + PAE is not only more physical address space but also important for the "no execute" feature which disables execution of code that is marked as non-executable. Therefore, the PAE kernel should be used on any systems that support it, regardless of the amount of main memory. %endif + This package contains only the base modules, required in all installs. + %source_timestamp %preun base -f preun-base.sh @@ -661,6 +736,7 @@ %pre base -f pre-base.sh %post base -f post-base.sh + %if %split_base %files base -f kernel-base.files @@ -695,12 +771,15 @@ This kernel supports up to 64GB of main memory. It requires Physical Addressing Extensions (PAE), which were introduced with the Pentium Pro processor. + PAE is not only more physical address space but also important for the "no execute" feature which disables execution of code that is marked as non-executable. Therefore, the PAE kernel should be used on any systems that support it, regardless of the amount of main memory. %endif + This package contains additional modules not supported by Novell. + %source_timestamp %preun extra -f preun-extra.sh @@ -710,11 +789,13 @@ %pre extra -f pre-extra.sh %post extra -f post-extra.sh + %if %split_extra %files extra -f kernel-extra.files %defattr(-, root, root) %endif + %if %CONFIG_KMSG_IDS == "y" %package man ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100 @@ -27,7 +27,7 @@ Group: Documentation/Man AutoReqProv: on Version: 2.6.33 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -78,7 +78,9 @@ cp $i $RPM_BUILD_ROOT/%{_mandir}/man9/$k done fi + ln -s /usr/share/man/man9/request_threaded_irq.9.gz $RPM_BUILD_ROOT/usr/share/man/man9/request_irq.9.gz + cp -a /usr/src/linux-%{version}-%{release_major}/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} . %clean ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100 @@ -17,29 +17,36 @@ # norootforbuild -%define srcversion 2.6.32 -%define patchversion 2.6.33-rc7 +%define srcversion 2.6.33 +%define patchversion 2.6.33 %define variant %{nil} + %include %_sourcedir/kernel-spec-macros + %define build_flavor ec2 %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") + %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj + %(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) + %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor + # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") + %ifarch %ix86 x86_64 %define install_vdso 1 %else @@ -49,7 +56,7 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel Version: 2.6.33 -Release: 2 +Release: 3 %if %using_buildservice %else %endif @@ -78,6 +85,7 @@ Requires(post): perl-Bootloader >= 0.4.15 Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd + %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -96,6 +104,7 @@ %endif #!BuildIgnore: xen %endif + Provides: %name-nongpl Obsoletes: %name-nongpl %if %build_vanilla @@ -115,6 +124,7 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel + Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -148,6 +158,7 @@ Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 + # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -162,6 +173,7 @@ NoSource: 110 NoSource: 111 NoSource: 120 + # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 Obsoletes: iwlwifi-kmp-%build_flavor @@ -190,8 +202,10 @@ Obsoletes: ocfs2-kmp-%build_flavor # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 + # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -209,33 +223,43 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi + SYMBOLS= if test -e %_sourcedir/extra-symbols; then SYMBOLS=$(cat %_sourcedir/extra-symbols) echo "extra symbol(s):" $SYMBOLS fi + # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 + mkdir -p %kernel_build_dir + supported_conf() { %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } + # Generate the list of modules to be marked as supported { supported_conf base supported_conf --default=0 external | sed 's/$/ external/' } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base + cd linux-%srcversion + %_sourcedir/apply-patches \ %if %{build_vanilla} --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS + cd %kernel_build_dir + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi + cp ../config/%cpu_arch_flavor .config %build_src_dir/scripts/config \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ @@ -245,6 +269,7 @@ %else --disable CONFIG_DEBUG_INFO %endif + MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -254,27 +279,34 @@ %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi + make prepare $MAKE_ARGS make scripts $MAKE_ARGS krel=$(make -s kernelrelease $MAKE_ARGS) + if [ "$krel" != "%kernelrelease-%build_flavor" ]; then echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2 exit 1 fi + make clean $MAKE_ARGS + rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files + cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')" export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)" + # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^GIT Branch: $.*$/\1-/p' \ %_sourcedir/source-timestamp) head -n 1 %_sourcedir/source-timestamp \ | tr -dc 0-9)" + export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 export KBUILD_OVERRIDE=1 @@ -283,10 +315,12 @@ %build cd %kernel_build_dir source .kernel-binary.spec.buildenv + # create *.symref files in the tree if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi + # If the %jobs macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: @@ -306,21 +340,27 @@ %endif %install + # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary export NO_BRP_STRIP_DEBUG=true export STRIP_KEEP_SYMTAB='*/vmlinux-*' + # /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes + cd %kernel_build_dir + mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor + add_vmlinux() { local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then compressed=true fi @@ -356,10 +396,12 @@ chmod a-x %buildroot/$vmlinux.gz fi } + %if %build_kdump add_vmlinux image=vmlinux %else + # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -400,8 +442,10 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif + # end of build_kdump %endif + for sub in '-base' '' '-extra'; do case "$sub" in '-base' | '') base_package=1 ;; @@ -420,28 +464,36 @@ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh done done + %if %build_kdump || %build_xen || %build_vanilla || %build_ps3 # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix + cp .config %buildroot/boot/config-%kernelrelease-%build_flavor + %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot %endif + # Create a dummy initrd with roughly the size the real one will have. # That way, YaST will know that this package requires some additional # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 + if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor + gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then %if %supported_modules_check @@ -449,6 +501,7 @@ %endif echo "Consistency check error: please update supported.conf." fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -458,11 +511,13 @@ dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif + # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor # so that kernel-source + kernel-%build_flavor is sufficient for building # modules that have modversions as well. mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor + # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then @@ -470,6 +525,7 @@ else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi + # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. @@ -477,6 +533,7 @@ ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu fi + # We were building in %my_builddir/linux-%srcversion, but the sources will # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the # build symlink. @@ -485,12 +542,14 @@ %buildroot/lib/modules/%kernelrelease-%build_flavor/source ln -s %obj_install_dir/%cpu_arch/%build_flavor \ %buildroot/lib/modules/%kernelrelease-%build_flavor/build + # Abort if there are any undefined symbols msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \ -b %buildroot -ae %kernelrelease-%build_flavor 2>&1)" if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then exit 1 fi + %if %split_base %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ @@ -499,11 +558,13 @@ %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif + %else ( cd %buildroot find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then # check for kabi changes @@ -520,6 +581,7 @@ exit 1 fi fi + tar cf - -T %my_builddir/obj-files | \ tar xf - -C %rpm_install_dir/%cpu_arch_flavor # bnc#507084 @@ -534,6 +596,7 @@ sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile fi + add_dirs_to_filelist() { sed -rn ' # print file name @@ -550,6 +613,7 @@ ta ' "$@" | sort -u } + # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files @@ -558,15 +622,18 @@ f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done + { cd %buildroot find boot \ $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' + # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump + if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ @@ -586,6 +653,7 @@ cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ add_dirs_to_filelist >%my_builddir/kernel-base.files rm %my_builddir/tmp + %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ > %my_builddir/kernel-main.files @@ -593,6 +661,7 @@ %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files %endif + # Hardlink duplicate files automatically (from package fdupes): It doesn't save # much, but it keeps rpmlint from breaking the package build. %fdupes $RPM_BUILD_ROOT @@ -604,6 +673,7 @@ %pre -f pre.sh %post -f post.sh + %if %split_base %files -f kernel-main.files @@ -646,6 +716,7 @@ %pre base -f pre-base.sh %post base -f post-base.sh + %if %split_base %files base -f kernel-base.files @@ -688,11 +759,13 @@ %pre extra -f pre-extra.sh %post extra -f post-extra.sh + %if %split_extra %files extra -f kernel-extra.files %defattr(-, root, root) %endif + %if %CONFIG_KMSG_IDS == "y" %package man ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100 @@ -17,29 +17,36 @@ # norootforbuild -%define srcversion 2.6.32 -%define patchversion 2.6.33-rc7 +%define srcversion 2.6.33 +%define patchversion 2.6.33 %define variant %{nil} + %include %_sourcedir/kernel-spec-macros + %define build_flavor pae %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") + %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj + %(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) + %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor + # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") + %ifarch %ix86 x86_64 %define install_vdso 1 %else @@ -49,7 +56,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 2.6.33 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -78,6 +85,7 @@ Requires(post): perl-Bootloader >= 0.4.15 Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd + %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -96,6 +104,7 @@ %endif #!BuildIgnore: xen %endif + Provides: %name-nongpl Obsoletes: %name-nongpl %if %build_vanilla @@ -119,6 +128,7 @@ Provides: kernel-bigsmp Obsoletes: kernel-bigsmp %endif + Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -152,6 +162,7 @@ Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 + # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -166,6 +177,7 @@ NoSource: 110 NoSource: 111 NoSource: 120 + # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 Obsoletes: iwlwifi-kmp-%build_flavor @@ -194,8 +206,10 @@ Obsoletes: ocfs2-kmp-%build_flavor # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 + # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -217,33 +231,43 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi + SYMBOLS= if test -e %_sourcedir/extra-symbols; then SYMBOLS=$(cat %_sourcedir/extra-symbols) echo "extra symbol(s):" $SYMBOLS fi + # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 + mkdir -p %kernel_build_dir + supported_conf() { %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } + # Generate the list of modules to be marked as supported { supported_conf base supported_conf --default=0 external | sed 's/$/ external/' } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base + cd linux-%srcversion + %_sourcedir/apply-patches \ %if %{build_vanilla} --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS + cd %kernel_build_dir + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi + cp ../config/%cpu_arch_flavor .config %build_src_dir/scripts/config \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ @@ -253,6 +277,7 @@ %else --disable CONFIG_DEBUG_INFO %endif + MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -262,27 +287,34 @@ %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi + make prepare $MAKE_ARGS make scripts $MAKE_ARGS krel=$(make -s kernelrelease $MAKE_ARGS) + if [ "$krel" != "%kernelrelease-%build_flavor" ]; then echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2 exit 1 fi + make clean $MAKE_ARGS + rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files + cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')" export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)" + # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^GIT Branch: $.*$/\1-/p' \ %_sourcedir/source-timestamp) head -n 1 %_sourcedir/source-timestamp \ | tr -dc 0-9)" + export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 export KBUILD_OVERRIDE=1 @@ -291,10 +323,12 @@ %build cd %kernel_build_dir source .kernel-binary.spec.buildenv + # create *.symref files in the tree if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi + # If the %jobs macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: @@ -314,21 +348,27 @@ %endif %install + # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary export NO_BRP_STRIP_DEBUG=true export STRIP_KEEP_SYMTAB='*/vmlinux-*' + # /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes + cd %kernel_build_dir + mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor + add_vmlinux() { local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then compressed=true fi @@ -364,10 +404,12 @@ chmod a-x %buildroot/$vmlinux.gz fi } + %if %build_kdump add_vmlinux image=vmlinux %else + # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -408,8 +450,10 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif + # end of build_kdump %endif + for sub in '-base' '' '-extra'; do case "$sub" in '-base' | '') base_package=1 ;; @@ -428,28 +472,36 @@ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh done done + %if %build_kdump || %build_xen || %build_vanilla || %build_ps3 # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix + cp .config %buildroot/boot/config-%kernelrelease-%build_flavor + %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot %endif + # Create a dummy initrd with roughly the size the real one will have. # That way, YaST will know that this package requires some additional # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 + if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor + gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then %if %supported_modules_check @@ -457,6 +509,7 @@ %endif echo "Consistency check error: please update supported.conf." fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -466,11 +519,13 @@ dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif + # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor # so that kernel-source + kernel-%build_flavor is sufficient for building # modules that have modversions as well. mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor + # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then @@ -478,6 +533,7 @@ else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi + # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. @@ -485,6 +541,7 @@ ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu fi + # We were building in %my_builddir/linux-%srcversion, but the sources will # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the # build symlink. @@ -493,12 +550,14 @@ %buildroot/lib/modules/%kernelrelease-%build_flavor/source ln -s %obj_install_dir/%cpu_arch/%build_flavor \ %buildroot/lib/modules/%kernelrelease-%build_flavor/build + # Abort if there are any undefined symbols msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \ -b %buildroot -ae %kernelrelease-%build_flavor 2>&1)" if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then exit 1 fi + %if %split_base %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ @@ -507,11 +566,13 @@ %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif + %else ( cd %buildroot find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then # check for kabi changes @@ -528,6 +589,7 @@ exit 1 fi fi + tar cf - -T %my_builddir/obj-files | \ tar xf - -C %rpm_install_dir/%cpu_arch_flavor # bnc#507084 @@ -542,6 +604,7 @@ sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile fi + add_dirs_to_filelist() { sed -rn ' # print file name @@ -558,6 +621,7 @@ ta ' "$@" | sort -u } + # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files @@ -566,15 +630,18 @@ f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done + { cd %buildroot find boot \ $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' + # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump + if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ @@ -594,6 +661,7 @@ cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ add_dirs_to_filelist >%my_builddir/kernel-base.files rm %my_builddir/tmp + %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ > %my_builddir/kernel-main.files @@ -601,6 +669,7 @@ %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files %endif + # Hardlink duplicate files automatically (from package fdupes): It doesn't save # much, but it keeps rpmlint from breaking the package build. %fdupes $RPM_BUILD_ROOT @@ -612,6 +681,7 @@ %pre -f pre.sh %post -f post.sh + %if %split_base %files -f kernel-main.files @@ -658,6 +728,7 @@ %pre base -f pre-base.sh %post base -f post-base.sh + %if %split_base %files base -f kernel-base.files @@ -704,11 +775,13 @@ %pre extra -f pre-extra.sh %post extra -f post-extra.sh + %if %split_extra %files extra -f kernel-extra.files %defattr(-, root, root) %endif + %if %CONFIG_KMSG_IDS == "y" %package man ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100 @@ -17,29 +17,36 @@ # norootforbuild -%define srcversion 2.6.32 -%define patchversion 2.6.33-rc7 +%define srcversion 2.6.33 +%define patchversion 2.6.33 %define variant %{nil} + %include %_sourcedir/kernel-spec-macros + %define build_flavor ppc64 %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") + %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj + %(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) + %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor + # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") + %ifarch %ix86 x86_64 %define install_vdso 1 %else @@ -49,7 +56,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems Version: 2.6.33 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -78,6 +85,7 @@ Requires(post): perl-Bootloader >= 0.4.15 Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd + %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -96,6 +104,7 @@ %endif #!BuildIgnore: xen %endif + Provides: %name-nongpl Obsoletes: %name-nongpl %if %build_vanilla @@ -123,6 +132,7 @@ Provides: kernel-kdump Obsoletes: kernel-kdump %endif + Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -156,6 +166,7 @@ Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 + # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -170,6 +181,7 @@ NoSource: 110 NoSource: 111 NoSource: 120 + # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 Obsoletes: iwlwifi-kmp-%build_flavor @@ -198,8 +210,10 @@ Obsoletes: ocfs2-kmp-%build_flavor # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 + # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -221,33 +235,43 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi + SYMBOLS= if test -e %_sourcedir/extra-symbols; then SYMBOLS=$(cat %_sourcedir/extra-symbols) echo "extra symbol(s):" $SYMBOLS fi + # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 + mkdir -p %kernel_build_dir + supported_conf() { %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } + # Generate the list of modules to be marked as supported { supported_conf base supported_conf --default=0 external | sed 's/$/ external/' } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base + cd linux-%srcversion + %_sourcedir/apply-patches \ %if %{build_vanilla} --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS + cd %kernel_build_dir + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi + cp ../config/%cpu_arch_flavor .config %build_src_dir/scripts/config \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ @@ -257,6 +281,7 @@ %else --disable CONFIG_DEBUG_INFO %endif + MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -266,27 +291,34 @@ %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi + make prepare $MAKE_ARGS make scripts $MAKE_ARGS krel=$(make -s kernelrelease $MAKE_ARGS) + if [ "$krel" != "%kernelrelease-%build_flavor" ]; then echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2 exit 1 fi + make clean $MAKE_ARGS + rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files + cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')" export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)" + # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^GIT Branch: $.*$/\1-/p' \ %_sourcedir/source-timestamp) head -n 1 %_sourcedir/source-timestamp \ | tr -dc 0-9)" + export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 export KBUILD_OVERRIDE=1 @@ -295,10 +327,12 @@ %build cd %kernel_build_dir source .kernel-binary.spec.buildenv + # create *.symref files in the tree if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi + # If the %jobs macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: @@ -318,21 +352,27 @@ %endif %install + # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary export NO_BRP_STRIP_DEBUG=true export STRIP_KEEP_SYMTAB='*/vmlinux-*' + # /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes + cd %kernel_build_dir + mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor + add_vmlinux() { local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then compressed=true fi @@ -368,10 +408,12 @@ chmod a-x %buildroot/$vmlinux.gz fi } + %if %build_kdump add_vmlinux image=vmlinux %else + # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -412,8 +454,10 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif + # end of build_kdump %endif + for sub in '-base' '' '-extra'; do case "$sub" in '-base' | '') base_package=1 ;; @@ -432,28 +476,36 @@ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh done done + %if %build_kdump || %build_xen || %build_vanilla || %build_ps3 # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix + cp .config %buildroot/boot/config-%kernelrelease-%build_flavor + %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot %endif + # Create a dummy initrd with roughly the size the real one will have. # That way, YaST will know that this package requires some additional # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 + if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor + gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then %if %supported_modules_check @@ -461,6 +513,7 @@ %endif echo "Consistency check error: please update supported.conf." fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -470,11 +523,13 @@ dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif + # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor # so that kernel-source + kernel-%build_flavor is sufficient for building # modules that have modversions as well. mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor + # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then @@ -482,6 +537,7 @@ else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi + # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. @@ -489,6 +545,7 @@ ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu fi + # We were building in %my_builddir/linux-%srcversion, but the sources will # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the # build symlink. @@ -497,12 +554,14 @@ %buildroot/lib/modules/%kernelrelease-%build_flavor/source ln -s %obj_install_dir/%cpu_arch/%build_flavor \ %buildroot/lib/modules/%kernelrelease-%build_flavor/build + # Abort if there are any undefined symbols msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \ -b %buildroot -ae %kernelrelease-%build_flavor 2>&1)" if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then exit 1 fi + %if %split_base %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ @@ -511,11 +570,13 @@ %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif + %else ( cd %buildroot find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then # check for kabi changes @@ -532,6 +593,7 @@ exit 1 fi fi + tar cf - -T %my_builddir/obj-files | \ tar xf - -C %rpm_install_dir/%cpu_arch_flavor # bnc#507084 @@ -546,6 +608,7 @@ sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile fi + add_dirs_to_filelist() { sed -rn ' # print file name @@ -562,6 +625,7 @@ ta ' "$@" | sort -u } + # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files @@ -570,15 +634,18 @@ f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done + { cd %buildroot find boot \ $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' + # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump + if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ @@ -598,6 +665,7 @@ cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ add_dirs_to_filelist >%my_builddir/kernel-base.files rm %my_builddir/tmp + %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ > %my_builddir/kernel-main.files @@ -605,6 +673,7 @@ %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files %endif + # Hardlink duplicate files automatically (from package fdupes): It doesn't save # much, but it keeps rpmlint from breaking the package build. %fdupes $RPM_BUILD_ROOT @@ -616,6 +685,7 @@ %pre -f pre.sh %post -f post.sh + %if %split_base %files -f kernel-main.files @@ -662,6 +732,7 @@ %pre base -f pre-base.sh %post base -f post-base.sh + %if %split_base %files base -f kernel-base.files @@ -708,11 +779,13 @@ %pre extra -f pre-extra.sh %post extra -f post-extra.sh + %if %split_extra %files extra -f kernel-extra.files %defattr(-, root, root) %endif + %if %CONFIG_KMSG_IDS == "y" %package man ++++++ kernel-ps3.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100 @@ -17,29 +17,36 @@ # norootforbuild -%define srcversion 2.6.32 -%define patchversion 2.6.33-rc7 +%define srcversion 2.6.33 +%define patchversion 2.6.33 %define variant %{nil} + %include %_sourcedir/kernel-spec-macros + %define build_flavor ps3 %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") + %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj + %(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) + %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor + # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") + %ifarch %ix86 x86_64 %define install_vdso 1 %else @@ -49,7 +56,7 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader Version: 2.6.33 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -78,6 +85,7 @@ Requires(post): perl-Bootloader >= 0.4.15 Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd + %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -96,6 +104,7 @@ %endif #!BuildIgnore: xen %endif + Provides: %name-nongpl Obsoletes: %name-nongpl %if %build_vanilla @@ -115,6 +124,7 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel + Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -148,6 +158,7 @@ Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc + # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -162,6 +173,7 @@ NoSource: 110 NoSource: 111 NoSource: 120 + # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 Obsoletes: iwlwifi-kmp-%build_flavor @@ -190,8 +202,10 @@ Obsoletes: ocfs2-kmp-%build_flavor # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 + # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -209,33 +223,43 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi + SYMBOLS= if test -e %_sourcedir/extra-symbols; then SYMBOLS=$(cat %_sourcedir/extra-symbols) echo "extra symbol(s):" $SYMBOLS fi + # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 + mkdir -p %kernel_build_dir + supported_conf() { %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } + # Generate the list of modules to be marked as supported { supported_conf base supported_conf --default=0 external | sed 's/$/ external/' } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base + cd linux-%srcversion + %_sourcedir/apply-patches \ %if %{build_vanilla} --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS + cd %kernel_build_dir + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi + cp ../config/%cpu_arch_flavor .config %build_src_dir/scripts/config \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ @@ -245,6 +269,7 @@ %else --disable CONFIG_DEBUG_INFO %endif + MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -254,27 +279,34 @@ %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi + make prepare $MAKE_ARGS make scripts $MAKE_ARGS krel=$(make -s kernelrelease $MAKE_ARGS) + if [ "$krel" != "%kernelrelease-%build_flavor" ]; then echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2 exit 1 fi + make clean $MAKE_ARGS + rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files + cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')" export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)" + # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^GIT Branch: $.*$/\1-/p' \ %_sourcedir/source-timestamp) head -n 1 %_sourcedir/source-timestamp \ | tr -dc 0-9)" + export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 export KBUILD_OVERRIDE=1 @@ -283,10 +315,12 @@ %build cd %kernel_build_dir source .kernel-binary.spec.buildenv + # create *.symref files in the tree if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi + # If the %jobs macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: @@ -306,21 +340,27 @@ %endif %install + # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary export NO_BRP_STRIP_DEBUG=true export STRIP_KEEP_SYMTAB='*/vmlinux-*' + # /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes + cd %kernel_build_dir + mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor + add_vmlinux() { local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then compressed=true fi @@ -356,10 +396,12 @@ chmod a-x %buildroot/$vmlinux.gz fi } + %if %build_kdump add_vmlinux image=vmlinux %else + # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -400,8 +442,10 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif + # end of build_kdump %endif + for sub in '-base' '' '-extra'; do case "$sub" in '-base' | '') base_package=1 ;; @@ -420,28 +464,36 @@ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh done done + %if %build_kdump || %build_xen || %build_vanilla || %build_ps3 # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix + cp .config %buildroot/boot/config-%kernelrelease-%build_flavor + %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot %endif + # Create a dummy initrd with roughly the size the real one will have. # That way, YaST will know that this package requires some additional # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 + if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor + gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then %if %supported_modules_check @@ -449,6 +501,7 @@ %endif echo "Consistency check error: please update supported.conf." fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -458,11 +511,13 @@ dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif + # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor # so that kernel-source + kernel-%build_flavor is sufficient for building # modules that have modversions as well. mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor + # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then @@ -470,6 +525,7 @@ else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi + # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. @@ -477,6 +533,7 @@ ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu fi + # We were building in %my_builddir/linux-%srcversion, but the sources will # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the # build symlink. @@ -485,12 +542,14 @@ %buildroot/lib/modules/%kernelrelease-%build_flavor/source ln -s %obj_install_dir/%cpu_arch/%build_flavor \ %buildroot/lib/modules/%kernelrelease-%build_flavor/build + # Abort if there are any undefined symbols msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \ -b %buildroot -ae %kernelrelease-%build_flavor 2>&1)" if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then exit 1 fi + %if %split_base %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ @@ -499,11 +558,13 @@ %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif + %else ( cd %buildroot find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then # check for kabi changes @@ -520,6 +581,7 @@ exit 1 fi fi + tar cf - -T %my_builddir/obj-files | \ tar xf - -C %rpm_install_dir/%cpu_arch_flavor # bnc#507084 @@ -534,6 +596,7 @@ sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile fi + add_dirs_to_filelist() { sed -rn ' # print file name @@ -550,6 +613,7 @@ ta ' "$@" | sort -u } + # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files @@ -558,15 +622,18 @@ f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done + { cd %buildroot find boot \ $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' + # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump + if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ @@ -586,6 +653,7 @@ cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ add_dirs_to_filelist >%my_builddir/kernel-base.files rm %my_builddir/tmp + %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ > %my_builddir/kernel-main.files @@ -593,6 +661,7 @@ %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files %endif + # Hardlink duplicate files automatically (from package fdupes): It doesn't save # much, but it keeps rpmlint from breaking the package build. %fdupes $RPM_BUILD_ROOT @@ -604,6 +673,7 @@ %pre -f pre.sh %post -f post.sh + %if %split_base %files -f kernel-main.files @@ -646,6 +716,7 @@ %pre base -f pre-base.sh %post base -f post-base.sh + %if %split_base %files base -f kernel-base.files @@ -688,11 +759,13 @@ %pre extra -f pre-extra.sh %post extra -f post-extra.sh + %if %split_extra %files extra -f kernel-extra.files %defattr(-, root, root) %endif + %if %CONFIG_KMSG_IDS == "y" %package man ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100 @@ -17,29 +17,36 @@ # norootforbuild -%define srcversion 2.6.32 -%define patchversion 2.6.33-rc7 +%define srcversion 2.6.33 +%define patchversion 2.6.33 %define variant %{nil} + %include %_sourcedir/kernel-spec-macros + %define build_flavor s390 %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") + %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj + %(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) + %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor + # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") + %ifarch %ix86 x86_64 %define install_vdso 1 %else @@ -49,7 +56,7 @@ Name: kernel-s390 Summary: The Standard Kernel Version: 2.6.33 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -78,6 +85,7 @@ Requires(post): perl-Bootloader >= 0.4.15 Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd + %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -96,6 +104,7 @@ %endif #!BuildIgnore: xen %endif + Provides: %name-nongpl Obsoletes: %name-nongpl %if %build_vanilla @@ -119,6 +128,7 @@ Provides: kernel-32bit Obsoletes: kernel-32bit %endif + Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -152,6 +162,7 @@ Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: s390 + # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -166,6 +177,7 @@ NoSource: 110 NoSource: 111 NoSource: 120 + # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 Obsoletes: iwlwifi-kmp-%build_flavor @@ -194,8 +206,10 @@ Obsoletes: ocfs2-kmp-%build_flavor # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 + # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -210,33 +224,43 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi + SYMBOLS= if test -e %_sourcedir/extra-symbols; then SYMBOLS=$(cat %_sourcedir/extra-symbols) echo "extra symbol(s):" $SYMBOLS fi + # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 + mkdir -p %kernel_build_dir + supported_conf() { %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } + # Generate the list of modules to be marked as supported { supported_conf base supported_conf --default=0 external | sed 's/$/ external/' } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base + cd linux-%srcversion + %_sourcedir/apply-patches \ %if %{build_vanilla} --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS + cd %kernel_build_dir + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi + cp ../config/%cpu_arch_flavor .config %build_src_dir/scripts/config \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ @@ -246,6 +270,7 @@ %else --disable CONFIG_DEBUG_INFO %endif + MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -255,27 +280,34 @@ %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi + make prepare $MAKE_ARGS make scripts $MAKE_ARGS krel=$(make -s kernelrelease $MAKE_ARGS) + if [ "$krel" != "%kernelrelease-%build_flavor" ]; then echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2 exit 1 fi + make clean $MAKE_ARGS + rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files + cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')" export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)" + # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^GIT Branch: $.*$/\1-/p' \ %_sourcedir/source-timestamp) head -n 1 %_sourcedir/source-timestamp \ | tr -dc 0-9)" + export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 export KBUILD_OVERRIDE=1 @@ -284,10 +316,12 @@ %build cd %kernel_build_dir source .kernel-binary.spec.buildenv + # create *.symref files in the tree if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi + # If the %jobs macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: @@ -307,21 +341,27 @@ %endif %install + # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary export NO_BRP_STRIP_DEBUG=true export STRIP_KEEP_SYMTAB='*/vmlinux-*' + # /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes + cd %kernel_build_dir + mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor + add_vmlinux() { local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then compressed=true fi @@ -357,10 +397,12 @@ chmod a-x %buildroot/$vmlinux.gz fi } + %if %build_kdump add_vmlinux image=vmlinux %else + # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -401,8 +443,10 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif + # end of build_kdump %endif + for sub in '-base' '' '-extra'; do case "$sub" in '-base' | '') base_package=1 ;; @@ -421,28 +465,36 @@ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh done done + %if %build_kdump || %build_xen || %build_vanilla || %build_ps3 # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix + cp .config %buildroot/boot/config-%kernelrelease-%build_flavor + %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot %endif + # Create a dummy initrd with roughly the size the real one will have. # That way, YaST will know that this package requires some additional # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 + if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor + gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then %if %supported_modules_check @@ -450,6 +502,7 @@ %endif echo "Consistency check error: please update supported.conf." fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -459,11 +512,13 @@ dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif + # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor # so that kernel-source + kernel-%build_flavor is sufficient for building # modules that have modversions as well. mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor + # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then @@ -471,6 +526,7 @@ else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi + # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. @@ -478,6 +534,7 @@ ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu fi + # We were building in %my_builddir/linux-%srcversion, but the sources will # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the # build symlink. @@ -486,12 +543,14 @@ %buildroot/lib/modules/%kernelrelease-%build_flavor/source ln -s %obj_install_dir/%cpu_arch/%build_flavor \ %buildroot/lib/modules/%kernelrelease-%build_flavor/build + # Abort if there are any undefined symbols msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \ -b %buildroot -ae %kernelrelease-%build_flavor 2>&1)" if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then exit 1 fi + %if %split_base %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ @@ -500,11 +559,13 @@ %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif + %else ( cd %buildroot find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then # check for kabi changes @@ -521,6 +582,7 @@ exit 1 fi fi + tar cf - -T %my_builddir/obj-files | \ tar xf - -C %rpm_install_dir/%cpu_arch_flavor # bnc#507084 @@ -535,6 +597,7 @@ sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile fi + add_dirs_to_filelist() { sed -rn ' # print file name @@ -551,6 +614,7 @@ ta ' "$@" | sort -u } + # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files @@ -559,15 +623,18 @@ f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done + { cd %buildroot find boot \ $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' + # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump + if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ @@ -587,6 +654,7 @@ cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ add_dirs_to_filelist >%my_builddir/kernel-base.files rm %my_builddir/tmp + %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ > %my_builddir/kernel-main.files @@ -594,6 +662,7 @@ %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files %endif + # Hardlink duplicate files automatically (from package fdupes): It doesn't save # much, but it keeps rpmlint from breaking the package build. %fdupes $RPM_BUILD_ROOT @@ -605,6 +674,7 @@ %pre -f pre.sh %post -f post.sh + %if %split_base %files -f kernel-main.files @@ -644,6 +714,7 @@ %pre base -f pre-base.sh %post base -f post-base.sh + %if %split_base %files base -f kernel-base.files @@ -683,11 +754,13 @@ %pre extra -f pre-extra.sh %post extra -f post-extra.sh + %if %split_extra %files extra -f kernel-extra.files %defattr(-, root, root) %endif + %if %CONFIG_KMSG_IDS == "y" %package man ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100 @@ -18,10 +18,12 @@ # norootforbuild # icecream 0 -%define srcversion 2.6.32 -%define patchversion 2.6.33-rc7 +%define srcversion 2.6.33 +%define patchversion 2.6.33 %define variant %{nil} + %include %_sourcedir/kernel-spec-macros + %define src_install_dir usr/src/linux-%kernelrelease%variant %define obj_install_dir /%src_install_dir-obj %define rpm_install_dir %buildroot%real_install_dir @@ -29,7 +31,7 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 2.6.33 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -98,9 +100,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Prefix: /usr/src + %(chmod +x %_sourcedir/{apply-patches,guards,check-for-config-changes,kabi.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 @@ -125,7 +130,9 @@ 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 @@ -135,12 +142,16 @@ 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 tar xjf %_sourcedir/linux-%srcversion.tar.bz2 mv linux-%srcversion linux-%kernelrelease%variant + %if %do_vanilla cp -al linux-%kernelrelease%variant linux-%kernelrelease-vanilla cd linux-%kernelrelease-vanilla @@ -148,12 +159,15 @@ rm -f $(find . -name ".gitignore") cd .. %endif + cd linux-%kernelrelease%variant %_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols rm -f $(find . -name ".gitignore") + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi + # Hardlink duplicate files automatically (from package fdupes). %fdupes $RPM_BUILD_ROOT @@ -163,11 +177,13 @@ 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" \ @@ -183,6 +199,7 @@ /etc/rpm/macros.kernel-source /usr/lib/rpm/kernel-module-subpackage /%src_install_dir + %if %do_vanilla %files vanilla ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100 @@ -18,12 +18,13 @@ # norootforbuild %define variant %{nil} + %include %_sourcedir/kernel-spec-macros Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.33 -Release: 3 +Release: 4 %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) ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100 @@ -17,29 +17,36 @@ # norootforbuild -%define srcversion 2.6.32 -%define patchversion 2.6.33-rc7 +%define srcversion 2.6.33 +%define patchversion 2.6.33 %define variant %{nil} + %include %_sourcedir/kernel-spec-macros + %define build_flavor trace %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") + %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj + %(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) + %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor + # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") + %ifarch %ix86 x86_64 %define install_vdso 1 %else @@ -49,7 +56,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel Version: 2.6.33 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -78,6 +85,7 @@ Requires(post): perl-Bootloader >= 0.4.15 Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd + %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -96,6 +104,7 @@ %endif #!BuildIgnore: xen %endif + Provides: %name-nongpl Obsoletes: %name-nongpl %if %build_vanilla @@ -127,6 +136,7 @@ Provides: kernel-64bit Obsoletes: kernel-64bit %endif + Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -160,6 +170,7 @@ Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc64 s390 s390x x86_64 + # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -174,6 +185,7 @@ NoSource: 110 NoSource: 111 NoSource: 120 + # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 Obsoletes: iwlwifi-kmp-%build_flavor @@ -202,8 +214,10 @@ Obsoletes: ocfs2-kmp-%build_flavor # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 + # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -218,33 +232,43 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi + SYMBOLS= if test -e %_sourcedir/extra-symbols; then SYMBOLS=$(cat %_sourcedir/extra-symbols) echo "extra symbol(s):" $SYMBOLS fi + # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 + mkdir -p %kernel_build_dir + supported_conf() { %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } + # Generate the list of modules to be marked as supported { supported_conf base supported_conf --default=0 external | sed 's/$/ external/' } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base + cd linux-%srcversion + %_sourcedir/apply-patches \ %if %{build_vanilla} --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS + cd %kernel_build_dir + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi + cp ../config/%cpu_arch_flavor .config %build_src_dir/scripts/config \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ @@ -254,6 +278,7 @@ %else --disable CONFIG_DEBUG_INFO %endif + MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -263,27 +288,34 @@ %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi + make prepare $MAKE_ARGS make scripts $MAKE_ARGS krel=$(make -s kernelrelease $MAKE_ARGS) + if [ "$krel" != "%kernelrelease-%build_flavor" ]; then echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2 exit 1 fi + make clean $MAKE_ARGS + rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files + cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')" export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)" + # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^GIT Branch: $.*$/\1-/p' \ %_sourcedir/source-timestamp) head -n 1 %_sourcedir/source-timestamp \ | tr -dc 0-9)" + export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 export KBUILD_OVERRIDE=1 @@ -292,10 +324,12 @@ %build cd %kernel_build_dir source .kernel-binary.spec.buildenv + # create *.symref files in the tree if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi + # If the %jobs macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: @@ -315,21 +349,27 @@ %endif %install + # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary export NO_BRP_STRIP_DEBUG=true export STRIP_KEEP_SYMTAB='*/vmlinux-*' + # /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes + cd %kernel_build_dir + mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor + add_vmlinux() { local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then compressed=true fi @@ -365,10 +405,12 @@ chmod a-x %buildroot/$vmlinux.gz fi } + %if %build_kdump add_vmlinux image=vmlinux %else + # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -409,8 +451,10 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif + # end of build_kdump %endif + for sub in '-base' '' '-extra'; do case "$sub" in '-base' | '') base_package=1 ;; @@ -429,28 +473,36 @@ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh done done + %if %build_kdump || %build_xen || %build_vanilla || %build_ps3 # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix + cp .config %buildroot/boot/config-%kernelrelease-%build_flavor + %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot %endif + # Create a dummy initrd with roughly the size the real one will have. # That way, YaST will know that this package requires some additional # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 + if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor + gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then %if %supported_modules_check @@ -458,6 +510,7 @@ %endif echo "Consistency check error: please update supported.conf." fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -467,11 +520,13 @@ dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif + # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor # so that kernel-source + kernel-%build_flavor is sufficient for building # modules that have modversions as well. mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor + # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then @@ -479,6 +534,7 @@ else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi + # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. @@ -486,6 +542,7 @@ ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu fi + # We were building in %my_builddir/linux-%srcversion, but the sources will # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the # build symlink. @@ -494,12 +551,14 @@ %buildroot/lib/modules/%kernelrelease-%build_flavor/source ln -s %obj_install_dir/%cpu_arch/%build_flavor \ %buildroot/lib/modules/%kernelrelease-%build_flavor/build + # Abort if there are any undefined symbols msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \ -b %buildroot -ae %kernelrelease-%build_flavor 2>&1)" if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then exit 1 fi + %if %split_base %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ @@ -508,11 +567,13 @@ %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif + %else ( cd %buildroot find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then # check for kabi changes @@ -529,6 +590,7 @@ exit 1 fi fi + tar cf - -T %my_builddir/obj-files | \ tar xf - -C %rpm_install_dir/%cpu_arch_flavor # bnc#507084 @@ -543,6 +605,7 @@ sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile fi + add_dirs_to_filelist() { sed -rn ' # print file name @@ -559,6 +622,7 @@ ta ' "$@" | sort -u } + # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files @@ -567,15 +631,18 @@ f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done + { cd %buildroot find boot \ $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' + # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump + if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ @@ -595,6 +662,7 @@ cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ add_dirs_to_filelist >%my_builddir/kernel-base.files rm %my_builddir/tmp + %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ > %my_builddir/kernel-main.files @@ -602,6 +670,7 @@ %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files %endif + # Hardlink duplicate files automatically (from package fdupes): It doesn't save # much, but it keeps rpmlint from breaking the package build. %fdupes $RPM_BUILD_ROOT @@ -613,6 +682,7 @@ %pre -f pre.sh %post -f post.sh + %if %split_base %files -f kernel-main.files @@ -652,6 +722,7 @@ %pre base -f pre-base.sh %post base -f post-base.sh + %if %split_base %files base -f kernel-base.files @@ -691,11 +762,13 @@ %pre extra -f pre-extra.sh %post extra -f post-extra.sh + %if %split_extra %files extra -f kernel-extra.files %defattr(-, root, root) %endif + %if %CONFIG_KMSG_IDS == "y" %package man ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100 @@ -17,29 +17,36 @@ # norootforbuild -%define srcversion 2.6.32 -%define patchversion 2.6.33-rc7 +%define srcversion 2.6.33 +%define patchversion 2.6.33 %define variant %{nil} + %include %_sourcedir/kernel-spec-macros + %define build_flavor vanilla %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") + %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj + %(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) + %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor + # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") + %ifarch %ix86 x86_64 %define install_vdso 1 %else @@ -49,7 +56,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches Version: 2.6.33 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -78,6 +85,7 @@ Requires(post): perl-Bootloader >= 0.4.15 Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd + %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -96,6 +104,7 @@ %endif #!BuildIgnore: xen %endif + Provides: %name-nongpl Obsoletes: %name-nongpl %if %build_vanilla @@ -123,6 +132,7 @@ Provides: kernel-64bit Obsoletes: kernel-64bit %endif + Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -156,6 +166,7 @@ Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x x86_64 + # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -170,6 +181,7 @@ NoSource: 110 NoSource: 111 NoSource: 120 + # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 Obsoletes: iwlwifi-kmp-%build_flavor @@ -198,8 +210,10 @@ Obsoletes: ocfs2-kmp-%build_flavor # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 + # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -214,33 +228,43 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi + SYMBOLS= if test -e %_sourcedir/extra-symbols; then SYMBOLS=$(cat %_sourcedir/extra-symbols) echo "extra symbol(s):" $SYMBOLS fi + # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 + mkdir -p %kernel_build_dir + supported_conf() { %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } + # Generate the list of modules to be marked as supported { supported_conf base supported_conf --default=0 external | sed 's/$/ external/' } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base + cd linux-%srcversion + %_sourcedir/apply-patches \ %if %{build_vanilla} --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS + cd %kernel_build_dir + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi + cp ../config/%cpu_arch_flavor .config %build_src_dir/scripts/config \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ @@ -250,6 +274,7 @@ %else --disable CONFIG_DEBUG_INFO %endif + MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -259,27 +284,34 @@ %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi + make prepare $MAKE_ARGS make scripts $MAKE_ARGS krel=$(make -s kernelrelease $MAKE_ARGS) + if [ "$krel" != "%kernelrelease-%build_flavor" ]; then echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2 exit 1 fi + make clean $MAKE_ARGS + rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files + cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')" export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)" + # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^GIT Branch: $.*$/\1-/p' \ %_sourcedir/source-timestamp) head -n 1 %_sourcedir/source-timestamp \ | tr -dc 0-9)" + export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 export KBUILD_OVERRIDE=1 @@ -288,10 +320,12 @@ %build cd %kernel_build_dir source .kernel-binary.spec.buildenv + # create *.symref files in the tree if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi + # If the %jobs macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: @@ -311,21 +345,27 @@ %endif %install + # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary export NO_BRP_STRIP_DEBUG=true export STRIP_KEEP_SYMTAB='*/vmlinux-*' + # /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes + cd %kernel_build_dir + mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor + add_vmlinux() { local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then compressed=true fi @@ -361,10 +401,12 @@ chmod a-x %buildroot/$vmlinux.gz fi } + %if %build_kdump add_vmlinux image=vmlinux %else + # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -405,8 +447,10 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif + # end of build_kdump %endif + for sub in '-base' '' '-extra'; do case "$sub" in '-base' | '') base_package=1 ;; @@ -425,28 +469,36 @@ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh done done + %if %build_kdump || %build_xen || %build_vanilla || %build_ps3 # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix + cp .config %buildroot/boot/config-%kernelrelease-%build_flavor + %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot %endif + # Create a dummy initrd with roughly the size the real one will have. # That way, YaST will know that this package requires some additional # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 + if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor + gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then %if %supported_modules_check @@ -454,6 +506,7 @@ %endif echo "Consistency check error: please update supported.conf." fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -463,11 +516,13 @@ dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif + # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor # so that kernel-source + kernel-%build_flavor is sufficient for building # modules that have modversions as well. mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor + # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then @@ -475,6 +530,7 @@ else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi + # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. @@ -482,6 +538,7 @@ ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu fi + # We were building in %my_builddir/linux-%srcversion, but the sources will # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the # build symlink. @@ -490,12 +547,14 @@ %buildroot/lib/modules/%kernelrelease-%build_flavor/source ln -s %obj_install_dir/%cpu_arch/%build_flavor \ %buildroot/lib/modules/%kernelrelease-%build_flavor/build + # Abort if there are any undefined symbols msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \ -b %buildroot -ae %kernelrelease-%build_flavor 2>&1)" if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then exit 1 fi + %if %split_base %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ @@ -504,11 +563,13 @@ %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif + %else ( cd %buildroot find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then # check for kabi changes @@ -525,6 +586,7 @@ exit 1 fi fi + tar cf - -T %my_builddir/obj-files | \ tar xf - -C %rpm_install_dir/%cpu_arch_flavor # bnc#507084 @@ -539,6 +601,7 @@ sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile fi + add_dirs_to_filelist() { sed -rn ' # print file name @@ -555,6 +618,7 @@ ta ' "$@" | sort -u } + # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files @@ -563,15 +627,18 @@ f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done + { cd %buildroot find boot \ $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' + # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump + if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ @@ -591,6 +658,7 @@ cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ add_dirs_to_filelist >%my_builddir/kernel-base.files rm %my_builddir/tmp + %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ > %my_builddir/kernel-main.files @@ -598,6 +666,7 @@ %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files %endif + # Hardlink duplicate files automatically (from package fdupes): It doesn't save # much, but it keeps rpmlint from breaking the package build. %fdupes $RPM_BUILD_ROOT @@ -609,6 +678,7 @@ %pre -f pre.sh %post -f post.sh + %if %split_base %files -f kernel-main.files @@ -648,6 +718,7 @@ %pre base -f pre-base.sh %post base -f post-base.sh + %if %split_base %files base -f kernel-base.files @@ -687,11 +758,13 @@ %pre extra -f pre-extra.sh %post extra -f post-extra.sh + %if %split_extra %files extra -f kernel-extra.files %defattr(-, root, root) %endif + %if %CONFIG_KMSG_IDS == "y" %package man ++++++ kernel-vmi.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100 @@ -17,29 +17,36 @@ # norootforbuild -%define srcversion 2.6.32 -%define patchversion 2.6.33-rc7 +%define srcversion 2.6.33 +%define patchversion 2.6.33 %define variant %{nil} + %include %_sourcedir/kernel-spec-macros + %define build_flavor vmi %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") + %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj + %(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) + %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor + # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") + %ifarch %ix86 x86_64 %define install_vdso 1 %else @@ -49,7 +56,7 @@ Name: kernel-vmi Summary: VMI-enabled kernel Version: 2.6.33 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -78,6 +85,7 @@ Requires(post): perl-Bootloader >= 0.4.15 Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd + %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -96,6 +104,7 @@ %endif #!BuildIgnore: xen %endif + Provides: %name-nongpl Obsoletes: %name-nongpl %if %build_vanilla @@ -115,6 +124,7 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel + Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -148,6 +158,7 @@ Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 + # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -162,6 +173,7 @@ NoSource: 110 NoSource: 111 NoSource: 120 + # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 Obsoletes: iwlwifi-kmp-%build_flavor @@ -190,8 +202,10 @@ Obsoletes: ocfs2-kmp-%build_flavor # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 + # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -207,33 +221,43 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi + SYMBOLS= if test -e %_sourcedir/extra-symbols; then SYMBOLS=$(cat %_sourcedir/extra-symbols) echo "extra symbol(s):" $SYMBOLS fi + # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 + mkdir -p %kernel_build_dir + supported_conf() { %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } + # Generate the list of modules to be marked as supported { supported_conf base supported_conf --default=0 external | sed 's/$/ external/' } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base + cd linux-%srcversion + %_sourcedir/apply-patches \ %if %{build_vanilla} --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS + cd %kernel_build_dir + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi + cp ../config/%cpu_arch_flavor .config %build_src_dir/scripts/config \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ @@ -243,6 +267,7 @@ %else --disable CONFIG_DEBUG_INFO %endif + MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -252,27 +277,34 @@ %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi + make prepare $MAKE_ARGS make scripts $MAKE_ARGS krel=$(make -s kernelrelease $MAKE_ARGS) + if [ "$krel" != "%kernelrelease-%build_flavor" ]; then echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2 exit 1 fi + make clean $MAKE_ARGS + rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files + cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')" export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)" + # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^GIT Branch: $.*$/\1-/p' \ %_sourcedir/source-timestamp) head -n 1 %_sourcedir/source-timestamp \ | tr -dc 0-9)" + export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 export KBUILD_OVERRIDE=1 @@ -281,10 +313,12 @@ %build cd %kernel_build_dir source .kernel-binary.spec.buildenv + # create *.symref files in the tree if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi + # If the %jobs macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: @@ -304,21 +338,27 @@ %endif %install + # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary export NO_BRP_STRIP_DEBUG=true export STRIP_KEEP_SYMTAB='*/vmlinux-*' + # /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes + cd %kernel_build_dir + mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor + add_vmlinux() { local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then compressed=true fi @@ -354,10 +394,12 @@ chmod a-x %buildroot/$vmlinux.gz fi } + %if %build_kdump add_vmlinux image=vmlinux %else + # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -398,8 +440,10 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif + # end of build_kdump %endif + for sub in '-base' '' '-extra'; do case "$sub" in '-base' | '') base_package=1 ;; @@ -418,28 +462,36 @@ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh done done + %if %build_kdump || %build_xen || %build_vanilla || %build_ps3 # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix + cp .config %buildroot/boot/config-%kernelrelease-%build_flavor + %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot %endif + # Create a dummy initrd with roughly the size the real one will have. # That way, YaST will know that this package requires some additional # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 + if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor + gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then %if %supported_modules_check @@ -447,6 +499,7 @@ %endif echo "Consistency check error: please update supported.conf." fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -456,11 +509,13 @@ dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif + # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor # so that kernel-source + kernel-%build_flavor is sufficient for building # modules that have modversions as well. mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor + # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then @@ -468,6 +523,7 @@ else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi + # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. @@ -475,6 +531,7 @@ ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu fi + # We were building in %my_builddir/linux-%srcversion, but the sources will # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the # build symlink. @@ -483,12 +540,14 @@ %buildroot/lib/modules/%kernelrelease-%build_flavor/source ln -s %obj_install_dir/%cpu_arch/%build_flavor \ %buildroot/lib/modules/%kernelrelease-%build_flavor/build + # Abort if there are any undefined symbols msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \ -b %buildroot -ae %kernelrelease-%build_flavor 2>&1)" if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then exit 1 fi + %if %split_base %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ @@ -497,11 +556,13 @@ %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif + %else ( cd %buildroot find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then # check for kabi changes @@ -518,6 +579,7 @@ exit 1 fi fi + tar cf - -T %my_builddir/obj-files | \ tar xf - -C %rpm_install_dir/%cpu_arch_flavor # bnc#507084 @@ -532,6 +594,7 @@ sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile fi + add_dirs_to_filelist() { sed -rn ' # print file name @@ -548,6 +611,7 @@ ta ' "$@" | sort -u } + # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files @@ -556,15 +620,18 @@ f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done + { cd %buildroot find boot \ $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' + # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump + if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ @@ -584,6 +651,7 @@ cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ add_dirs_to_filelist >%my_builddir/kernel-base.files rm %my_builddir/tmp + %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ > %my_builddir/kernel-main.files @@ -591,6 +659,7 @@ %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files %endif + # Hardlink duplicate files automatically (from package fdupes): It doesn't save # much, but it keeps rpmlint from breaking the package build. %fdupes $RPM_BUILD_ROOT @@ -602,6 +671,7 @@ %pre -f pre.sh %post -f post.sh + %if %split_base %files -f kernel-main.files @@ -642,6 +712,7 @@ %pre base -f pre-base.sh %post base -f post-base.sh + %if %split_base %files base -f kernel-base.files @@ -682,11 +753,13 @@ %pre extra -f pre-extra.sh %post extra -f post-extra.sh + %if %split_extra %files extra -f kernel-extra.files %defattr(-, root, root) %endif + %if %CONFIG_KMSG_IDS == "y" %package man ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100 @@ -17,29 +17,36 @@ # norootforbuild -%define srcversion 2.6.32 -%define patchversion 2.6.33-rc7 +%define srcversion 2.6.33 +%define patchversion 2.6.33 %define variant %{nil} + %include %_sourcedir/kernel-spec-macros + %define build_flavor xen %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") + %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj + %(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) + %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor + # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) %define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") + %ifarch %ix86 x86_64 %define install_vdso 1 %else @@ -49,7 +56,7 @@ Name: kernel-xen Summary: The Xen Kernel Version: 2.6.33 -Release: 2 +Release: 3 %if %using_buildservice %else %endif @@ -78,6 +85,7 @@ Requires(post): perl-Bootloader >= 0.4.15 Requires(post): mkinitrd #!BuildIgnore: perl-Bootloader mkinitrd + %ifarch ia64 # arch/ia64/scripts/unwcheck.py BuildRequires: python @@ -96,6 +104,7 @@ %endif #!BuildIgnore: xen %endif + Provides: %name-nongpl Obsoletes: %name-nongpl %if %build_vanilla @@ -115,6 +124,7 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel + Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -148,6 +158,7 @@ Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 + # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -162,6 +173,7 @@ NoSource: 110 NoSource: 111 NoSource: 120 + # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 Obsoletes: iwlwifi-kmp-%build_flavor @@ -190,8 +202,10 @@ Obsoletes: ocfs2-kmp-%build_flavor # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 + # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -209,33 +223,43 @@ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 fi + SYMBOLS= if test -e %_sourcedir/extra-symbols; then SYMBOLS=$(cat %_sourcedir/extra-symbols) echo "extra symbol(s):" $SYMBOLS fi + # Unpack all sources and patches %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 + mkdir -p %kernel_build_dir + supported_conf() { %_sourcedir/guards $* < %_sourcedir/supported.conf | \ sed 's,.*/,,; s,\.ko$,,' | sort -u } + # Generate the list of modules to be marked as supported { supported_conf base supported_conf --default=0 external | sed 's/$/ external/' } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base + cd linux-%srcversion + %_sourcedir/apply-patches \ %if %{build_vanilla} --vanilla \ %endif %_sourcedir/series.conf .. $SYMBOLS + cd %kernel_build_dir + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi + cp ../config/%cpu_arch_flavor .config %build_src_dir/scripts/config \ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ @@ -245,6 +269,7 @@ %else --disable CONFIG_DEBUG_INFO %endif + MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS @@ -254,27 +279,34 @@ %_sourcedir/check-for-config-changes .config.orig .config rm .config.orig fi + make prepare $MAKE_ARGS make scripts $MAKE_ARGS krel=$(make -s kernelrelease $MAKE_ARGS) + if [ "$krel" != "%kernelrelease-%build_flavor" ]; then echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2 exit 1 fi + make clean $MAKE_ARGS + rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files + cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')" export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)" + # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^GIT Branch: $.*$/\1-/p' \ %_sourcedir/source-timestamp) head -n 1 %_sourcedir/source-timestamp \ | tr -dc 0-9)" + export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 export KBUILD_OVERRIDE=1 @@ -283,10 +315,12 @@ %build cd %kernel_build_dir source .kernel-binary.spec.buildenv + # create *.symref files in the tree if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then %_sourcedir/modversions --unpack . < $_ fi + # If the %jobs macro is defined to a number, make will spawn that many jobs. # There are several ways how to define it: # If you are using the build script: @@ -306,21 +340,27 @@ %endif %install + # get rid of /usr/lib/rpm/brp-strip-debug # strip removes too much from the vmlinux ELF binary export NO_BRP_STRIP_DEBUG=true export STRIP_KEEP_SYMTAB='*/vmlinux-*' + # /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the # kernel-source package is installed. Don't check for stale symlinks # in the brp-symlink check: export NO_BRP_STALE_LINK_ERROR=yes + cd %kernel_build_dir + mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor + add_vmlinux() { local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then compressed=true fi @@ -356,10 +396,12 @@ chmod a-x %buildroot/$vmlinux.gz fi } + %if %build_kdump add_vmlinux image=vmlinux %else + # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -400,8 +442,10 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif + # end of build_kdump %endif + for sub in '-base' '' '-extra'; do case "$sub" in '-base' | '') base_package=1 ;; @@ -420,28 +464,36 @@ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh done done + %if %build_kdump || %build_xen || %build_vanilla || %build_ps3 # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix + cp .config %buildroot/boot/config-%kernelrelease-%build_flavor + %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot %endif + # Create a dummy initrd with roughly the size the real one will have. # That way, YaST will know that this package requires some additional # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 + if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor + gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz + make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then %if %supported_modules_check @@ -449,6 +501,7 @@ %endif echo "Consistency check error: please update supported.conf." fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -458,11 +511,13 @@ dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif + # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor # so that kernel-source + kernel-%build_flavor is sufficient for building # modules that have modversions as well. mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor + # Table of types used in exported symbols (for modversion debugging). %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then @@ -470,6 +525,7 @@ else rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor fi + # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. @@ -477,6 +533,7 @@ ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu fi + # We were building in %my_builddir/linux-%srcversion, but the sources will # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the # build symlink. @@ -485,12 +542,14 @@ %buildroot/lib/modules/%kernelrelease-%build_flavor/source ln -s %obj_install_dir/%cpu_arch/%build_flavor \ %buildroot/lib/modules/%kernelrelease-%build_flavor/build + # Abort if there are any undefined symbols msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \ -b %buildroot -ae %kernelrelease-%build_flavor 2>&1)" if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then exit 1 fi + %if %split_base %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ @@ -499,11 +558,13 @@ %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif + %else ( cd %buildroot find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n' ) > %my_builddir/base-modules %endif + res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then # check for kabi changes @@ -520,6 +581,7 @@ exit 1 fi fi + tar cf - -T %my_builddir/obj-files | \ tar xf - -C %rpm_install_dir/%cpu_arch_flavor # bnc#507084 @@ -534,6 +596,7 @@ sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile fi + add_dirs_to_filelist() { sed -rn ' # print file name @@ -550,6 +613,7 @@ ta ' "$@" | sort -u } + # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files @@ -558,15 +622,18 @@ f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done + { cd %buildroot find boot \ $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' + # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump + if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ @@ -586,6 +653,7 @@ cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ add_dirs_to_filelist >%my_builddir/kernel-base.files rm %my_builddir/tmp + %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ > %my_builddir/kernel-main.files @@ -593,6 +661,7 @@ %if %split_extra add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files %endif + # Hardlink duplicate files automatically (from package fdupes): It doesn't save # much, but it keeps rpmlint from breaking the package build. %fdupes $RPM_BUILD_ROOT @@ -604,6 +673,7 @@ %pre -f pre.sh %post -f post.sh + %if %split_base %files -f kernel-main.files @@ -646,6 +716,7 @@ %pre base -f pre-base.sh %post base -f post-base.sh + %if %split_base %files base -f kernel-base.files @@ -688,11 +759,13 @@ %pre extra -f pre-extra.sh %post extra -f post-extra.sh + %if %split_extra %files extra -f kernel-extra.files %defattr(-, root, root) %endif + %if %CONFIG_KMSG_IDS == "y" %package man ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=2.6.32 +SRCVERSION=2.6.33 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2010-02-12 17:37:20.000000000 +0100 +++ new/config/i386/debug 2010-02-24 21:01:18.000000000 +0100 @@ -3258,6 +3258,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3616,7 +3617,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -5111,7 +5113,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default --- old/config/i386/default 2010-02-12 17:37:20.000000000 +0100 +++ new/config/i386/default 2010-02-24 21:01:18.000000000 +0100 @@ -3227,6 +3227,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3585,7 +3586,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -5069,7 +5071,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/desktop new/config/i386/desktop --- old/config/i386/desktop 2010-02-12 17:37:20.000000000 +0100 +++ new/config/i386/desktop 2010-02-24 21:01:18.000000000 +0100 @@ -3112,6 +3112,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3457,7 +3458,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4898,7 +4900,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/ec2 new/config/i386/ec2 --- old/config/i386/ec2 2010-02-12 17:37:20.000000000 +0100 +++ new/config/i386/ec2 2010-02-24 21:01:18.000000000 +0100 @@ -1626,7 +1626,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2010-02-12 17:37:20.000000000 +0100 +++ new/config/i386/pae 2010-02-24 21:01:18.000000000 +0100 @@ -3132,6 +3132,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3477,7 +3478,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4921,7 +4923,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/trace new/config/i386/trace --- old/config/i386/trace 2010-02-12 17:37:20.000000000 +0100 +++ new/config/i386/trace 2010-02-24 21:01:18.000000000 +0100 @@ -3132,6 +3132,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3477,7 +3478,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4931,7 +4933,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vanilla new/config/i386/vanilla --- old/config/i386/vanilla 2010-02-12 17:37:20.000000000 +0100 +++ new/config/i386/vanilla 2010-02-24 21:01:18.000000000 +0100 @@ -3199,6 +3199,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3557,7 +3558,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -5026,7 +5028,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vmi new/config/i386/vmi --- old/config/i386/vmi 2010-02-12 17:37:20.000000000 +0100 +++ new/config/i386/vmi 2010-02-24 21:01:18.000000000 +0100 @@ -3132,6 +3132,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3477,7 +3478,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4921,7 +4923,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2010-02-12 17:37:20.000000000 +0100 +++ new/config/i386/xen 2010-02-24 21:01:18.000000000 +0100 @@ -2964,6 +2964,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3309,7 +3310,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4782,7 +4784,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/debug new/config/ia64/debug --- old/config/ia64/debug 2010-02-12 17:37:20.000000000 +0100 +++ new/config/ia64/debug 2010-02-24 21:01:18.000000000 +0100 @@ -2637,6 +2637,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -2980,7 +2981,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4083,7 +4085,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/default new/config/ia64/default --- old/config/ia64/default 2010-02-12 17:37:20.000000000 +0100 +++ new/config/ia64/default 2010-02-24 21:01:18.000000000 +0100 @@ -2619,6 +2619,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -2962,7 +2963,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4063,7 +4065,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/trace new/config/ia64/trace --- old/config/ia64/trace 2010-02-12 17:37:20.000000000 +0100 +++ new/config/ia64/trace 2010-02-24 21:01:18.000000000 +0100 @@ -2625,6 +2625,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -2968,7 +2969,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4069,7 +4071,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/vanilla new/config/ia64/vanilla --- old/config/ia64/vanilla 2010-02-12 17:37:20.000000000 +0100 +++ new/config/ia64/vanilla 2010-02-24 21:01:18.000000000 +0100 @@ -2605,6 +2605,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -2948,7 +2949,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4035,7 +4037,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/default new/config/ppc/default --- old/config/ppc/default 2010-02-12 17:37:20.000000000 +0100 +++ new/config/ppc/default 2010-02-24 21:01:18.000000000 +0100 @@ -2528,6 +2528,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -2842,7 +2843,8 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -3998,7 +4000,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/ppc64 new/config/ppc/ppc64 --- old/config/ppc/ppc64 2010-02-12 17:37:20.000000000 +0100 +++ new/config/ppc/ppc64 2010-02-24 21:01:18.000000000 +0100 @@ -2501,6 +2501,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -2811,7 +2812,8 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -3956,7 +3958,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/vanilla new/config/ppc/vanilla --- old/config/ppc/vanilla 2010-02-12 17:37:20.000000000 +0100 +++ new/config/ppc/vanilla 2010-02-24 21:01:18.000000000 +0100 @@ -2516,6 +2516,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -2830,7 +2831,8 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -3983,7 +3985,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/debug new/config/ppc64/debug --- old/config/ppc64/debug 2010-02-12 17:37:20.000000000 +0100 +++ new/config/ppc64/debug 2010-02-24 21:01:18.000000000 +0100 @@ -2458,6 +2458,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -2768,7 +2769,8 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -3920,7 +3922,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default --- old/config/ppc64/default 2010-02-12 17:37:20.000000000 +0100 +++ new/config/ppc64/default 2010-02-24 21:01:18.000000000 +0100 @@ -2446,6 +2446,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -2756,7 +2757,8 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -3904,7 +3906,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/ppc64 new/config/ppc64/ppc64 --- old/config/ppc64/ppc64 2010-02-12 17:37:20.000000000 +0100 +++ new/config/ppc64/ppc64 2010-02-24 21:01:18.000000000 +0100 @@ -2501,6 +2501,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -2811,7 +2812,8 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -3962,7 +3964,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/trace new/config/ppc64/trace --- old/config/ppc64/trace 2010-02-12 17:37:20.000000000 +0100 +++ new/config/ppc64/trace 2010-02-24 21:01:18.000000000 +0100 @@ -2501,6 +2501,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -2811,7 +2812,8 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -3971,7 +3973,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/vanilla new/config/ppc64/vanilla --- old/config/ppc64/vanilla 2010-02-12 17:37:20.000000000 +0100 +++ new/config/ppc64/vanilla 2010-02-24 21:01:18.000000000 +0100 @@ -2433,6 +2433,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -2743,7 +2744,8 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -3881,7 +3883,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/s390 new/config/s390/s390 --- old/config/s390/s390 2010-02-12 17:37:20.000000000 +0100 +++ new/config/s390/s390 2010-02-24 21:01:18.000000000 +0100 @@ -1410,7 +1410,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/trace new/config/s390/trace --- old/config/s390/trace 2010-02-12 17:37:20.000000000 +0100 +++ new/config/s390/trace 2010-02-24 21:01:18.000000000 +0100 @@ -1419,7 +1419,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/default new/config/s390x/default --- old/config/s390x/default 2010-02-12 17:37:20.000000000 +0100 +++ new/config/s390x/default 2010-02-24 21:01:18.000000000 +0100 @@ -1431,7 +1431,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/trace new/config/s390x/trace --- old/config/s390x/trace 2010-02-12 17:37:20.000000000 +0100 +++ new/config/s390x/trace 2010-02-24 21:01:18.000000000 +0100 @@ -1440,7 +1440,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/vanilla new/config/s390x/vanilla --- old/config/s390x/vanilla 2010-02-12 17:37:20.000000000 +0100 +++ new/config/s390x/vanilla 2010-02-24 21:01:18.000000000 +0100 @@ -1417,7 +1417,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2010-02-12 17:37:20.000000000 +0100 +++ new/config/x86_64/debug 2010-02-24 21:01:18.000000000 +0100 @@ -3070,6 +3070,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3415,7 +3416,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4847,7 +4849,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2010-02-12 17:37:20.000000000 +0100 +++ new/config/x86_64/default 2010-02-24 21:01:18.000000000 +0100 @@ -3067,6 +3067,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3412,7 +3413,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4839,7 +4841,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/desktop new/config/x86_64/desktop --- old/config/x86_64/desktop 2010-02-12 17:37:20.000000000 +0100 +++ new/config/x86_64/desktop 2010-02-24 21:01:18.000000000 +0100 @@ -3047,6 +3047,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3392,7 +3393,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4816,7 +4818,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/ec2 new/config/x86_64/ec2 --- old/config/x86_64/ec2 2010-02-12 17:37:20.000000000 +0100 +++ new/config/x86_64/ec2 2010-02-24 21:01:18.000000000 +0100 @@ -1607,7 +1607,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/trace new/config/x86_64/trace --- old/config/x86_64/trace 2010-02-12 17:37:20.000000000 +0100 +++ new/config/x86_64/trace 2010-02-24 21:01:18.000000000 +0100 @@ -3067,6 +3067,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3412,7 +3413,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4849,7 +4851,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/vanilla new/config/x86_64/vanilla --- old/config/x86_64/vanilla 2010-02-12 17:37:20.000000000 +0100 +++ new/config/x86_64/vanilla 2010-02-24 21:01:18.000000000 +0100 @@ -3038,6 +3038,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3383,7 +3384,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4795,7 +4797,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2010-02-12 17:37:20.000000000 +0100 +++ new/config/x86_64/xen 2010-02-24 21:01:18.000000000 +0100 @@ -2918,6 +2918,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -3263,7 +3264,8 @@ CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -4718,7 +4720,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 ++++++ kabi.pl ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100 @@ -7,6 +7,7 @@ # ( { sym => regexp, mod => regexp, fail => 0/1 }, ... ) my @rules; +my ($opt_verbose, $opt_rules); sub load_rules { my $file = shift; @@ -82,6 +83,7 @@ last; } } + return unless $fail or $opt_verbose; print STDERR "KABI: symbol $sym($mod) "; if ($newcrc) { print STDERR "changed crc from $oldcrc to $newcrc" @@ -100,7 +102,6 @@ open($_[0], $_[1], @_[2..$#_]) or die "$_[2]: $!\n"; } -my ($opt_verbose, $opt_rules); my $res = GetOptions( 'verbose|v' => \$opt_verbose, 'rules|r=s' => \$opt_rules, ++++++ linux-2.6.32.tar.bz2 -> linux-2.6.33.tar.bz2 ++++++ kernel-source/linux-2.6.32.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/linux-2.6.33.tar.bz2 differ: char 11, line 1 ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:41.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:41.000000000 +0100 @@ -1 +1 @@ -6000 +6144 ++++++ patches.drivers.tar.bz2 ++++++ ++++ 4543 lines of diff (skipped) ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/acpi_pci_hot_plug_sanity_checks.patch new/patches.fixes/acpi_pci_hot_plug_sanity_checks.patch --- old/patches.fixes/acpi_pci_hot_plug_sanity_checks.patch 2010-02-12 17:10:51.000000000 +0100 +++ new/patches.fixes/acpi_pci_hot_plug_sanity_checks.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -From: Thomas Renninger <trenn(a)suse.de> -Subject: ACPI: acpi_bus_{scan,bus,add}: return -ENODEV if no device was found -Patch-Mainline: queued for 2.6.34 -References: bnc#531547 - -Callers (acpi_memhotplug.c, dock.c and others) check for the return -value of acpi_bus_add() and assume a valid device was returned in -case zero was returned. - -Thus return -ENODEV if no device was found in acpi_bus_scan and -propagate this through acpi_bus_add and acpi_bus_start. - -Also remove a confusing comment in acpiphp_glue.c, acpi_bus_scan -will and cannot invoke if acpi_bus_add returns no valid device. - - -Signed-off-by: Thomas Renninger <trenn(a)suse.de> -CC: bjorn.helgaas(a)hp.com -CC: lenb(a)kernel.org -CC: linux-acpi(a)vger.kernel.org -CC: kristen.c.accardi(a)intel.com - ---- - drivers/acpi/scan.c | 24 +++++++++++++++++++----- - drivers/pci/hotplug/acpiphp_glue.c | 6 ------ - 2 files changed, 19 insertions(+), 11 deletions(-) - -Index: linux-2.6.32-SLE11-SP1/drivers/acpi/scan.c -=================================================================== ---- linux-2.6.32-SLE11-SP1.orig/drivers/acpi/scan.c -+++ linux-2.6.32-SLE11-SP1/drivers/acpi/scan.c -@@ -1361,9 +1361,25 @@ static int acpi_bus_scan(acpi_handle han - - if (child) - *child = device; -- return 0; -+ -+ if (device) -+ return 0; -+ else -+ return -ENODEV; - } - -+/* -+ * acpi_bus_add and acpi_bus_start -+ * -+ * scan a given ACPI tree and (probably recently hot-plugged) -+ * create and add or starts found devices. -+ * -+ * If no devices were found -ENODEV is returned which does not -+ * mean that this is a real error, there just have been no suitable -+ * ACPI objects in the table trunk from which the kernel could create -+ * a device and add/start an appropriate driver. -+ */ -+ - int - acpi_bus_add(struct acpi_device **child, - struct acpi_device *parent, acpi_handle handle, int type) -@@ -1373,8 +1389,7 @@ acpi_bus_add(struct acpi_device **child, - memset(&ops, 0, sizeof(ops)); - ops.acpi_op_add = 1; - -- acpi_bus_scan(handle, &ops, child); -- return 0; -+ return acpi_bus_scan(handle, &ops, child); - } - EXPORT_SYMBOL(acpi_bus_add); - -@@ -1388,8 +1403,7 @@ int acpi_bus_start(struct acpi_device *d - memset(&ops, 0, sizeof(ops)); - ops.acpi_op_start = 1; - -- acpi_bus_scan(device->handle, &ops, NULL); -- return 0; -+ return acpi_bus_scan(device->handle, &ops, NULL); - } - EXPORT_SYMBOL(acpi_bus_start); - -Index: linux-2.6.32-SLE11-SP1/drivers/pci/hotplug/acpiphp_glue.c -=================================================================== ---- linux-2.6.32-SLE11-SP1.orig/drivers/pci/hotplug/acpiphp_glue.c -+++ linux-2.6.32-SLE11-SP1/drivers/pci/hotplug/acpiphp_glue.c -@@ -920,12 +920,6 @@ static int acpiphp_bus_add(struct acpiph - -ret_val); - goto acpiphp_bus_add_out; - } -- /* -- * try to start anyway. We could have failed to add -- * simply because this bus had previously been added -- * on another add. Don't bother with the return value -- * we just keep going. -- */ - ret_val = acpi_bus_start(device); - - acpiphp_bus_add_out: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/dm-stripe-zero-stripes new/patches.fixes/dm-stripe-zero-stripes --- old/patches.fixes/dm-stripe-zero-stripes 2010-02-12 17:10:51.000000000 +0100 +++ new/patches.fixes/dm-stripe-zero-stripes 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -From: Nikanth Karthikesan <knikanth(a)suse.de> -Subject: dm-stripe: return -EINVAL if stripe count is zero -References: bnc#576312 -Patch-mainline: Not yet. https://www.redhat.com/archives/dm-devel/2010-February/msg00041.html - -If zero is passed as stripe count to the stripe_ctr, it segfaults with -a divide by zero error. - -divide error: 0000 [#1] PREEMPT SMP -last sysfs file: /sys/kernel/uevent_seqnum -CPU 1 -Pid: 3252, comm: dmsetup Not tainted 2.6.33-rc5-9-default #3 / -RIP: 0010:[<ffffffffa00e6ad7>] [<ffffffffa00e6ad7>] stripe_ctr+0xd5/0x28d [dm_mod] -RSP: 0018:ffff88003cb7dce8 EFLAGS: 00010246 -RAX: 0000000000000400 RBX: 0000000000000200 RCX: 0000000000000000 -RDX: 0000000000000000 RSI: ffff88003cb7dd08 RDI: ffffc900008fb165 -RBP: ffff88003cb7dd38 R08: 0000000000000200 R09: 000000000000000a -R10: ffffffffa00ec630 R11: ffffffffa00ec638 R12: 0000000000000004 -R13: 0000000000000200 R14: ffffc900008f0040 R15: 0000000000000000 -FS: 00007f9551621780(0000) GS:ffff880003600000(0000) knlGS:0000000000000000 -CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 -CR2: 00007f95514f7000 CR3: 00000000343c9000 CR4: 00000000000006e0 -DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 -DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 -Process dmsetup (pid: 3252, threadinfo ffff88003cb7c000, task ffff880034004f40) -Stack: - ffff88003cb7dd38 ffff88003d8d0400 ffff88003cb7dd60 ffffc900008f0040 -<0> ffffc900008fb165 0000000000000400 ffffc900008f0040 0000000000000000 -<0> ffff88003d8d0200 ffffc900008fb150 ffff88003cb7dd98 ffffffffa00e5dec -Call Trace: - [<ffffffffa00e5dec>] dm_table_add_target+0x152/0x1cf [dm_mod] - [<ffffffffa00e7cca>] table_load+0x257/0x266 [dm_mod] - [<ffffffffa00e7a73>] ? table_load+0x0/0x266 [dm_mod] - [<ffffffffa00e89c6>] ctl_ioctl+0x1ce/0x226 [dm_mod] - [<ffffffff8106a218>] ? sched_clock_cpu+0xe3/0xeb - [<ffffffffa00e8a2c>] dm_ctl_ioctl+0xe/0x12 [dm_mod] - [<ffffffff81117c08>] vfs_ioctl+0x2a/0x9e - [<ffffffff811181bd>] do_vfs_ioctl+0x4b7/0x4f4 - [<ffffffff81306b3a>] ? _raw_spin_unlock_irqrestore+0x76/0x92 - [<ffffffff811bbe57>] ? __up_write+0x12d/0x13c - [<ffffffff81306f39>] ? retint_swapgs+0x13/0x1b - [<ffffffff8111824f>] sys_ioctl+0x55/0x77 - [<ffffffff81002d82>] system_call_fastpath+0x16/0x1b -Code: 07 77 0a 49 c7 46 38 14 b2 0e a0 eb 9f 49 8b 56 18 8d 43 ff 48 85 d0 74 0a 49 c7 46 38 27 b2 0e a0 eb 89 48 89 d0 44 89 f9 31 d2 <48> f7 f1 44 89 7d c4 48 85 d2 48 -89 45 b0 74 0d 49 c7 46 38 51 -RIP [<ffffffffa00e6ad7>] stripe_ctr+0xd5/0x28d [dm_mod] - RSP <ffff88003cb7dce8> ----[ end trace fa87918cd9541274 ]--- - -This patch returns -EINVAL, if zero is passed as stripe count. - -With this patch we get the following error message. -device-mapper: table: 253:0: striped: Invalid stripe count -device-mapper: ioctl: error adding target to table - -And dmsetup exits gracefully with following error message. -device-mapper: reload ioctl failed: Invalid argument -Command failed - -Signed-off-by: Nikanth Karthikesan <knikanth suse de> - ---- - -Index: linux-2.6.32-master/drivers/md/dm-stripe.c -=================================================================== ---- linux-2.6.32-master.orig/drivers/md/dm-stripe.c -+++ linux-2.6.32-master/drivers/md/dm-stripe.c -@@ -110,7 +110,7 @@ static int stripe_ctr(struct dm_target * - } - - stripes = simple_strtoul(argv[0], &end, 10); -- if (*end) { -+ if (!stripes || *end) { - ti->error = "Invalid stripe count"; - return -EINVAL; - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/dvb-l64781.ko-broken-with-gcc-4.5.patch new/patches.fixes/dvb-l64781.ko-broken-with-gcc-4.5.patch --- old/patches.fixes/dvb-l64781.ko-broken-with-gcc-4.5.patch 2010-02-12 17:10:51.000000000 +0100 +++ new/patches.fixes/dvb-l64781.ko-broken-with-gcc-4.5.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -From kernel-bounces+gregkh=suse.de(a)suse.de Tue Feb 9 08:22:58 2010 -From: Richard Guenther <rguenther(a)suse.de> -Date: Tue, 9 Feb 2010 17:22:55 +0100 (CET) -Subject: dvb: l64781.ko broken with gcc 4.5 -Cc: Andreas Gruenbacher <agruen(a)suse.de> -Patch-mainline: 2.6.34 - -I'm trying to fix it on the GCC side (PR43007), but the module is -quite stupid in using ULL constants to operate on u32 values: - -static int apply_frontend_param (struct dvb_frontend* fe, struct -dvb_frontend_parameters *param) -{ -... - static const u32 ppm = 8000; - u32 spi_bias; -... - - spi_bias *= 1000ULL; - spi_bias /= 1000ULL + ppm/1000; - - -which causes current GCC 4.5 to emit calls to __udivdi3 for i?86 again. - -This patch fixes this issue. - -Signed-off-by: Richard Guenther <rguenther(a)suse.de> -Cc: Andreas Gruenbacher <agruen(a)suse.de> -Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> - ---- - drivers/media/dvb/frontends/l64781.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/media/dvb/frontends/l64781.c -+++ b/drivers/media/dvb/frontends/l64781.c -@@ -192,8 +192,8 @@ static int apply_frontend_param (struct - spi_bias *= qam_tab[p->constellation]; - spi_bias /= p->code_rate_HP + 1; - spi_bias /= (guard_tab[p->guard_interval] + 32); -- spi_bias *= 1000ULL; -- spi_bias /= 1000ULL + ppm/1000; -+ spi_bias *= 1000; -+ spi_bias /= 1000 + ppm/1000; - spi_bias *= p->code_rate_HP; - - val0x04 = (p->transmission_mode << 2) | p->guard_interval; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/novfs-err_ptr-fix.diff new/patches.fixes/novfs-err_ptr-fix.diff --- old/patches.fixes/novfs-err_ptr-fix.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/novfs-err_ptr-fix.diff 2010-02-23 00:34:37.000000000 +0100 @@ -0,0 +1,36 @@ +From: Anders Johansson <ajohansson(a)novell.com> +Subject: Oops in novfs:unlink_local +References: bnc#569071 +Patch-mainline: no + +Signed-off-by: Anders Johansson <ajohansson(a)novell.com> +Acked-by: Sankar P <psankar(a)novell.com> +--- + fs/novfs/daemon.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +Index: linux-2.6.32-SLE11-SP1/fs/novfs/daemon.c +=================================================================== +--- linux-2.6.32-SLE11-SP1.orig/fs/novfs/daemon.c 2010-02-02 04:27:16.000000000 +0100 ++++ linux-2.6.32-SLE11-SP1/fs/novfs/daemon.c 2010-02-02 05:24:30.000000000 +0100 +@@ -2046,14 +2046,14 @@ static long local_unlink(const char *pat + } + dentry = lookup_one_len(name, nd.path.dentry, strlen(name)); + error = PTR_ERR(dentry); +- DbgPrint("dentry %p", dentry); +- if (!(dentry->d_inode->i_mode & S_IFLNK)) { +- DbgPrint("%s not a link", name); +- error=-ENOENT; +- goto exit1; +- } + + if (!IS_ERR(dentry)) { ++ DbgPrint("dentry %p", dentry); ++ if (!(dentry->d_inode->i_mode & S_IFLNK)) { ++ DbgPrint("%s not a link", name); ++ error=-ENOENT; ++ goto exit1; ++ } + /* Why not before? Because we want correct error value */ + if (nd.last.name[nd.last.len]) + goto slashes; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/novfs-fix-inode-uid new/patches.fixes/novfs-fix-inode-uid --- old/patches.fixes/novfs-fix-inode-uid 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/novfs-fix-inode-uid 2010-02-23 00:34:37.000000000 +0100 @@ -0,0 +1,33 @@ +From: Sankar P <psankar(a)novell.com> +Subject: novfs: Get proper UID when looking up inode +Patch-mainline: no +References: bnc#486997 + +novfs is incorrectly assigning the rights in the /var/opt/novell/nclmnt +directory. This causes nwlogin mappings to fail. + +Patch below is ported for SLED 11 SP1 and it is already submitted for +OES 2 service packs. + +Ported-by: Sankar P <psankar(a)novell.com> +Signed-off-by: Pary D <dpary(a)novell.com> +Acked-by: Jan Kara <jack(a)suse.cz> + +diff --git a/tmp/linux-2.6.32-kerngit-sle11-sp1/fs/novfs/inode.c b/tmp/linux-2.6.32-kerngit-sle11-sp1/fs/novfs/inode.c +index 3045ba4..72d0a89 100644 +--- linux-2.6.32-kerngit-sle11-sp1/fs/novfs/inode.c ++++ linux-2.6.32-kerngit-sle11-sp1/fs/novfs/inode.c +@@ -2761,7 +2761,11 @@ struct dentry *novfs_i_lookup(struct inode *dir, struct dentry *dentry, + } + + if (!inode && ino) { +- uid = novfs_scope_get_uid(id->Scope); ++ if (id && id->Scope) { ++ uid = novfs_scope_get_uid(id->Scope); ++ } else { ++ uid = novfs_scope_get_uid(novfs_get_scope(dentry)); ++ } + if (novfs_lock_inode_cache(dir)) { + inode = novfs_get_inode (dentry->d_sb, info->mode, 0, uid, ino, &name); + if (inode) { + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/novfs-incorrect-filesize-fix new/patches.fixes/novfs-incorrect-filesize-fix --- old/patches.fixes/novfs-incorrect-filesize-fix 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/novfs-incorrect-filesize-fix 2010-02-23 00:34:37.000000000 +0100 @@ -0,0 +1,37 @@ +From: Sankar P <psankar(a)novell.com> +Subject: novfs: novfs reports incorrect file size +Patch-mainline: no +References: bnc#426536 + +While updating the inode, make sure that the s_blocks member +is updated to the number of 512 blocks units. + +This fixes the issue of novfs reporting invalid file sizes. + +Signed-off-by: Sankar P <psankar(a)novell.com> +Acked-by: Jan Kara <jack(a)suse.cz> + +diff --git a/tmp/linux-2.6.32-sle11-sp1-suse/fs/novfs/inode.c b/tmp/linux-2.6.32-sle11-sp1-suse/fs/novfs/inode.c +index 3045ba4..3f87e3e 100644 +--- linux-2.6.32-sle11-sp1-suse/fs/novfs/inode.c ++++ linux-2.6.32-sle11-sp1-suse/fs/novfs/inode.c +@@ -2672,8 +2672,17 @@ void update_inode(struct inode *Inode, struct novfs_entry_info *Info) + Inode->i_mtime = Info->mtime; + + if (Inode->i_size && Inode->i_sb->s_blocksize) { +- Inode->i_blocks = +- (unsigned long) (Info->size >> (loff_t) Inode->i_blkbits); ++ ++ /* ++ * Filling number of blocks as in NSS filesystem. ++ * The s_blocksize is initialized to PAGE_CACHE_SIZE in ++ * the super block initialization. ++ * ++ * Update i_blocks to have the number of 512 blocks ++ */ ++ Inode->i_blocks = (((loff_t)Info->size) + Inode->i_sb->s_blocksize - 1) ++ >> (loff_t)Inode->i_blkbits; ++ Inode->i_blocks = Inode->i_blocks << (PAGE_CACHE_SHIFT - 9); + Inode->i_bytes = Info->size & (Inode->i_sb->s_blocksize - 1); + + DbgPrint("i_sb->s_blocksize=%d", Inode->i_sb->s_blocksize); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/novfs-truncate-fix new/patches.fixes/novfs-truncate-fix --- old/patches.fixes/novfs-truncate-fix 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/novfs-truncate-fix 2010-02-23 00:34:37.000000000 +0100 @@ -0,0 +1,56 @@ +From: Sankar P <psankar(a)novell.com> +Subject: novfs: Fixes corruption of OO documents on NSS Volumes +References: bnc#508259 +Patch-mainline: no + +OpenOffice documents stored in NSS volumes, when accessed +via NOVFS, get corrupted while using the ftruncate64 call. + +Removed stale code which unsets the size in the setattr call. + +Signed-off-by: Sankar P <psankar(a)novell.com> +Acked-by: Jan Kara <jack(a)suse.cz> + +diff --git a/tmp/linux-2.6.32-sle11sp1/fs/novfs/inode.c b/tmp/linux-2.6.32-sle11sp1/fs/novfs/inode.c +index 3045ba4..26e78bf 100644 +--- linux-2.6.32-sle11sp1/fs/novfs/inode.c ++++ linux-2.6.32-sle11sp1/fs/novfs/inode.c +@@ -3171,7 +3171,6 @@ int novfs_i_setattr(struct dentry *dentry, struct iattr *attr) + unsigned int ia_valid = attr->ia_valid; + struct novfs_schandle session; + int retVal = 0; +- struct iattr mattr; + + if (IS_ROOT(dentry) || /* Root */ + IS_ROOT(dentry->d_parent) || /* User */ +@@ -3229,30 +3228,6 @@ int novfs_i_setattr(struct dentry *dentry, struct iattr *attr) + attr->ia_size, + atime_buf, mtime_buf, ctime_buf); + +- if ((attr->ia_valid & ATTR_FILE) +- && (attr->ia_valid & ATTR_SIZE)) { +- memcpy(&mattr, attr, sizeof(mattr)); +- mattr.ia_valid &= +- ~(ATTR_FILE | ATTR_SIZE); +- attr = &mattr; +- ia_valid = attr->ia_valid; +-#if 0 // thanks to vfs changes in our tree... +- retVal = +- novfs_trunc_ex(attr-> +- ia_file-> +- private_data, +- attr-> +- ia_size, +- session); +- if (!retVal) { +- inode->i_size = attr->ia_size; +- ((struct inode_data *) inode-> +- i_private)->Flags |= +- UPDATE_INODE; +- } +-#endif +- } +- + if (ia_valid + && !(retVal = + novfs_set_attr(path, attr, session))) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/tiocgdev new/patches.fixes/tiocgdev --- old/patches.fixes/tiocgdev 2010-02-12 17:10:51.000000000 +0100 +++ new/patches.fixes/tiocgdev 2010-02-23 00:34:37.000000000 +0100 @@ -140,8 +140,8 @@ COMPATIBLE_IOCTL(TIOCSBRK) +COMPATIBLE_IOCTL(TIOCGDEV) COMPATIBLE_IOCTL(TIOCCBRK) + COMPATIBLE_IOCTL(TIOCGSID) COMPATIBLE_IOCTL(TIOCGICOUNT) - /* Little t */ --- a/include/asm-generic/ioctls.h +++ b/include/asm-generic/ioctls.h @@ -65,6 +65,7 @@ ++++++ patches.kernel.org.tar.bz2 ++++++ kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: char 11, line 1 ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5 new/patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5 --- old/patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5 2010-02-24 20:02:37.000000000 +0100 @@ -0,0 +1,79 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: ftrace: fix ftrace_event_call alignment for use with gcc 4.5 +References: bnc#582222 +Patch-mainline: Submitted 24 Feb 2010 + + GCC 4.5 introduced behavior that forces the alignment of structures to + use the largest possible value. The default value is 32 bytes, so if + some structures are defined with a 4-byte alignment and others aren't + declared with an alignment constraint at all - it will align at 32-bytes. + + For things like the ftrace events, this results in a non-standard array. + When initializing the ftrace subsystem, we traverse the _ftrace_events + section and call the initialization callback for each event. When the + structures are misaligned, we could be treating another part of the + structure (or the zeroed out space between them) as a function pointer. + + This patch forces the alignment for all the ftrace_event_call structures + to 4 bytes. + + Without this patch, the kernel fails to boot very early when built with + gcc 4.5. + + It's trivial to check the alignment of the members of the array, so it + might be worthwhile to add something to the build system to do that + automatically. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + include/linux/syscalls.h | 6 ++++-- + include/trace/ftrace.h | 3 ++- + kernel/trace/trace.h | 3 ++- + 3 files changed, 8 insertions(+), 4 deletions(-) + +--- a/include/linux/syscalls.h ++++ b/include/linux/syscalls.h +@@ -132,7 +132,8 @@ struct perf_event_attr; + + #define SYSCALL_TRACE_ENTER_EVENT(sname) \ + static const struct syscall_metadata __syscall_meta_##sname; \ +- static struct ftrace_event_call event_enter_##sname; \ ++ static struct ftrace_event_call \ ++ __attribute__((__aligned__(4))) event_enter_##sname; \ + static struct trace_event enter_syscall_print_##sname = { \ + .trace = print_syscall_enter, \ + }; \ +@@ -154,7 +155,8 @@ struct perf_event_attr; + + #define SYSCALL_TRACE_EXIT_EVENT(sname) \ + static const struct syscall_metadata __syscall_meta_##sname; \ +- static struct ftrace_event_call event_exit_##sname; \ ++ static struct ftrace_event_call \ ++ __attribute__((__aligned__(4)))event_exit_##sname; \ + static struct trace_event exit_syscall_print_##sname = { \ + .trace = print_syscall_exit, \ + }; \ +--- a/include/trace/ftrace.h ++++ b/include/trace/ftrace.h +@@ -65,7 +65,8 @@ + }; + #undef DEFINE_EVENT + #define DEFINE_EVENT(template, name, proto, args) \ +- static struct ftrace_event_call event_##name ++ static struct ftrace_event_call \ ++ __attribute__((__aligned__(4))) event_##name + + #undef DEFINE_EVENT_PRINT + #define DEFINE_EVENT_PRINT(template, name, proto, args, print) \ +--- a/kernel/trace/trace.h ++++ b/kernel/trace/trace.h +@@ -791,7 +791,8 @@ extern const char *__stop___trace_bprint + + #undef FTRACE_ENTRY + #define FTRACE_ENTRY(call, struct_name, id, tstruct, print) \ +- extern struct ftrace_event_call event_##call; ++ extern struct ftrace_event_call \ ++ __attribute__((__aligned__(4))) event_##call; + #undef FTRACE_ENTRY_DUP + #define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print) \ + FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print)) ++++++ patches.xen.tar.bz2 ++++++ ++++ 28590 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:42.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:42.000000000 +0100 @@ -27,11 +27,6 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## - patches.kernel.org/patch-2.6.33-rc3 - patches.kernel.org/patch-2.6.33-rc3-rc4 - patches.kernel.org/patch-2.6.33-rc4-rc5 - patches.kernel.org/patch-2.6.33-rc5-rc6 - patches.kernel.org/patch-2.6.33-rc6-rc7 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -53,6 +48,7 @@ patches.rpmify/hpsa-fix-section-mismatch patches.rpmify/rt2860-fix-section-mismatches patches.rpmify/ppc-crashdump-typefix + patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5 ######################################################## # kABI consistency patches @@ -322,7 +318,6 @@ patches.fixes/acpi_fix_no_critical_tp.patch patches.fixes/acpi_thermal_check_trip_points.patch - patches.fixes/acpi_pci_hot_plug_sanity_checks.patch ######################################################## # CPUFREQ @@ -341,7 +336,6 @@ patches.fixes/cpufreq_ondemand_performance_optimise_default_settings.patch # PCC -> HP's cpufreq driver - patches.drivers/cpufreq_ondemand_limit_fix.patch patches.drivers/cpufreq_processor_clocking_control_pcc_driver.patch ######################################################## @@ -429,6 +423,10 @@ ######################################################## patches.suse/novfs-client-module patches.suse/novfs-fix-debug-message.patch + patches.fixes/novfs-err_ptr-fix.diff + patches.fixes/novfs-fix-inode-uid + patches.fixes/novfs-incorrect-filesize-fix + patches.fixes/novfs-truncate-fix ######################################################## # other filesystem stuff @@ -636,8 +634,6 @@ patches.suse/raw_device_max_minors_param.diff patches.suse/no-partition-scan - patches.fixes/dvb-l64781.ko-broken-with-gcc-4.5.patch - ######################################################## # Other drivers we have added to the tree ######################################################## @@ -662,7 +658,6 @@ patches.fixes/dm-release-map_lock-before-set_disk_ro patches.suse/dm-mpath-no-activate-for-offlined-paths patches.suse/dm-mpath-no-partitions-feature - patches.fixes/dm-stripe-zero-stripes ######################################################## # md @@ -906,6 +901,9 @@ patches.xen/xen3-patch-2.6.33-rc3-rc4 patches.xen/xen3-patch-2.6.33-rc4-rc5 patches.xen/xen3-patch-2.6.33-rc5-rc6 + patches.xen/xen3-patch-2.6.33-rc6-rc7 + patches.xen/xen3-patch-2.6.33-rc7-rc8 + patches.xen/xen3-patch-2.6.33-rc8-final patches.xen/xen3-seccomp-disable-tsc-option patches.xen/xen3-x86-mcp51-no-dac patches.xen/xen3-x86-mark_rodata_rw.patch @@ -949,6 +947,8 @@ patches.xen/xen-x86-machphys-prediction patches.xen/xen-x86-exit-mmap patches.xen/xen-x86-per-cpu-vcpu-info + patches.xen/xen-x86-xtime-lock + patches.xen/xen-x86-time-per-cpu patches.xen/xen-x86_64-pgd-pin patches.xen/xen-x86_64-pgd-alloc-order patches.xen/xen-x86_64-dump-user-pgt ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:42.000000000 +0100 +++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:42.000000000 +0100 @@ -1,3 +1,3 @@ -2010-02-12 17:37:20 +0100 -GIT Revision: 7a6a586d63ec8ee519b9de0f63c1bb1dd232f657 +2010-02-25 06:04:45 +0100 +GIT Revision: 598eedb84f8b4a3d43f88b9bd52d8169d3c8660b 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 emacs for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at Thu Feb 25 11:16:02 CET 2010. -------- --- emacs/emacs.changes 2010-02-09 17:04:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/emacs/emacs.changes 2010-02-24 19:14:07.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 24 18:13:47 UTC 2010 - coolo(a)novell.com + +- apply patch from cvs to fix build with gcc 4.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- emacs-23.1-fix_cpp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.tZ9ptn/_old 2010-02-25 11:15:50.000000000 +0100 +++ /var/tmp/diff_new_pack.tZ9ptn/_new 2010-02-25 11:15:50.000000000 +0100 @@ -24,7 +24,7 @@ License: GPLv2+ Group: Productivity/Editors/Emacs Version: 23.1 -Release: 7 +Release: 8 Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc Requires: emacs-info = %{version} Requires: emacs_program = %{version}-%{release} @@ -57,6 +57,7 @@ Patch16: emacs-23.1-flyspell.patch Patch17: emacs-23.1-bnc558884.patch Patch18: emacs-sparc.diff +Patch19: emacs-23.1-fix_cpp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global bug_345669 0 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} @@ -243,6 +244,7 @@ %patch15 -p0 -b .iconic %patch16 -p0 -b .flyspell %patch17 -p0 -b .gtkmenus +%patch19 -p1 -b .configure %patch if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then install-mh -auto < /dev/null ++++++ emacs-23.1-fix_cpp.patch ++++++ 2009-10-23 Jim Meyering <meyering(a)redhat.com> * configure.in: Invoke $CPP with -P when creating Makefile and src/Makefile. Without this, gcc 4.4.2 converts each backslash-newline pair in the input to a bare newline, yielding invalid Makefiles. --- emacs-23.1.orig/configure.in 2010-02-24 18:49:14.000000000 +0100 +++ emacs-23.1/configure.in 2010-02-24 18:51:16.000000000 +0100 @@ -2984,7 +2984,7 @@ echo creating lib-src/Makefile sed -e '1,/start of cpp stuff/d'\ -e 's,/\*\*/#$.*$$,/* \1 */,' \ < Makefile.c > junk.c - $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ + $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c cat junk1.c junk2.c > Makefile.new rm -f junk.c junk1.c junk2.c @@ -3000,7 +3000,7 @@ echo creating src/Makefile sed -e '1,/start of cpp stuff/d'\ -e 's,/\*\*/#$.*$$,/* \1 */,' \ < Makefile.c > junk.c - $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ + $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c cat junk1.c junk2.c > Makefile.new rm -f junk.c junk1.c junk2.c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ulogd2 for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package ulogd2 for openSUSE:Factory checked in at Thu Feb 25 11:15:11 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/ulogd2/ulogd2.changes 2010-02-23 23:33:16.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Tue Feb 23 22:32:41 UTC 2010 - jengelh(a)medozas.de + +- Initial upload, version 2.0.0~beta3 + calling whatdependson for head-i586 New: ---- ulogd-2.0.0beta3.tar.bz2 ulogd2.changes ulogd2.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ulogd2.spec ++++++ # # spec file for package ulogd2 (Version 2.0.0.beta3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: ulogd2 Version: 2.0.0.beta3 Release: 1 %define llver 2.0.0beta3 Group: Productivity/Networking/Security Summary: Userspace logging for Netfilter License: GPL Url: http://netfilter.org/projects/ulogd/ Source: ulogd-%llver.tar.bz2 BuildRequires: libnetfilter_conntrack-devel libnfnetlink-devel BuildRequires: libnetfilter_log-devel lksctp-tools-devel pkg-config BuildRequires: libmysqlclient-devel libpcap-devel postgresql-devel BuildRequires: sqlite3-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ulogd is a userspace logging daemon for netfilter/iptables related logging. This includes per-packet logging of security violations, per-packet logging for accounting purpose as well as per-flow logging. Author(s): ---------- Netfilter Team <netfilter-devel(a)vger.kernel.org> Éric Leblond Pierre Chifflier Pablo Neira Aysuo Harald Welte %package mysql License: GPL Summary: MySQL output target for ulogd2 Group: Productivity/Networking/Security Requires: %name = %version-%release %description mysql MySQL output target for ulogd2. Author(s): ---------- Netfilter Team <netfilter-devel(a)vger.kernel.org> Éric Leblond Pierre Chifflier Harald Welte %package pcap License: GPL Summary: pcap output target for ulogd2 Group: Productivity/Networking/Security Requires: %name = %version-%release %description pcap pcap output target for ulogd2. Author(s): ---------- Netfilter Team <netfilter-devel(a)vger.kernel.org> Éric Leblond Pierre Chifflier Harald Welte %package pgsql License: GPL Summary: PostgreSQL output target for ulogd2 Group: Productivity/Networking/Security Requires: %name = %version-%release %description pgsql PostgreSQL output target for ulogd2. Author(s): ---------- Netfilter Team <netfilter-devel(a)vger.kernel.org> Harald Welte %package sqlite3 License: GPL Summary: SQLite3 output target for ulogd2 Group: Productivity/Networking/Security Requires: %name = %version-%release %description sqlite3 SQLite3 output target for ulogd2. Author(s): ---------- Ben La Monica <ben.lamonica(a)gmail.com> %prep %setup -qn ulogd-%llver %build %configure --disable-static --libexecdir=%_libexecdir/%name \ --with-pcap-lib=%_libdir make %{?_smp_mflags} pkglibdir='${libexecdir}'; %install b="%buildroot"; rm -Rf "$b"; mkdir -p "$b"; make install DESTDIR="$b" pkglibdir='${libexecdir}'; find "$b" -type f -iname "*.la" -delete; %clean rm -Rf "%buildroot"; %files %defattr(-,root,root) %_sbindir/* %dir %_libexecdir/%name %_libexecdir/%name/ulogd_[fir]*.so* %_libexecdir/%name/ulogd_output_IPFIX.so* %_libexecdir/%name/ulogd_output_LOGEMU.so* %_libexecdir/%name/ulogd_output_NACCT.so* %_libexecdir/%name/ulogd_output_OPRINT.so* %_libexecdir/%name/ulogd_output_SYSLOG.so* %_mandir/*/* # These are the dependency-heavy things: %files mysql %defattr(-,root,root) %_libexecdir/ulogd2/ulogd_output_MYSQL.so* %files pcap %defattr(-,root,root) %_libexecdir/%name/ulogd_output_PCAP.so* %files pgsql %defattr(-,root,root) %_libexecdir/%name/ulogd_output_PGSQL.so* %files sqlite3 %defattr(-,root,root) %_libexecdir/%name/ulogd_output_SQLITE3.so* %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 aaa_base for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Thu Feb 25 11:14:09 CET 2010. -------- --- aaa_base/aaa_base.changes 2010-02-23 17:25:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2010-02-24 20:58:14.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 24 20:53:08 CET 2010 - pbaudis(a)suse.cz + +- Fix $TIMEZONE description in /etc/sysconfig/clock (bnc#582292) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.QqZ858/_old 2010-02-25 11:13:53.000000000 +0100 +++ /var/tmp/diff_new_pack.QqZ858/_new 2010-02-25 11:13:53.000000000 +0100 @@ -28,7 +28,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv AutoReqProv: on Version: 11.2 -Release: 58 +Release: 59 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 ++++++ sysconfig_parts.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig_parts/sysconfig.clock new/sysconfig_parts/sysconfig.clock --- old/sysconfig_parts/sysconfig.clock 2009-10-07 13:30:15.000000000 +0200 +++ new/sysconfig_parts/sysconfig.clock 2010-02-24 20:57:24.000000000 +0100 @@ -26,7 +26,10 @@ ## Type: string(Europe/Berlin,Europe/London,Europe/Paris) ## ServiceRestart: boot.clock # -# Timezone (e.g. CET) -# (this will set /usr/lib/zoneinfo/localtime) +# Timezone (e.g. CET or Asia/Tokyo). The value should correspond +# to the contents of the /etc/localtime file and is for internal +# YaST use; changing this setting will not make SuSEconfig update +# the /etc/localtime file, YaST does that or you will need to do +# this manually by calling zic -l. # TIMEZONE="" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 samba for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at Thu Feb 25 11:13:26 CET 2010. -------- --- samba/samba-doc.changes 2009-07-08 16:59:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/samba-doc.changes 2010-02-25 02:36:50.434749000 +0100 @@ -34,0 +35 @@ + --- samba/samba.changes 2010-02-12 17:49:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/samba/samba.changes 2010-02-25 02:36:50.550761000 +0100 @@ -1,0 +2,43 @@ +Wed Feb 24 14:55:27 CET 2010 - lmuelle(a)suse.de + +- Update to 3.4.6. + + Change parameter "wide links" to default to "no"; it's also incompatible + with "unix extensions"; (bso#7104); (bnc#577868). + + Fix printing with 64 bit clients (bso#6888). + + Fix core dump on 64 bit Linux (bso#7063). + + Fix failing of smbd to respond to a read or a write caused by Linux + asynchronous IO (aio) (bso#7067). + + Fix string buffer overflow causing heap corruption in smbd (bso#7096). + + + Fix bogus ip address in SWAT; (bso#5885). + + Fix vfs_full_audit; (bso#6557). + + Use the first "uid" value; (bso#6157). + + Fix large paged search with DirX LDAP servers; (bso#6981). + + Fix crash bug in 'cifs.upcall'; (bso#6868). + + Add cross option to samba_cv_linux_getgrouplist_ok; (bso#7047). + + Fix DFS on AIX (maybe others); (bso#7052). + + Fix pdb_search crash as non-root user; (bso#7068). + + Fix unlocking of accounts from ldap; (bso#7072). + + Fix vfs_expand_msdfs; (bso#7081). + + Fix results of 'smbclient -L' with a large browse list; (bso#7098). + + Normalize "Changing password for" msg IDs and STRs; (bso#7102). + + Fix malformed require_membership_of_sid; (bso#7106). + + Fix reading of large browselist; (bso#7122). + + "mangling method = hash" can crash storing a name containing a '.'; + (bso#7154). + + Valgrind Conditional jump or move depends on uninitialised value(s) error + when "mangling method = hash"; (bso#7155). + + Fix listing of printjobs in Windows 7; (bso#7130). + + Spoolss getprinterdriver2 level 101 marshalling is bad; (bso#7136). + + + Make idmap cache persistent for "ldapsam:trusted". + + Also fill the memcache with sid<->id mappings in ldapsam_sid_to_id() not + only the persistent idmap cache. + + Shortcut uid_to_sid when "ldapsam:trusted = yes". + + Make pdb_copy_sam_account also copy the group sid. + + Shortcut gid_to_sid when "ldapsam:trusted = yes". + + Speed up pdb_get_group_sid(). + + Try to build the full unix_pw structure with ldapsam:trusted support. + + Optimize ldapsam_alias_memberships() and cache ldap searches. + +------------------------------------------------------------------- @@ -14,0 +58,5 @@ +Mon Feb 8 18:51:27 CET 2010 - jmcdonough(a)suse.de + +- Allow forced pw change even with min pw age; (bnc#561894). + +------------------------------------------------------------------- @@ -147,0 +196,6 @@ +Tue Dec 8 19:53:12 CEST 2009 - jmcdonough(a)suse.de + +- Allow Windows 7 to connection to samba domain controllers and + member servers; (bnc#551811); (bso#6099); (bso#6100); (bso#6680). + +------------------------------------------------------------------- @@ -180 +234 @@ ------------------------------------------------------------------- +------------------------------------------------------------------- @@ -245 +299 @@ ------------------------------------------------------------------- +------------------------------------------------------------------- @@ -250 +304 @@ ------------------------------------------------------------------- +------------------------------------------------------------------- @@ -258 +312 @@ ------------------------------------------------------------------- +------------------------------------------------------------------- @@ -263 +317 @@ ------------------------------------------------------------------- +------------------------------------------------------------------- @@ -268 +322 @@ ------------------------------------------------------------------- +------------------------------------------------------------------- @@ -2247 +2300,0 @@ -------------------------------------------------------------------- @@ -2248,0 +2302 @@ +------------------------------------------------------------------- @@ -5556 +5609,0 @@ - @@ -5562 +5614,0 @@ - @@ -5564 +5615,0 @@ - @@ -5567 +5617,0 @@ - @@ -5571 +5620,0 @@ - @@ -5573 +5621,0 @@ - @@ -5575 +5622,0 @@ - @@ -5577 +5623,0 @@ - @@ -5580 +5625,0 @@ - @@ -5584 +5628,0 @@ - @@ -5586 +5629,0 @@ - calling whatdependson for head-i586 Old: ---- samba-3.4.5.tar.bz2 New: ---- samba-3.4.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.vBGuaM/_old 2010-02-25 11:13:12.000000000 +0100 +++ /var/tmp/diff_new_pack.vBGuaM/_new 2010-02-25 11:13:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package samba-doc (Version 3.4.5) +# spec file for package samba-doc (Version 3.4.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -55,15 +55,15 @@ %else BuildRequires: pkgconfig %endif -%define samba_ver 3.4.5 +%define samba_ver 3.4.6 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif Url: http://www.samba.org/ -Version: 3.4.5 -Release: 3 +Version: 3.4.6 +Release: 1 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -398,10 +398,16 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2309 -Branch : 3.4.5 +Source Timestamp: 2314 +Branch : 3.4.6 -Source Timestamp: 2309 -Branch : 3.4.5 +Source Timestamp: 2314 +Branch : 3.4.6 + +Source Timestamp: 2314 +Branch : 3.4.6 + +Source Timestamp: 2314 +Branch : 3.4.6 %changelog ++++++ samba.spec ++++++ ++++ 666 lines (skipped) ++++ between samba/samba.spec ++++ and /mounts/work_src_done/STABLE/samba/samba.spec ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.vBGuaM/_old 2010-02-25 11:13:12.000000000 +0100 +++ /var/tmp/diff_new_pack.vBGuaM/_new 2010-02-25 11:13:12.000000000 +0100 @@ -1,2 +1,2 @@ -2309 -Branch : 3.4.5 +2314 +Branch : 3.4.6 ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/2d063d077aed01f020352e859b766415fe094fa5 new/patches/samba.org/2d063d077aed01f020352e859b766415fe094fa5 --- old/patches/samba.org/2d063d077aed01f020352e859b766415fe094fa5 2010-01-19 12:29:33.000000000 +0100 +++ new/patches/samba.org/2d063d077aed01f020352e859b766415fe094fa5 2010-02-24 14:42:09.000000000 +0100 @@ -181,7 +181,7 @@ return; } -@@ -1740,11 +1831,13 @@ static int winbind_auth_request(struct p +@@ -1752,11 +1843,13 @@ static int winbind_auth_request(struct p if ((ret == PAM_SUCCESS) && user_info && policy && info) { bool already_expired = false; @@ -196,7 +196,7 @@ if (already_expired == true) { -@@ -1763,6 +1856,11 @@ static int winbind_auth_request(struct p +@@ -1775,6 +1868,11 @@ static int winbind_auth_request(struct p return PAM_AUTHTOK_EXPIRED; } @@ -208,7 +208,7 @@ /* inform about logon type */ _pam_warn_logon_type(ctx, user, user_info->user_flags); -@@ -3120,7 +3218,7 @@ int pam_sm_chauthtok(pam_handle_t * pamh +@@ -3132,7 +3230,7 @@ int pam_sm_chauthtok(pam_handle_t * pamh * expire soon */ _pam_warn_password_expiry(ctx, user_info, policy, warn_pwd_expire, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/381593a6cb1ff0ccbc560ee9329b0d2e59938264 new/patches/samba.org/381593a6cb1ff0ccbc560ee9329b0d2e59938264 --- old/patches/samba.org/381593a6cb1ff0ccbc560ee9329b0d2e59938264 2010-02-07 20:41:41.000000000 +0100 +++ new/patches/samba.org/381593a6cb1ff0ccbc560ee9329b0d2e59938264 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -From 381593a6cb1ff0ccbc560ee9329b0d2e59938264 Mon Sep 17 00:00:00 2001 -From: Bo Yang <boyang(a)samba.org> -Date: Sun, 7 Feb 2010 14:45:42 +0800 -Subject: [PATCH] s3: Fix malformed require_membership_of_sid. - -Signed-off-by: Bo Yang <boyang(a)samba.org> -(cherry picked from commit 913a9f4e420c7a4177e6a7874e8ec2703f447918) ---- - nsswitch/pam_winbind.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -Index: nsswitch/pam_winbind.c -=================================================================== ---- nsswitch/pam_winbind.c.orig -+++ nsswitch/pam_winbind.c -@@ -1133,6 +1133,7 @@ static bool winbind_name_list_to_sid_str - char *current_name = NULL; - const char *search_location; - const char *comma; -+ int len; - - if (sid_list_buffer_size > 0) { - sid_list_buffer[0] = 0; -@@ -1188,6 +1189,17 @@ static bool winbind_name_list_to_sid_str - _make_remark_format(ctx, PAM_TEXT_INFO, _("Cannot convert group %s " - "to sid, please contact your administrator to see " - "if group %s is valid."), search_location, search_location); -+ /* -+ * The lookup of the last name failed.. -+ * It results in require_member_of_sid ends with ',' -+ * It is malformated parameter here, overwrite the last ','. -+ */ -+ len = strlen(sid_list_buffer); -+ if (len) { -+ if (sid_list_buffer[len - 1] == ',') { -+ sid_list_buffer[len - 1] = '\0'; -+ } -+ } - } - - result = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 new/patches/samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 --- old/patches/samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 2010-01-19 12:29:33.000000000 +0100 +++ new/patches/samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 2010-02-24 14:42:31.000000000 +0100 @@ -33,7 +33,7 @@ =================================================================== --- source3/configure.in.orig +++ source3/configure.in -@@ -4208,6 +4208,39 @@ if test x"${try_pam}" != x"no";then +@@ -4210,6 +4210,39 @@ if test x"${try_pam}" != x"no";then fi # try_pam != no ################################################# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/bd269443e311d96ef495a9db47d1b95eb83bb8f4 new/patches/samba.org/bd269443e311d96ef495a9db47d1b95eb83bb8f4 --- old/patches/samba.org/bd269443e311d96ef495a9db47d1b95eb83bb8f4 2010-02-08 19:30:09.000000000 +0100 +++ new/patches/samba.org/bd269443e311d96ef495a9db47d1b95eb83bb8f4 1970-01-01 01:00:00.000000000 +0100 @@ -1,149 +0,0 @@ -commit bd269443e311d96ef495a9db47d1b95eb83bb8f4 -Author: Jeremy Allison <jra(a)samba.org> -Date: Fri Feb 5 15:20:18 2010 -0800 - - Fix bug 7104 - "wide links" and "unix extensions" are incompatible. - - Change parameter "wide links" to default to "no". - Ensure "wide links = no" if "unix extensions = yes" on a share. - Fix man pages to refect this. - - Remove "within share" checks for a UNIX symlink set - even if - widelinks = no. The server will not follow that link anyway. - - Correct DEBUG message in check_reduced_name() to add missing "\n" - so it's really clear when a path is being denied as it's outside - the enclosing share path. - - Jeremy. - -Index: docs-xml/smbdotconf/misc/widelinks.xml -=================================================================== ---- docs-xml/smbdotconf/misc/widelinks.xml.orig -+++ docs-xml/smbdotconf/misc/widelinks.xml -@@ -9,10 +9,15 @@ - server are always allowed; this parameter controls access only - to areas that are outside the directory tree being exported.</para> - -- <para>Note that setting this parameter can have a negative -- effect on your server performance due to the extra system calls -- that Samba has to do in order to perform the link checks.</para> -+ <para>Note: Turning this parameter on when UNIX extensions are enabled -+ will allow UNIX clients to create symbolic links on the share that -+ can point to files or directories outside restricted path exported -+ by the share definition. This can cause access to areas outside of -+ the share. Due to this problem, this parameter will be automatically -+ disabled (with a message in the log file) if the -+ <smbconfoption name="unix extensions"/> option is on. -+ </para> - </description> - --<value type="default">yes</value> -+<value type="default">no</value> - </samba:parameter> -Index: docs-xml/smbdotconf/protocol/unixextensions.xml -=================================================================== ---- docs-xml/smbdotconf/protocol/unixextensions.xml.orig -+++ docs-xml/smbdotconf/protocol/unixextensions.xml -@@ -10,6 +10,9 @@ - by supporting features such as symbolic links, hard links, etc... - These extensions require a similarly enabled client, and are of - no current use to Windows clients.</para> -+ <para> -+ Note if this parameter is turned on, the <smbconfoption name="wide links"/> -+ parameter will automatically be disabled. - </description> - - <value type="default">yes</value> -Index: source3/param/loadparm.c -=================================================================== ---- source3/param/loadparm.c.orig -+++ source3/param/loadparm.c -@@ -598,7 +598,7 @@ static struct service sDefault = { - True, /* bLevel2OpLocks */ - False, /* bOnlyUser */ - True, /* bMangledNames */ -- True, /* bWidelinks */ -+ false, /* bWidelinks */ - True, /* bSymlinks */ - False, /* bSyncAlways */ - False, /* bStrictAllocate */ -Index: source3/smbd/service.c -=================================================================== ---- source3/smbd/service.c.orig -+++ source3/smbd/service.c -@@ -1031,6 +1031,14 @@ static connection_struct *make_connectio - } - #endif - -+ if (lp_unix_extensions() && lp_widelinks(snum)) { -+ DEBUG(0,("Share '%s' has wide links and unix extensions enabled. " -+ "These parameters are incompatible. " -+ "Disabling wide links for this share.\n", -+ lp_servicename(snum) )); -+ lp_do_parameter(snum, "wide links", "False"); -+ } -+ - /* Figure out the characteristics of the underlying filesystem. This - * assumes that all the filesystem mounted withing a share path have - * the same characteristics, which is likely but not guaranteed. -Index: source3/smbd/trans2.c -=================================================================== ---- source3/smbd/trans2.c.orig -+++ source3/smbd/trans2.c -@@ -5292,42 +5292,6 @@ static NTSTATUS smb_set_file_unix_link(c - return NT_STATUS_INVALID_PARAMETER; - } - -- /* !widelinks forces the target path to be within the share. */ -- /* This means we can interpret the target as a pathname. */ -- if (!lp_widelinks(SNUM(conn))) { -- char *rel_name = NULL; -- char *last_dirp = NULL; -- -- if (*link_target == '/') { -- /* No absolute paths allowed. */ -- return NT_STATUS_ACCESS_DENIED; -- } -- rel_name = talloc_strdup(ctx,newname); -- if (!rel_name) { -- return NT_STATUS_NO_MEMORY; -- } -- last_dirp = strrchr_m(rel_name, '/'); -- if (last_dirp) { -- last_dirp[1] = '\0'; -- } else { -- rel_name = talloc_strdup(ctx,"./"); -- if (!rel_name) { -- return NT_STATUS_NO_MEMORY; -- } -- } -- rel_name = talloc_asprintf_append(rel_name, -- "%s", -- link_target); -- if (!rel_name) { -- return NT_STATUS_NO_MEMORY; -- } -- -- status = check_name(conn, rel_name); -- if (!NT_STATUS_IS_OK(status)) { -- return status; -- } -- } -- - DEBUG(10,("smb_set_file_unix_link: SMB_SET_FILE_UNIX_LINK doing symlink %s -> %s\n", - newname, link_target )); - -Index: source3/smbd/vfs.c -=================================================================== ---- source3/smbd/vfs.c.orig -+++ source3/smbd/vfs.c -@@ -946,7 +946,7 @@ NTSTATUS check_reduced_name(connection_s - - /* Check for widelinks allowed. */ - if (!lp_widelinks(SNUM(conn)) && (strncmp(conn->connectpath, resolved_name, con_path_len) != 0)) { -- DEBUG(2, ("reduce_name: Bad access attempt: %s is a symlink outside the share path", fname)); -+ DEBUG(2, ("reduce_name: Bad access attempt: %s is a symlink outside the share path\n", fname)); - if (free_resolved_name) { - SAFE_FREE(resolved_name); - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/f9f1db18834648da73b7b1f6d9472523941e8277 new/patches/samba.org/f9f1db18834648da73b7b1f6d9472523941e8277 --- old/patches/samba.org/f9f1db18834648da73b7b1f6d9472523941e8277 2010-02-05 18:24:55.000000000 +0100 +++ new/patches/samba.org/f9f1db18834648da73b7b1f6d9472523941e8277 1970-01-01 01:00:00.000000000 +0100 @@ -1,267 +0,0 @@ -commit f9f1db18834648da73b7b1f6d9472523941e8277 -Author: Lars Müller <lars(a)samba.org> -Date: Fri Feb 5 17:38:04 2010 +0100 - - s3: normalize "Changing password for" msg IDs and STRs - - An additional space at the end of the "Changing password for" msgid lead - to untranslated pam_winnind messages. - -Index: source3/locale/pam_winbind/ar.po -=================================================================== ---- source3/locale/pam_winbind/ar.po.orig -+++ source3/locale/pam_winbind/ar.po -@@ -136,8 +136,8 @@ msgid "Password: " - msgstr "كلمة السر: " - - #: pam_winbind.c:2013 --msgid "Changing password for " --msgstr "تغيير كلمة السر لـ " -+msgid "Changing password for" -+msgstr "تغيير كلمة السر لـ" - - #: pam_winbind.c:2027 - msgid "(current) NT password: " -Index: source3/locale/pam_winbind/cs.po -=================================================================== ---- source3/locale/pam_winbind/cs.po.orig -+++ source3/locale/pam_winbind/cs.po -@@ -136,7 +136,7 @@ msgid "Password: " - msgstr "Heslo:" - - #: pam_winbind.c:2013 --msgid "Changing password for " -+msgid "Changing password for" - msgstr "Měním heslo pro" - - #: pam_winbind.c:2027 -Index: source3/locale/pam_winbind/da.po -=================================================================== ---- source3/locale/pam_winbind/da.po.orig -+++ source3/locale/pam_winbind/da.po -@@ -153,7 +153,7 @@ msgstr "Brugernavn: " - - #. instruct user what is happening - #: ../../nsswitch/pam_winbind.c:2589 --msgid "Changing password for " -+msgid "Changing password for" - msgstr "Ændrer adgangskode for" - - #: ../../nsswitch/pam_winbind.c:2604 -Index: source3/locale/pam_winbind/es.po -=================================================================== ---- source3/locale/pam_winbind/es.po.orig -+++ source3/locale/pam_winbind/es.po -@@ -136,8 +136,8 @@ msgid "Password: " - msgstr "Contraseña:" - - #: pam_winbind.c:2013 --msgid "Changing password for " --msgstr "Cambiando la contraseña para " -+msgid "Changing password for" -+msgstr "Cambiando la contraseña para" - - #: pam_winbind.c:2027 - msgid "(current) NT password: " -Index: source3/locale/pam_winbind/fi.po -=================================================================== ---- source3/locale/pam_winbind/fi.po.orig -+++ source3/locale/pam_winbind/fi.po -@@ -156,8 +156,8 @@ msgstr "Käyttäjänimi: " - - #. instruct user what is happening - #: ../../nsswitch/pam_winbind.c:2589 --msgid "Changing password for " --msgstr "Vaihdetaan salasana käyttäjälle " -+msgid "Changing password for" -+msgstr "Vaihdetaan salasana käyttäjälle" - - #: ../../nsswitch/pam_winbind.c:2604 - msgid "(current) NT password: " -Index: source3/locale/pam_winbind/fr.po -=================================================================== ---- source3/locale/pam_winbind/fr.po.orig -+++ source3/locale/pam_winbind/fr.po -@@ -136,8 +136,8 @@ msgid "Password: " - msgstr "Mot de passe : " - - #: pam_winbind.c:2013 --msgid "Changing password for " --msgstr "Changement du mot de passe pour " -+msgid "Changing password for" -+msgstr "Changement du mot de passe pour" - - #: pam_winbind.c:2027 - msgid "(current) NT password: " -Index: source3/locale/pam_winbind/hu.po -=================================================================== ---- source3/locale/pam_winbind/hu.po.orig -+++ source3/locale/pam_winbind/hu.po -@@ -150,7 +150,7 @@ msgid "Password: " - msgstr "Jelszó: " - - #: pam_winbind.c:2013 --msgid "Changing password for " -+msgid "Changing password for" - msgstr "Jelszómódosítás" - - #: pam_winbind.c:2027 -Index: source3/locale/pam_winbind/it.po -=================================================================== ---- source3/locale/pam_winbind/it.po.orig -+++ source3/locale/pam_winbind/it.po -@@ -136,8 +136,8 @@ msgid "Password: " - msgstr "Password: " - - #: pam_winbind.c:2013 --msgid "Changing password for " --msgstr "Modifica la password per " -+msgid "Changing password for" -+msgstr "Modifica la password per" - - #: pam_winbind.c:2027 - msgid "(current) NT password: " -Index: source3/locale/pam_winbind/ja.po -=================================================================== ---- source3/locale/pam_winbind/ja.po.orig -+++ source3/locale/pam_winbind/ja.po -@@ -136,8 +136,8 @@ msgid "Password: " - msgstr "パスワード:" - - #: pam_winbind.c:2013 --msgid "Changing password for " --msgstr "下記に対するパスワードを変更しています " -+msgid "Changing password for" -+msgstr "下記に対するパスワードを変更しています" - - #: pam_winbind.c:2027 - msgid "(current) NT password: " -Index: source3/locale/pam_winbind/ko.po -=================================================================== ---- source3/locale/pam_winbind/ko.po.orig -+++ source3/locale/pam_winbind/ko.po -@@ -136,7 +136,7 @@ msgid "Password: " - msgstr "비밀번호:" - - #: pam_winbind.c:2013 --msgid "Changing password for " -+msgid "Changing password for" - msgstr "비밀번호 변경" - - #: pam_winbind.c:2027 -Index: source3/locale/pam_winbind/nb.po -=================================================================== ---- source3/locale/pam_winbind/nb.po.orig -+++ source3/locale/pam_winbind/nb.po -@@ -158,8 +158,8 @@ msgstr "Brukernavn: " - - #. instruct user what is happening - #: ../../nsswitch/pam_winbind.c:2589 --msgid "Changing password for " --msgstr "Endrer passord for " -+msgid "Changing password for" -+msgstr "Endrer passord for" - - #: ../../nsswitch/pam_winbind.c:2604 - msgid "(current) NT password: " -Index: source3/locale/pam_winbind/nl.po -=================================================================== ---- source3/locale/pam_winbind/nl.po.orig -+++ source3/locale/pam_winbind/nl.po -@@ -136,8 +136,8 @@ msgid "Password: " - msgstr "Wachtwoord:" - - #: pam_winbind.c:2013 --msgid "Changing password for " --msgstr "Wachtwoord wijzigen voor " -+msgid "Changing password for" -+msgstr "Wachtwoord wijzigen voor" - - #: pam_winbind.c:2027 - msgid "(current) NT password: " -Index: source3/locale/pam_winbind/pl.po -=================================================================== ---- source3/locale/pam_winbind/pl.po.orig -+++ source3/locale/pam_winbind/pl.po -@@ -136,8 +136,8 @@ msgid "Password: " - msgstr "Hasło: " - - #: pam_winbind.c:2013 --msgid "Changing password for " --msgstr "Zmiana hasła dla " -+msgid "Changing password for" -+msgstr "Zmiana hasła dla" - - #: pam_winbind.c:2027 - msgid "(current) NT password: " -Index: source3/locale/pam_winbind/pt_BR.po -=================================================================== ---- source3/locale/pam_winbind/pt_BR.po.orig -+++ source3/locale/pam_winbind/pt_BR.po -@@ -136,7 +136,7 @@ msgid "Password: " - msgstr "Senha:" - - #: pam_winbind.c:2013 --msgid "Changing password for " -+msgid "Changing password for" - msgstr "Alterando a senha para" - - #: pam_winbind.c:2027 -Index: source3/locale/pam_winbind/ru.po -=================================================================== ---- source3/locale/pam_winbind/ru.po.orig -+++ source3/locale/pam_winbind/ru.po -@@ -136,8 +136,8 @@ msgid "Password: " - msgstr "Пароль:" - - #: pam_winbind.c:2013 --msgid "Changing password for " --msgstr "Изменение пароля для " -+msgid "Changing password for" -+msgstr "Изменение пароля для" - - #: pam_winbind.c:2027 - msgid "(current) NT password: " -Index: source3/locale/pam_winbind/sv.po -=================================================================== ---- source3/locale/pam_winbind/sv.po.orig -+++ source3/locale/pam_winbind/sv.po -@@ -136,8 +136,8 @@ msgid "Password: " - msgstr "Lösenord:" - - #: pam_winbind.c:2013 --msgid "Changing password for " --msgstr "Ändrar lösenord för " -+msgid "Changing password for" -+msgstr "Ändrar lösenord för" - - #: pam_winbind.c:2027 - msgid "(current) NT password: " -Index: source3/locale/pam_winbind/zh_CN.po -=================================================================== ---- source3/locale/pam_winbind/zh_CN.po.orig -+++ source3/locale/pam_winbind/zh_CN.po -@@ -136,8 +136,8 @@ msgid "Password: " - msgstr "密码：" - - #: pam_winbind.c:2013 --msgid "Changing password for " --msgstr "更改密码 " -+msgid "Changing password for" -+msgstr "更改密码" - - #: pam_winbind.c:2027 - msgid "(current) NT password: " -Index: source3/locale/pam_winbind/zh_TW.po -=================================================================== ---- source3/locale/pam_winbind/zh_TW.po.orig -+++ source3/locale/pam_winbind/zh_TW.po -@@ -136,7 +136,7 @@ msgid "Password: " - msgstr "密碼：" - - #: pam_winbind.c:2013 --msgid "Changing password for " -+msgid "Changing password for" - msgstr "變更密碼 -" - - #: pam_winbind.c:2027 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2010-02-11 17:22:38.000000000 +0100 +++ new/patches/series 2010-02-24 14:53:07.000000000 +0100 @@ -9,9 +9,6 @@ samba.org/2d063d077aed01f020352e859b766415fe094fa5 -p0 # FATE 302414. Backported from 3.5.x(master). samba.org/e171c09c3bae678db68c3ded5765d602c8438e25 -p0 # FATE 302414. Backported from 3.5.x(master). samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 -p0 # FATE 302414. Backported from 3.5.x(master). -samba.org/f9f1db18834648da73b7b1f6d9472523941e8277 -p0 # bnc 499233 -samba.org/381593a6cb1ff0ccbc560ee9329b0d2e59938264 -p0 # bnc 525123, bso 7106 -samba.org/bd269443e311d96ef495a9db47d1b95eb83bb8f4 -p0 # bso 7104, bnc 577868 samba.org/cc7b62269e4a90859dd93b8d6896390857ba17d7 -p0 # mount.cifs check req by bnc 550002 samba.org/3ae5dac462c4ed0fb2cd94553583c56fce2f9d80 -p0 # bnc 550002 samba.org/a065c177dfc8f968775593ba00dffafeebb2e054 -p0 # brc 562156, bnc 577925 ++++++ samba-3.4.5.tar.bz2 -> samba-3.4.6.tar.bz2 ++++++ samba/samba-3.4.5.tar.bz2 /mounts/work_src_done/STABLE/samba/samba-3.4.6.tar.bz2 differ: char 11, line 1 ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2010-02-12 18:45:00.000000000 +0100 +++ new/vendor-files/tools/package-data 2010-02-24 15:42:59.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2309" +SAMBA_PACKAGE_SVN_VERSION="2314" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rpm for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at Thu Feb 25 11:12:27 CET 2010. -------- --- rpm/rpm.changes 2009-12-12 23:43:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2010-02-24 11:58:44.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 24 11:57:30 CET 2010 - mls(a)suse.de + +- fix readLine segfault [bnc#582599] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- readlineofi.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.q0fhUk/_old 2010-02-25 11:12:19.000000000 +0100 +++ /var/tmp/diff_new_pack.q0fhUk/_new 2010-02-25 11:12:19.000000000 +0100 @@ -25,7 +25,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.7.1 -Release: 8 +Release: 9 Requires: rpm = %{version} %py_requires Source99: rpm.spec ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.q0fhUk/_old 2010-02-25 11:12:19.000000000 +0100 +++ /var/tmp/diff_new_pack.q0fhUk/_new 2010-02-25 11:12:19.000000000 +0100 @@ -28,7 +28,7 @@ AutoReqProv: on Summary: The RPM Package Manager Version: 4.7.1 -Release: 8 +Release: 9 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -102,6 +102,7 @@ Patch66: fixqueryreturn.diff Patch67: lazystatfs.diff Patch68: defclean.diff +Patch69: readlineofi.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -161,7 +162,7 @@ %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39 %patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49 %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 -%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 +%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 #chmod 755 scripts/find-supplements{,.ksyms} #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms #chmod 755 scripts/firmware.prov ++++++ readlineofi.diff ++++++ --- build/parseSpec.c.orig 2010-02-15 11:49:29.000000000 +0000 +++ build/parseSpec.c 2010-02-24 10:38:25.000000000 +0000 @@ -283,6 +283,7 @@ int readLine(rpmSpec spec, int strip) retry: if ((rc = readLineFromOFI(spec, ofi)) != 0) return rc; + ofi = spec->fileStack; /* Copy next file line into the spec line buffer */ rc = copyNextLineFromOFI(spec, ofi); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gawk for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package gawk for openSUSE:Factory checked in at Thu Feb 25 11:12:03 CET 2010. -------- --- gawk/gawk.changes 2009-11-03 20:17:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/gawk/gawk.changes 2010-02-16 10:06:59.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 16 09:06:01 UTC 2010 - guido+opensuse.org(a)berhoerster.name + +- use update-alternatives + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gawk.spec ++++++ --- /var/tmp/diff_new_pack.DajJ0F/_old 2010-02-25 11:11:53.000000000 +0100 +++ /var/tmp/diff_new_pack.DajJ0F/_new 2010-02-25 11:11:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gawk (Version 3.1.6) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,14 @@ Name: gawk Url: http://www.gnu.org/software/gawk/ -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Text/Utilities Provides: awk AutoReqProv: on -PreReq: %{install_info_prereq} +BuildRequires: update-alternatives +PreReq: %{install_info_prereq} update-alternatives Version: 3.1.6 -Release: 26 +Release: 27 Summary: GNU awk Source: gawk-%{version}.tar.bz2 Patch: gawk-%{version}.diff @@ -75,32 +76,50 @@ %install make install DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/bin -mv -f $RPM_BUILD_ROOT/usr/bin/awk $RPM_BUILD_ROOT/usr/bin/gawk \ - $RPM_BUILD_ROOT/bin -ln -sf ../../bin/awk ../../bin/gawk $RPM_BUILD_ROOT/usr/bin -ln -sf gawk.1 $RPM_BUILD_ROOT%{_mandir}/man1/awk.1 -rm -f $RPM_BUILD_ROOT/usr/bin/*-%{version} +mv -f $RPM_BUILD_ROOT/usr/bin/gawk $RPM_BUILD_ROOT/bin +ln -sf ../../bin/gawk $RPM_BUILD_ROOT/usr/bin +rm -f $RPM_BUILD_ROOT/usr/bin/*-%{version} $RPM_BUILD_ROOT/usr/bin/awk +# create ghost files +touch $RPM_BUILD_ROOT/usr/bin/awk $RPM_BUILD_ROOT/bin/awk \ + $RPM_BUILD_ROOT/%{_mandir}/man1/awk.1.gz %find_lang %name %clean rm -rf $RPM_BUILD_ROOT %post +/usr/sbin/update-alternatives --install /bin/awk awk /bin/gawk 20 \ + --slave /usr/bin/awk usr-bin-awk /bin/gawk \ + --slave %{_mandir}/man1/awk.1.gz awk.1.gz %{_mandir}/man1/gawk.1.gz %install_info --info-dir=%{_infodir} %{_infodir}/gawk.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz +%preun +if [ $1 -eq 0 ]; then + /usr/sbin/update-alternatives --remove awk /bin/gawk +fi + %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/gawk.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz %files -f %name.lang %defattr(-,root,root) +%if %{suse_version} >= 1120 +%ghost /bin/awk +%ghost %{_bindir}/awk +%ghost %{_mandir}/man1/awk.1.gz +%endif %doc AUTHORS COPYING FUTURES LIMITATIONS NEWS POSIX.STD PROBLEMS README -/bin/* -/usr/bin/* +/bin/gawk +%{_bindir}/gawk +%{_bindir}/igawk +%{_bindir}/pgawk %{_libdir}/awk /usr/share/awk %{_infodir}/*.info.gz -%{_mandir}/man1/*.1.gz +%{_mandir}/man1/gawk.1.gz +%{_mandir}/man1/igawk.1.gz +%{_mandir}/man1/pgawk.1.gz %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bash for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package bash for openSUSE:Factory checked in at Thu Feb 25 11:11:40 CET 2010. -------- --- bash/bash.changes 2010-02-18 11:08:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/bash/bash.changes 2010-02-24 09:56:35.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 24 09:55:03 CET 2010 - werner(a)suse.de + +- Avoid hang due malloc()/free() within signal handler (bnc#522351) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.gJQIhy/_old 2010-02-25 11:11:32.000000000 +0100 +++ /var/tmp/diff_new_pack.gJQIhy/_new 2010-02-25 11:11:32.000000000 +0100 @@ -28,7 +28,7 @@ Suggests: command-not-found AutoReqProv: on Version: 4.1 -Release: 1 +Release: 2 Summary: The GNU Bourne-Again Shell Url: http://www.gnu.org/software/bash/bash.html Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2 @@ -91,7 +91,7 @@ Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.1 -Release: 1 +Release: 2 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch @@ -114,7 +114,7 @@ Summary: Include Files mandatory for Development of bash loadable builtins Group: Development/Languages/C and C++ Version: 4.1 -Release: 1 +Release: 2 AutoReqProv: on %description -n bash-devel @@ -134,7 +134,7 @@ Summary: Loadable bash builtins Group: System/Shells Version: 4.1 -Release: 1 +Release: 2 AutoReqProv: on %description -n bash-loadables @@ -203,7 +203,7 @@ Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.1 -Release: 1 +Release: 2 Recommends: readline-doc = %{version} # bug437293 %ifarch ppc64 @@ -232,7 +232,7 @@ Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 6.1 -Release: 1 +Release: 2 Requires: libreadline6 = %{version} Requires: ncurses-devel Recommends: readline-doc = %{version} @@ -261,7 +261,7 @@ Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.1 -Release: 1 +Release: 2 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch ++++++ bash-4.1-intr.dif ++++++ --- /var/tmp/diff_new_pack.gJQIhy/_old 2010-02-25 11:11:32.000000000 +0100 +++ /var/tmp/diff_new_pack.gJQIhy/_new 2010-02-25 11:11:32.000000000 +0100 @@ -15,7 +15,7 @@ #if 0 --- xmalloc.c -+++ xmalloc.c 2010-02-15 15:36:40.113797875 +0000 ++++ xmalloc.c 2010-02-24 08:32:51.452626384 +0000 @@ -35,6 +35,11 @@ # include "ansi_stdlib.h" #endif /* HAVE_STDLIB_H */ @@ -121,3 +121,27 @@ if (temp == 0) allocerr ("xrealloc", bytes); +@@ -145,7 +204,22 @@ xfree (string) + PTR_T string; + { + if (string) +- free (string); ++ { ++ sigset_t set, oset; ++ int blocked_sigs = 0; ++ ++ /* Block all signals in case we are executed from a signal handler. */ ++ if (interrupt_immediately || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD)) ++ { ++ block_signals (&set, &oset); ++ blocked_sigs = 1; ++ } ++ ++ free (string); ++ ++ if (blocked_sigs) ++ unblock_signals (&set, &oset); ++ } + } + + #ifdef USING_BASH_MALLOC ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 crash for openSUSE:Factory
by root＠Hilbert.suse.de 25 Feb '10

25 Feb '10

Hello community, here is the log from the commit of package crash for openSUSE:Factory checked in at Thu Feb 25 02:37:53 CET 2010. -------- --- crash/crash.changes 2010-01-05 14:42:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/crash/crash.changes 2010-02-25 02:36:30.923265000 +0100 @@ -1,0 +2,76 @@ +Tue Feb 23 18:56:25 CET 2010 - ptesarik(a)novell.com + +- crash-rl_digit_loop-return.patch: add the missing return to + the embedded readline. + +------------------------------------------------------------------- +Tue Feb 23 12:38:25 CET 2010 - ptesarik(a)novell.com + +- Update to 5.0.1 + o Fix "irq" on 2.6.33 and later kernels. + o Fix "swap", "kmem -i", and "vm -p" on 2.6.33 and later. + o Fix "bt" on an ia64 "INIT" process that interrupted a task that + was running in user space, but was unable to modify the + original (interrupted) task's stack. + o Fix "bt" on offline s390/s390x "swapper" idle tasks. + o x86, s390, s390x, ia64: use the highest online CPU number plus + one as the system CPU count. + o Correctly recognize per-cpu variables. + o Let "struct" or "union" fail gracefully if given an unmapped or + non-existent address. + o Fix support of >4GB Xen domU dumpfiles. + o Account for the renaming of the st_status_fixed_logout _lowcore + struct member in 2.6.33 and later s390 and s390x kernels. + o Add a defensive mechanism to handle corrupted "cache_cache". + o Fix a startup segfault with 2.6.30 or later x86_64 dumpfiles + from kernels compiled without CONFIG_SMP. + o Fix a startup segfault if a kernel crashes while loding a + kernel module. + o Fix build failures with gcc-4.5 on x86_64. + o Use mkstemps() from the built-in libiberty.a to allow running + crash with pre-2.11 glibc versions. + o Accept gdb-7.0 disassembler output on 2.6.20 and earlier x86 + kernels. + o Fix a gdb-7.0 regression that prevented "dis -l" from showing + line numbers for some x86 base kernel text addresses. + o Preparation for future s390x ELF dumpfile format. +- Delete crash-large-xendump.patch: now solved in mainline. + +------------------------------------------------------------------- +Thu Feb 12 19:20:56 CET 2010 - ptesarik(a)novell.com + +- crash-large-xendump.patch: properly handle xendumps larger than + 4GBs. (bnc#542170) + +------------------------------------------------------------------- +Tue Feb 12 18:18:27 CET 2010 - ptesarik(a)novell.com + +- crash-Makefile-ADD_CFLAGS: remove + Upstream has honoured the CFLAGS settings since 4.0-8.12. + +------------------------------------------------------------------- +Fri Feb 12 17:41:58 CET 2010 - ptesarik(a)novell.com + +- Update to 5.0.0 + o Update embedded gdb to FSF gdb-7.0. + o Always recognize and display BUG()-induced exception frames + when doing a backtrace on 2.6.29 and later x86_64 kernels. + o Fix "ps -r" segfaults with 2.6.25 or later. + o Fix "mount" on 2.6.32 and later (except "mount -i", which + cannot be easily implemented for these kernel versions). + o Recognize VMEMMAP_REGION virtual addresses in 2.6.26 and later + ppc64 kernels compiled with CONFIG_SPARSEMEM_VMEMMAP. + o Fix a 4.0-8.11 regression in determining the number of cpus + on ppc64. + o Fix "irq" on ppc64 kernel which do not define "irq_desc_t" as + a typedef for "struct irq_desc". + o Avoid the unnecessary "WARNING: sparsemem: invalid section number:" + message when doing "rd" or "kmem" on CONFIG_SPARSEMEM_EXTREME kernels. + +------------------------------------------------------------------- +Fri Feb 5 01:12:43 UTC 2010 - jengelh(a)medozas.de + +- Construct an ExclusiveArch tag for specfile to match + source-code capabilities + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- crash-4.1.2.tar.bz2 crash-Makefile-ADD_CFLAGS crash-source-sal.patch New: ---- crash-5.0.1.tar.gz crash-rl_digit_loop-return.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crash.spec ++++++ --- /var/tmp/diff_new_pack.lA2Lcx/_old 2010-02-25 02:37:12.000000000 +0100 +++ /var/tmp/diff_new_pack.lA2Lcx/_new 2010-02-25 02:37:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package crash (Version 4.1.2) +# spec file for package crash (Version 5.0.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,7 +17,7 @@ # norootforbuild -%define crash_version 4.1.2 +%define crash_version 5.0.1 %define whitepaper_version 2003 %define scripts_version 2008-02-08 @@ -31,23 +31,24 @@ Summary: Crash utility for live systems; netdump, diskdump, LKCD or mcore dumpfiles Version: %{crash_version} Release: 1 -License: GPLv2 ; GPLv2+ ; LGPLv2.1+ +License: GPLv3 Group: Development/Tools/Debuggers -Source: %{name}-%{crash_version}.tar.bz2 +Source: %{name}-%{crash_version}.tar.gz Source2: crash_whitepaper-%{whitepaper_version}.tar.bz2 Source3: README.SUSE Source4: sial-scripts-%{scripts_version}.tar.bz2 Source99: rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch0: %{name}-Makefile-ADD_CFLAGS Patch1: %{name}-make-emacs-default.diff Patch2: %{name}-sles9-quirk.patch Patch4: %{name}-sles9-time.patch Patch5: %{name}-compressed-kernel Patch6: %{name}-crosscrash-hint.diff -Patch7: %{name}-source-sal.patch +Patch7: %{name}-rl_digit_loop-return.patch BuildRequires: bison flex ncurses-devel zlib-devel Requires: /usr/bin/nm +ExclusiveArch: %ix86 x86_64 ia64 s390 s390x ppc64 alpha +# Source code says it can do ppc32. Excluded here? ExcludeArch: ppc %description @@ -122,7 +123,6 @@ %prep %setup -q -n %{name}-%{crash_version} -a 2 -a 4 -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch4 -p1 @@ -136,11 +136,9 @@ cp %{S:3} . %build -#export CFLAGS="$RPM_OPT_FLAGS -fno-builtin-memset -fno-strict-aliasing" -make ADD_CFLAGS="$RPM_OPT_FLAGS -fno-builtin-memset -fno-strict-aliasing -fno-builtin-memset" \ - RPMPKG="`cat .rh_rpm_package`" %{?jobs:-j%jobs} -make ADD_CFLAGS="$RPM_OPT_FLAGS -fno-builtin-memset -fno-strict-aliasing -fno-builtin-memset" \ - extensions %{?jobs:-j%jobs} +export CFLAGS="$RPM_OPT_FLAGS -fno-builtin-memset -fno-strict-aliasing" +make RPMPKG="`cat .rh_rpm_package`" %{?jobs:-j%jobs} +make extensions %{?jobs:-j%jobs} %install mkdir -p %{buildroot}%{_bindir} @@ -152,7 +150,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_includedir}/crash install -m 0644 defs.h $RPM_BUILD_ROOT/%{_includedir}/crash # permissions -chmod 644 COPYING +chmod 644 COPYING3 # extensions %if %build_sial mkdir -p $RPM_BUILD_ROOT/%{_libdir}/crash/extensions @@ -170,7 +168,7 @@ %defattr(-,root,root) %{_bindir}/crash %{_mandir}/man8/crash.8* -%doc README README.SUSE COPYING +%doc README README.SUSE COPYING3 %files devel %defattr(-,root,root) ++++++ crash-compressed-kernel ++++++ --- /var/tmp/diff_new_pack.lA2Lcx/_old 2010-02-25 02:37:12.000000000 +0100 +++ /var/tmp/diff_new_pack.lA2Lcx/_new 2010-02-25 02:37:12.000000000 +0100 @@ -53,7 +53,7 @@ char *dumpfile; /* dumpfile or /dev/kmem */ char *live_memsrc; /* live memory driver */ char *system_map; /* get symbol values from System.map */ -@@ -3393,6 +3395,7 @@ void dump_struct_table(ulong); +@@ -3396,6 +3398,7 @@ void dump_struct_table(ulong); void dump_offset_table(char *, ulong); int is_elf_file(char *); int is_kernel(char *); @@ -73,7 +73,7 @@ } --- a/kernel.c +++ b/kernel.c -@@ -3781,10 +3781,10 @@ display_sys_stats(void) +@@ -3832,10 +3832,10 @@ display_sys_stats(void) if (pc->system_map) { fprintf(fp, " SYSTEM MAP: %s\n", pc->system_map); fprintf(fp, "DEBUG KERNEL: %s %s\n", ++++++ crash-rl_digit_loop-return.patch ++++++ --- gdb-7.0.patch | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/gdb-7.0.patch +++ b/gdb-7.0.patch @@ -1201,6 +1201,15 @@ extern int rl_show_char PARAMS((int)); --- gdb-7.0/readline/misc.c.orig +++ gdb-7.0/readline/misc.c +@@ -212,6 +212,8 @@ rl_digit_loop () + if (r <= 0 || (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)) + break; + } ++ ++ return r; + } + + /* Create a default argument. */ @@ -401,7 +401,7 @@ _rl_history_set_point () #if defined (VI_MODE) ++++++ crash-sles9-time.patch ++++++ --- /var/tmp/diff_new_pack.lA2Lcx/_old 2010-02-25 02:37:12.000000000 +0100 +++ /var/tmp/diff_new_pack.lA2Lcx/_new 2010-02-25 02:37:12.000000000 +0100 @@ -24,7 +24,7 @@ }; /* -@@ -4574,6 +4575,13 @@ extern struct lkcd_environment *lkcd; +@@ -4582,6 +4583,13 @@ extern struct lkcd_environment *lkcd; #endif /* LKCD_COMMON */ @@ -53,7 +53,7 @@ if (symbol_exists("__per_cpu_offset")) { if (LKCD_KERNTYPES()) i = get_cpus_possible(); -@@ -3915,7 +3921,7 @@ get_uptime(char *buf, ulonglong *j64p) +@@ -3966,7 +3972,7 @@ get_uptime(char *buf, ulonglong *j64p) if (symbol_exists("jiffies_64")) { get_symbol_data("jiffies_64", sizeof(ulonglong), &jiffies_64); @@ -62,7 +62,7 @@ wrapped = (jiffies_64 & 0xffffffff00000000ULL); if (wrapped) { wrapped -= 0x100000000ULL; -@@ -4406,6 +4412,7 @@ no_cpu_flags: +@@ -4457,6 +4463,7 @@ no_cpu_flags: fprintf(fp, "(%ld%%)\n", kt->p2m_page_cache_hits * 100 / kt->p2m_pages_searched); else fprintf(fp, "\n"); @@ -72,7 +72,7 @@ /* --- a/task.c +++ b/task.c -@@ -3462,6 +3462,12 @@ start_time_timespec(void) +@@ -3491,6 +3491,12 @@ start_time_timespec(void) default: break; } @@ -85,7 +85,7 @@ tt->flags |= NO_TIMESPEC; -@@ -3494,6 +3500,11 @@ convert_start_time(ulonglong start_time, +@@ -3523,6 +3529,11 @@ convert_start_time(ulonglong start_time, ulong tmp1, tmp2; ulonglong wrapped; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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