diff --git a/config.sh b/config.sh index 0e23db8c..24447c10 100644 --- a/config.sh +++ b/config.sh @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=2.6.39-rc5 +SRCVERSION=2.6.39-rc6 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against diff --git a/config.tar.bz2 b/config.tar.bz2 index de9f5d65..bbe82906 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a95cc0b0c4b051f1e5d2c734d0b49ba95645f4e04897b38a46ee63527f9da0c -size 225506 +oid sha256:7bc8aa4f149569beb4d72f3a87795dbb9a7d3c7324fc68e2da4d1ec46c131ac4 +size 225171 diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index 9abbd643..f6a61a22 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -452,6 +452,15 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor +sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor +for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do + if [ -f "$file" ]; then + cat "$file" + fi +done | sed '1i # Generated file - do not edit.' >$sysctl_file +if [ ! -s $sysctl_file ]; then + rm $sysctl_file +fi %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image diff --git a/kernel-debug.changes b/kernel-debug.changes index fdd49aaf..dca10aed 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-debug.spec b/kernel-debug.spec index b688ec61..017e82ee 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 2.6.39-rc5 -%define patchversion 2.6.39-rc5 +%define srcversion 2.6.39-rc6 +%define patchversion 2.6.39-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -57,9 +57,9 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else -Release: rc5.0 +Release: rc6.0 %endif License: GPL v2 only Group: System/Kernel @@ -196,6 +196,7 @@ Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 +Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc64 x86_64 @@ -216,6 +217,7 @@ NoSource: 111 NoSource: 112 NoSource: 113 NoSource: 120 +NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -271,7 +273,7 @@ if test -e %_sourcedir/extra-symbols; then 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 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121 mkdir -p %kernel_build_dir @@ -527,6 +529,15 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor +sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor +for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do + if [ -f "$file" ]; then + cat "$file" + fi +done | sed '1i # Generated file - do not edit.' >$sysctl_file +if [ ! -s $sysctl_file ]; then + rm $sysctl_file +fi %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image @@ -872,6 +883,49 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/kernel-default.changes b/kernel-default.changes index fdd49aaf..dca10aed 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-default.spec b/kernel-default.spec index 94e1da0c..8611db2b 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 2.6.39-rc5 -%define patchversion 2.6.39-rc5 +%define srcversion 2.6.39-rc6 +%define patchversion 2.6.39-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -57,9 +57,9 @@ Name: kernel-default Summary: The Standard Kernel Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else -Release: rc5.0 +Release: rc6.0 %endif License: GPL v2 only Group: System/Kernel @@ -212,6 +212,7 @@ Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 +Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc ppc64 s390x x86_64 @@ -232,6 +233,7 @@ NoSource: 111 NoSource: 112 NoSource: 113 NoSource: 120 +NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -286,7 +288,7 @@ if test -e %_sourcedir/extra-symbols; then 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 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121 mkdir -p %kernel_build_dir @@ -542,6 +544,15 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor +sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor +for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do + if [ -f "$file" ]; then + cat "$file" + fi +done | sed '1i # Generated file - do not edit.' >$sysctl_file +if [ ! -s $sysctl_file ]; then + rm $sysctl_file +fi %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image @@ -885,6 +896,49 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/kernel-desktop.changes b/kernel-desktop.changes index fdd49aaf..dca10aed 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-desktop.spec b/kernel-desktop.spec index 42d0223c..8dd44fcd 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 2.6.39-rc5 -%define patchversion 2.6.39-rc5 +%define srcversion 2.6.39-rc6 +%define patchversion 2.6.39-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -57,9 +57,9 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else -Release: rc5.0 +Release: rc6.0 %endif License: GPL v2 only Group: System/Kernel @@ -193,6 +193,7 @@ Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 +Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 @@ -213,6 +214,7 @@ NoSource: 111 NoSource: 112 NoSource: 113 NoSource: 120 +NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -280,7 +282,7 @@ if test -e %_sourcedir/extra-symbols; then 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 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121 mkdir -p %kernel_build_dir @@ -536,6 +538,15 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor +sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor +for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do + if [ -f "$file" ]; then + cat "$file" + fi +done | sed '1i # Generated file - do not edit.' >$sysctl_file +if [ ! -s $sysctl_file ]; then + rm $sysctl_file +fi %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image @@ -905,6 +916,49 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/kernel-docs.changes b/kernel-docs.changes index fdd49aaf..dca10aed 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-docs.spec b/kernel-docs.spec index 510b10a7..350b9b5e 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -17,7 +17,7 @@ # norootforbuild -%define patchversion 2.6.39-rc5 +%define patchversion 2.6.39-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -26,9 +26,9 @@ Name: kernel-docs Summary: Kernel Documentation Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else -Release: rc5.0 +Release: rc6.0 %endif BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant @@ -99,6 +99,49 @@ rm -rf $RPM_BUILD_ROOT /usr/share/doc/kernel %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/kernel-ec2.changes b/kernel-ec2.changes index fdd49aaf..dca10aed 100644 --- a/kernel-ec2.changes +++ b/kernel-ec2.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-ec2.spec b/kernel-ec2.spec index 31f98ca2..ff7a3e4b 100644 --- a/kernel-ec2.spec +++ b/kernel-ec2.spec @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 2.6.39-rc5 -%define patchversion 2.6.39-rc5 +%define srcversion 2.6.39-rc6 +%define patchversion 2.6.39-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -57,9 +57,9 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else -Release: rc5.0 +Release: rc6.0 %endif License: GPL v2 only Group: System/Kernel @@ -193,6 +193,7 @@ Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 +Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 @@ -213,6 +214,7 @@ NoSource: 111 NoSource: 112 NoSource: 113 NoSource: 120 +NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -270,7 +272,7 @@ if test -e %_sourcedir/extra-symbols; then 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 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121 mkdir -p %kernel_build_dir @@ -526,6 +528,15 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor +sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor +for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do + if [ -f "$file" ]; then + cat "$file" + fi +done | sed '1i # Generated file - do not edit.' >$sysctl_file +if [ ! -s $sysctl_file ]; then + rm $sysctl_file +fi %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image @@ -875,6 +886,49 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/kernel-pae.changes b/kernel-pae.changes index fdd49aaf..dca10aed 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-pae.spec b/kernel-pae.spec index a4283d01..0b7cf24b 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 2.6.39-rc5 -%define patchversion 2.6.39-rc5 +%define srcversion 2.6.39-rc6 +%define patchversion 2.6.39-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -57,9 +57,9 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else -Release: rc5.0 +Release: rc6.0 %endif License: GPL v2 only Group: System/Kernel @@ -196,6 +196,7 @@ Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 +Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 @@ -216,6 +217,7 @@ NoSource: 111 NoSource: 112 NoSource: 113 NoSource: 120 +NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -277,7 +279,7 @@ if test -e %_sourcedir/extra-symbols; then 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 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121 mkdir -p %kernel_build_dir @@ -533,6 +535,15 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor +sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor +for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do + if [ -f "$file" ]; then + cat "$file" + fi +done | sed '1i # Generated file - do not edit.' >$sysctl_file +if [ ! -s $sysctl_file ]; then + rm $sysctl_file +fi %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image @@ -890,6 +901,49 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes index fdd49aaf..dca10aed 100644 --- a/kernel-ppc64.changes +++ b/kernel-ppc64.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec index 1d42a90d..8c3b7f8f 100644 --- a/kernel-ppc64.spec +++ b/kernel-ppc64.spec @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 2.6.39-rc5 -%define patchversion 2.6.39-rc5 +%define srcversion 2.6.39-rc6 +%define patchversion 2.6.39-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -57,9 +57,9 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else -Release: rc5.0 +Release: rc6.0 %endif License: GPL v2 only Group: System/Kernel @@ -200,6 +200,7 @@ Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 +Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 @@ -220,6 +221,7 @@ NoSource: 111 NoSource: 112 NoSource: 113 NoSource: 120 +NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -281,7 +283,7 @@ if test -e %_sourcedir/extra-symbols; then 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 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121 mkdir -p %kernel_build_dir @@ -537,6 +539,15 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor +sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor +for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do + if [ -f "$file" ]; then + cat "$file" + fi +done | sed '1i # Generated file - do not edit.' >$sysctl_file +if [ ! -s $sysctl_file ]; then + rm $sysctl_file +fi %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image @@ -894,6 +905,49 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/kernel-ps3.changes b/kernel-ps3.changes index fdd49aaf..dca10aed 100644 --- a/kernel-ps3.changes +++ b/kernel-ps3.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-ps3.spec b/kernel-ps3.spec index 51fc8115..9b5a6b0c 100644 --- a/kernel-ps3.spec +++ b/kernel-ps3.spec @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 2.6.39-rc5 -%define patchversion 2.6.39-rc5 +%define srcversion 2.6.39-rc6 +%define patchversion 2.6.39-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -57,9 +57,9 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else -Release: rc5.0 +Release: rc6.0 %endif License: GPL v2 only Group: System/Kernel @@ -193,6 +193,7 @@ Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 +Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc @@ -213,6 +214,7 @@ NoSource: 111 NoSource: 112 NoSource: 113 NoSource: 120 +NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -270,7 +272,7 @@ if test -e %_sourcedir/extra-symbols; then 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 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121 mkdir -p %kernel_build_dir @@ -526,6 +528,15 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor +sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor +for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do + if [ -f "$file" ]; then + cat "$file" + fi +done | sed '1i # Generated file - do not edit.' >$sysctl_file +if [ ! -s $sysctl_file ]; then + rm $sysctl_file +fi %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image @@ -875,6 +886,49 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/kernel-s390.changes b/kernel-s390.changes index fdd49aaf..dca10aed 100644 --- a/kernel-s390.changes +++ b/kernel-s390.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-s390.spec b/kernel-s390.spec index bbe5d505..11dea064 100644 --- a/kernel-s390.spec +++ b/kernel-s390.spec @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 2.6.39-rc5 -%define patchversion 2.6.39-rc5 +%define srcversion 2.6.39-rc6 +%define patchversion 2.6.39-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -57,9 +57,9 @@ Name: kernel-s390 Summary: The Standard Kernel Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else -Release: rc5.0 +Release: rc6.0 %endif License: GPL v2 only Group: System/Kernel @@ -196,6 +196,7 @@ Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 +Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: s390 @@ -216,6 +217,7 @@ NoSource: 111 NoSource: 112 NoSource: 113 NoSource: 120 +NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -270,7 +272,7 @@ if test -e %_sourcedir/extra-symbols; then 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 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121 mkdir -p %kernel_build_dir @@ -526,6 +528,15 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor +sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor +for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do + if [ -f "$file" ]; then + cat "$file" + fi +done | sed '1i # Generated file - do not edit.' >$sysctl_file +if [ ! -s $sysctl_file ]; then + rm $sysctl_file +fi %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image @@ -869,6 +880,49 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/kernel-source.changes b/kernel-source.changes index fdd49aaf..dca10aed 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-source.spec b/kernel-source.spec index 9d279c7a..1ad1eb2f 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -18,8 +18,8 @@ # norootforbuild # icecream 0 -%define srcversion 2.6.39-rc5 -%define patchversion 2.6.39-rc5 +%define srcversion 2.6.39-rc6 +%define patchversion 2.6.39-rc6 %define variant %{nil} %define vanilla_only 0 @@ -31,9 +31,9 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else -Release: rc5.0 +Release: rc6.0 %endif License: GPL v2 only Group: Development/Sources @@ -101,6 +101,7 @@ Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 +Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Prefix: /usr/src @@ -155,7 +156,7 @@ 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 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 +%setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121 %build mkdir -p $RPM_BUILD_ROOT/usr/src @@ -254,6 +255,49 @@ find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts" %endif %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/kernel-source.spec.in b/kernel-source.spec.in index 4573cd30..74fd359d 100644 --- a/kernel-source.spec.in +++ b/kernel-source.spec.in @@ -101,6 +101,7 @@ Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 +Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Prefix: /usr/src diff --git a/kernel-syms.changes b/kernel-syms.changes index fdd49aaf..dca10aed 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-syms.spec b/kernel-syms.spec index 16589230..df6f847c 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -25,7 +25,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) Release: %kernel_source_release @@ -81,6 +81,49 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE %_docdir/%name/README.SUSE %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/kernel-trace.changes b/kernel-trace.changes index fdd49aaf..dca10aed 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-trace.spec b/kernel-trace.spec index 1d64fa38..cafea3c6 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 2.6.39-rc5 -%define patchversion 2.6.39-rc5 +%define srcversion 2.6.39-rc6 +%define patchversion 2.6.39-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -57,9 +57,9 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else -Release: rc5.0 +Release: rc6.0 %endif License: GPL v2 only Group: System/Kernel @@ -204,6 +204,7 @@ Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 +Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc64 s390 s390x x86_64 @@ -224,6 +225,7 @@ NoSource: 111 NoSource: 112 NoSource: 113 NoSource: 120 +NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -278,7 +280,7 @@ if test -e %_sourcedir/extra-symbols; then 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 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121 mkdir -p %kernel_build_dir @@ -534,6 +536,15 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor +sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor +for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do + if [ -f "$file" ]; then + cat "$file" + fi +done | sed '1i # Generated file - do not edit.' >$sysctl_file +if [ ! -s $sysctl_file ]; then + rm $sysctl_file +fi %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image @@ -877,6 +888,49 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index fdd49aaf..dca10aed 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 8af92487..1babf9e8 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 2.6.39-rc5 -%define patchversion 2.6.39-rc5 +%define srcversion 2.6.39-rc6 +%define patchversion 2.6.39-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -57,9 +57,9 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else -Release: rc5.0 +Release: rc6.0 %endif License: GPL v2 only Group: System/Kernel @@ -200,6 +200,7 @@ Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 +Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x x86_64 @@ -220,6 +221,7 @@ NoSource: 111 NoSource: 112 NoSource: 113 NoSource: 120 +NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -274,7 +276,7 @@ if test -e %_sourcedir/extra-symbols; then 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 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121 mkdir -p %kernel_build_dir @@ -530,6 +532,15 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor +sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor +for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do + if [ -f "$file" ]; then + cat "$file" + fi +done | sed '1i # Generated file - do not edit.' >$sysctl_file +if [ ! -s $sysctl_file ]; then + rm $sysctl_file +fi %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image @@ -873,6 +884,49 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/kernel-xen.changes b/kernel-xen.changes index fdd49aaf..dca10aed 100644 --- a/kernel-xen.changes +++ b/kernel-xen.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Sat May 7 01:50:06 CEST 2011 - jeffm@suse.com + +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 + +------------------------------------------------------------------- +Fri May 6 19:36:47 CEST 2011 - jeffm@suse.com + +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f + +------------------------------------------------------------------- +Fri May 6 19:31:10 CEST 2011 - jeffm@suse.com + +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 + +------------------------------------------------------------------- +Fri May 6 18:51:20 CEST 2011 - jeffm@suse.com + +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f + +------------------------------------------------------------------- +Fri May 6 17:50:56 CEST 2011 - jeffm@suse.com + +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 + +------------------------------------------------------------------- +Fri May 6 17:25:45 CEST 2011 - jeffm@suse.com + +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed + +------------------------------------------------------------------- +Fri May 6 16:41:07 CEST 2011 - mmarek@suse.cz + +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 + +------------------------------------------------------------------- +Thu May 5 22:35:53 CEST 2011 - jeffm@suse.com + +- Update config files for -vanilla. +- commit 97ce5d8 + +------------------------------------------------------------------- +Thu May 5 22:23:21 CEST 2011 - jeffm@suse.com + +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 + ------------------------------------------------------------------- Tue May 3 03:08:18 CEST 2011 - tonyj@suse.de diff --git a/kernel-xen.spec b/kernel-xen.spec index e96459b3..9de8b390 100644 --- a/kernel-xen.spec +++ b/kernel-xen.spec @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 2.6.39-rc5 -%define patchversion 2.6.39-rc5 +%define srcversion 2.6.39-rc6 +%define patchversion 2.6.39-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -57,9 +57,9 @@ Name: kernel-xen Summary: The Xen Kernel Version: 2.6.39 %if %using_buildservice -Release: rc5. +Release: rc6. %else -Release: rc5.0 +Release: rc6.0 %endif License: GPL v2 only Group: System/Kernel @@ -193,6 +193,7 @@ Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 +Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 @@ -213,6 +214,7 @@ NoSource: 111 NoSource: 112 NoSource: 113 NoSource: 120 +NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -270,7 +272,7 @@ if test -e %_sourcedir/extra-symbols; then 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 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121 mkdir -p %kernel_build_dir @@ -526,6 +528,15 @@ ln -s $image$suffix %buildroot/boot/$image$suffix ln -s initrd$suffix %buildroot/boot/initrd$suffix cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor +sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor +for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do + if [ -f "$file" ]; then + cat "$file" + fi +done | sed '1i # Generated file - do not edit.' >$sysctl_file +if [ ! -s $sysctl_file ]; then + rm $sysctl_file +fi %if %install_vdso # Install the unstripped vdso's that are linked in the kernel image @@ -875,6 +886,49 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Sat May 07 2011 jeffm@suse.com +- Removed network driver entropy patches. haveged is installed by default + and should be enabled to generate entropy from non-predictable sources. + - Delete patches.drivers/bnx2-entropy-source.patch. + - Delete patches.drivers/e1000-entropy-source.patch. + - Delete patches.drivers/e1000e-entropy-source.patch. + - Delete patches.drivers/igb-entropy-source.patch. + - Delete patches.drivers/ixgbe-entropy-source.patch. + - Delete patches.drivers/tg3-entropy-source.patch. +- commit c88b893 +* Fri May 06 2011 jeffm@suse.com +- Update + patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack + (bnc#466279 bnc#681639). +- commit 72e779f +* Fri May 06 2011 jeffm@suse.com +- Disabled patches.drivers/libata-unlock-hpa-by-default; It may have + been obsoleted by upstream commit d8d9129e. +- commit 1a21ab3 +* Fri May 06 2011 jeffm@suse.com +- sysctl: Increase IPC defaults (bnc#146656) + - Delete patches.suse/shmall-bigger. +- commit a70e34f +* Fri May 06 2011 jeffm@suse.com +- sysctl/i386/desktop, sysctl/x86_64/desktop: Add vm.dirty_ratio = 20 + for desktop flavors (bnc#552883) + - Delete patches.suse/mm-tune-dirty-limits.patch. +- commit dbe73e2 +* Fri May 06 2011 jeffm@suse.com +- sysctl/defaults: Added kernel.hung_task_timeout=0 + - Delete patches.suse/hung_task_timeout-configurable-default. +- commit 78f9eed +* Fri May 06 2011 mmarek@suse.cz +- rpm/kernel-{binary,source}.spec.in: Install per-kernel /boot/sysctl-* + files (patch from Jeff Mahoney). +- commit 473f2d1 +* Thu May 05 2011 jeffm@suse.com +- Update config files for -vanilla. +- commit 97ce5d8 +* Thu May 05 2011 jeffm@suse.com +- Updated to 2.6.39-rc6. + - 2 patches eliminated. +- commit 2643e59 * Tue May 03 2011 tonyj@suse.de - Delete patches.fixes/oprofile_bios_ctr.patch. - Delete patches.suse/kdump-dump_after_notifier.patch. diff --git a/linux-2.6.39-rc6.tar.bz2 b/linux-2.6.39-rc6.tar.bz2 new file mode 100644 index 00000000..94efb935 --- /dev/null +++ b/linux-2.6.39-rc6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46ddae67715c0e25bee14608e994788aefae5bdda6c2d26a9b8da8820671a6ca +size 76087903 diff --git a/patches.drivers.tar.bz2 b/patches.drivers.tar.bz2 index 3111e618..fbd9a954 100644 --- a/patches.drivers.tar.bz2 +++ b/patches.drivers.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3749c6c430d37af9d26f7fbabebc251555e560651eb1b75eeb2713c8a288ea5f -size 11202 +oid sha256:628bd72eeff3129b98013526c4978bda67d956a21e6dabafe10324fc4be7f931 +size 8284 diff --git a/patches.fixes.tar.bz2 b/patches.fixes.tar.bz2 index 14f2014c..c3962abc 100644 --- a/patches.fixes.tar.bz2 +++ b/patches.fixes.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:166a0faa4fbf2b35aada4516bc7a2b8947b41874f1ed77d7138972cbb0123b60 -size 27584 +oid sha256:e6d4855ba196d8d3063f6b118481903e557c65bf149fe743b2e8577cf98ae8ce +size 27198 diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index 20debea7..5cd72dfd 100644 --- a/patches.suse.tar.bz2 +++ b/patches.suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:304c6df711bb7ba1b3b712c9cd6ad781f60a32ad172dc05125f0283bf3e4752d -size 200890 +oid sha256:70ae57f3e12c03fd0f8ac6217b33ed6253b98364aea602c21aab7ef6168d079e +size 198704 diff --git a/series.conf b/series.conf index 63aae577..4a888959 100644 --- a/series.conf +++ b/series.conf @@ -81,7 +81,6 @@ # Scheduler / Core ######################################################## patches.suse/setuid-dumpable-wrongdir - patches.suse/hung_task_timeout-configurable-default ######################################################## # Architecture-specific patches. These used to be all @@ -168,14 +167,12 @@ # VM/FS patches ######################################################## patches.fixes/oom-warning - patches.suse/shmall-bigger patches.fixes/grab-swap-token-oops patches.fixes/remount-no-shrink-dcache patches.suse/file-capabilities-disable-by-default.diff +npiggin patches.suse/files-slab-rcu.patch - patches.suse/mm-tune-dirty-limits.patch patches.suse/mm-devzero-optimisation.patch @@ -354,8 +351,9 @@ # Storage ######################################################## - # libata - patches.drivers/libata-unlock-hpa-by-default + # I believe this has been obsoleted upstream by + # commit d8d9129e ++disabled patches.drivers/libata-unlock-hpa-by-default # Block layer fixes patches.fixes/scsi-inquiry-too-short-ratelimit @@ -390,23 +388,13 @@ ######################################################## # video4linux ######################################################## - patches.fixes/flexcop-fix-registering-braindead-stupid-names ######################################################## # Network ######################################################## patches.fixes/tulip-quad-NIC-ifdown - patches.fixes/tg3-fix-default-wol.patch patches.drivers/ehea-modinfo.patch - # entropy FATE##307517 - patches.drivers/bnx2-entropy-source.patch - patches.drivers/e1000-entropy-source.patch - patches.drivers/e1000e-entropy-source.patch - patches.drivers/igb-entropy-source.patch - patches.drivers/ixgbe-entropy-source.patch - patches.drivers/tg3-entropy-source.patch - ######################################################## # Wireless Networking ######################################################## diff --git a/source-timestamp b/source-timestamp index 941d87ff..29463d0e 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2011-05-03 03:08:18 +0200 -GIT Revision: 012455a94ebbbdd1b5a79652b555582c314d191a +2011-05-07 01:50:06 +0200 +GIT Revision: c88b893e5f89650ae57658168df6e563fecccd0c GIT Branch: master diff --git a/sysctl.tar.bz2 b/sysctl.tar.bz2 new file mode 100644 index 00000000..eb3efe7c --- /dev/null +++ b/sysctl.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c486da73fb5a20a18ab975da3ff78a6c6c06165e0e16634606807364b170993b +size 775