diff --git a/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS b/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS new file mode 100644 index 00000000..4c0d52d1 --- /dev/null +++ b/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS @@ -0,0 +1 @@ + diff --git a/config.sh b/config.sh index 432376b0..ab317391 100644 --- a/config.sh +++ b/config.sh @@ -1,4 +1,4 @@ # The version of the main tarball to use -SRCVERSION=2.6.29 +SRCVERSION=2.6.30 # variant of the kernel-source package, either empty or "-rt" VARIANT= diff --git a/config.tar.bz2 b/config.tar.bz2 index 169d98fc..2dab3db1 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6d47f0c01fd211bbea94d2bd99b71f9dd02a671b29efc0df46d31013db71676 -size 146650 +oid sha256:1d2f22334e790cafbc553869c6607f0c3b155508f62f5b751633835a0b4d0a19 +size 146862 diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index 7583f093..39e838e5 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -1,10 +1,17 @@ # # spec file for package kernel-@FLAVOR@ (Version @RPMVERSION@) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -69,7 +76,7 @@ Release: @RELEASE_PREFIX@ %else Release: @RELEASE_PREFIX@0 %endif -License: GPL +License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ AutoReqProv: on @@ -107,17 +114,17 @@ Obsoletes: kernel-xenpae <= %version #!BuildIgnore: xen %endif -Provides: %name-nongpl -Obsoletes: %name-nongpl +Provides: %name-nongpl +Obsoletes: %name-nongpl %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio %endif # dead network if installed on SLES10, otherwise it will work (mostly) -Conflicts: sysfsutils < 2.0 +Conflicts: sysfsutils < 2.0 %if ! %build_vanilla -Conflicts: apparmor-profiles <= 2.1 -Conflicts: apparmor-parser < 2.3 +Conflicts: apparmor-profiles <= 2.1 +Conflicts: apparmor-parser < 2.3 # root-lvm only works with newer udevs Conflicts: udev < 118 Conflicts: lvm2 < 2.02.33 @@ -125,76 +132,76 @@ Conflicts: lvm2 < 2.02.33 %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif -Provides: kernel = %version-%source_rel +Provides: kernel = %version-%source_rel @PROVIDES_OBSOLETES@ -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 -Source10: preun.sh -Source11: postun.sh -Source12: pre.sh -Source13: post.sh -Source20: series.conf -Source21: config.conf -Source22: supported.conf -Source30: arch-symbols -Source31: guards -Source32: config-subst -Source33: check-for-config-changes -Source34: check-supported-list -Source40: source-timestamp -Source41: built-in-where -Source44: find-provides -Source45: module-renames -Source46: modversions -Source47: symsets.pl -Source100: config.tar.bz2 -Source101: patches.arch.tar.bz2 -Source102: patches.drivers.tar.bz2 -Source103: patches.fixes.tar.bz2 -Source104: patches.rpmify.tar.bz2 -Source105: patches.suse.tar.bz2 -Source107: patches.xen.tar.bz2 -Source108: patches.addon.tar.bz2 -Source109: patches.kernel.org.tar.bz2 -Source110: patches.apparmor.tar.bz2 -Source111: patches.rt.tar.bz2 -Source112: patches.trace.tar.bz2 -Source113: patches.kabi.tar.bz2 -Source120: kabi.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 +Source10: preun.sh +Source11: postun.sh +Source12: pre.sh +Source13: post.sh +Source20: series.conf +Source21: config.conf +Source22: supported.conf +Source30: arch-symbols +Source31: guards +Source32: config-subst +Source33: check-for-config-changes +Source34: check-supported-list +Source40: source-timestamp +Source41: built-in-where +Source44: find-provides +Source45: module-renames +Source46: modversions +Source47: symsets.pl +Source100: config.tar.bz2 +Source101: patches.arch.tar.bz2 +Source102: patches.drivers.tar.bz2 +Source103: patches.fixes.tar.bz2 +Source104: patches.rpmify.tar.bz2 +Source105: patches.suse.tar.bz2 +Source107: patches.xen.tar.bz2 +Source108: patches.addon.tar.bz2 +Source109: patches.kernel.org.tar.bz2 +Source110: patches.apparmor.tar.bz2 +Source111: patches.rt.tar.bz2 +Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 +Source120: kabi.tar.bz2 %define my_builddir %_builddir/%{name}-%{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: @ARCHS@ +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: @ARCHS@ # These files are found in the kernel-source package: -NoSource: 0 -NoSource: 100 -NoSource: 101 -NoSource: 102 -NoSource: 103 -NoSource: 104 -NoSource: 105 -NoSource: 107 -NoSource: 108 -NoSource: 109 -NoSource: 110 -NoSource: 111 -NoSource: 120 +NoSource: 0 +NoSource: 100 +NoSource: 101 +NoSource: 102 +NoSource: 103 +NoSource: 104 +NoSource: 105 +NoSource: 107 +NoSource: 108 +NoSource: 109 +NoSource: 110 +NoSource: 111 +NoSource: 120 # The following KMPs have been integrated into the kernel package. -Obsoletes: iwlwifi-kmp -Obsoletes: ipw3945-kmp -Obsoletes: adm8211-kmp -Obsoletes: rt2x00-kmp -Obsoletes: rfswitch-kmp -Obsoletes: uvcvideo-kmp -Obsoletes: atl2-kmp -Obsoletes: wlan-ng-kmp -Obsoletes: et131x-kmp -Obsoletes: ivtv-kmp -Obsoletes: at76_usb-kmp -Obsoletes: pcc-acpi-kmp -Obsoletes: uvcvideo-kmp -Obsoletes: ralink-rt2860-kmp +Obsoletes: iwlwifi-kmp +Obsoletes: ipw3945-kmp +Obsoletes: adm8211-kmp +Obsoletes: rt2x00-kmp +Obsoletes: rfswitch-kmp +Obsoletes: uvcvideo-kmp +Obsoletes: atl2-kmp +Obsoletes: wlan-ng-kmp +Obsoletes: et131x-kmp +Obsoletes: ivtv-kmp +Obsoletes: at76_usb-kmp +Obsoletes: pcc-acpi-kmp +Obsoletes: uvcvideo-kmp +Obsoletes: ralink-rt2860-kmp # Build with bash instead of sh as the shell: this turns on bash # extensions like <(...). @@ -745,7 +752,7 @@ done %package base Summary: @SUMMARY@ - base modules -License: GPL +License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ AutoReqProv: on @@ -777,7 +784,7 @@ This package contains only the base modules, required in all installs. %package extra Summary: @SUMMARY@ - Unsupported kernel modules -License: GPL +License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ AutoReqProv: on @@ -812,8 +819,9 @@ This package contains additional modules not supported by Novell. %if %CONFIG_KMSG_IDS == "y" %package man -Summary: The collection of man pages generated by the kmsg script. -Group: System Environment/Kernel +Summary: The collection of man pages generated by the kmsg script. +License: GPL v2 only +Group: System/Kernel %description man This package includes the man pages that have been generated from the @@ -827,10 +835,11 @@ kmsg message documentation comments. %endif %package devel -Summary: The development environment needed to build KMPs -Group: Development/Kernel +Summary: Development files necessary for building kernel modules +License: GPL v2 only +Group: Development/Sources Provides: %name-devel = %version-%source_rel -Requires: kernel-source%variant = %version-%source_rel +Requires: kernel-source%variant = %version-%source_rel AutoReqProv: on %description devel diff --git a/kernel-debug.changes b/kernel-debug.changes index 9fdec3d6..2f8c8a87 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Jun 12 05:14:11 CEST 2009 - greg@suse.de + +- scripts/sequence-patch.sh: fix bug in ketchup usage + +------------------------------------------------------------------- +Wed Jun 10 16:12:01 CEST 2009 - jeffm@suse.com + +- Update to 2.6.30-final. + +------------------------------------------------------------------- +Wed Jun 10 10:31:34 CEST 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. + +------------------------------------------------------------------- +Tue Jun 9 17:14:45 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. + +------------------------------------------------------------------- +Tue Jun 9 17:06:06 CEST 2009 - jbeulich@novell.com + +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. + ------------------------------------------------------------------- Mon Jun 8 09:01:23 CEST 2009 - jeffm@suse.com diff --git a/kernel-debug.spec b/kernel-debug.spec index d7af52fd..7443ec72 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -33,8 +33,8 @@ %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.29 -%define patchversion 2.6.30-rc8 +%define srcversion 2.6.30 +%define patchversion 2.6.30 %define variant %{nil} %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") %define kernelrelease %patchversion-%release_major @@ -62,7 +62,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.30 -Release: 7 +Release: 8 %if %using_buildservice %else %endif @@ -746,8 +746,8 @@ This package contains additional modules not supported by Novell. %if %CONFIG_KMSG_IDS == "y" %package man -License: GPL v2 only Summary: The collection of man pages generated by the kmsg script. +License: GPL v2 only Group: System/Kernel %description man @@ -763,8 +763,8 @@ kmsg message documentation comments. %endif %package devel -License: GPL v2 only Summary: Development files necessary for building kernel modules +License: GPL v2 only Group: Development/Sources Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel @@ -798,6 +798,24 @@ kernel module packages) against the -debug flavor of the kernel. %endif %changelog +* Fri Jun 12 2009 greg@suse.de +- scripts/sequence-patch.sh: fix bug in ketchup usage +* Wed Jun 10 2009 jeffm@suse.com +- Update to 2.6.30-final. +* Wed Jun 10 2009 jbeulich@novell.com +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. +* Tue Jun 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. +* Tue Jun 09 2009 jbeulich@novell.com +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. * Mon Jun 08 2009 jeffm@suse.com - patches.suse/reiser4-set_page_dirty_notag: mm: Add set_page_dirty_notag() helper for reiser4. diff --git a/kernel-default.changes b/kernel-default.changes index 9fdec3d6..2f8c8a87 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Jun 12 05:14:11 CEST 2009 - greg@suse.de + +- scripts/sequence-patch.sh: fix bug in ketchup usage + +------------------------------------------------------------------- +Wed Jun 10 16:12:01 CEST 2009 - jeffm@suse.com + +- Update to 2.6.30-final. + +------------------------------------------------------------------- +Wed Jun 10 10:31:34 CEST 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. + +------------------------------------------------------------------- +Tue Jun 9 17:14:45 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. + +------------------------------------------------------------------- +Tue Jun 9 17:06:06 CEST 2009 - jbeulich@novell.com + +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. + ------------------------------------------------------------------- Mon Jun 8 09:01:23 CEST 2009 - jeffm@suse.com diff --git a/kernel-default.spec b/kernel-default.spec index ef02fa54..f73431cc 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -33,8 +33,8 @@ %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.29 -%define patchversion 2.6.30-rc8 +%define srcversion 2.6.30 +%define patchversion 2.6.30 %define variant %{nil} %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") %define kernelrelease %patchversion-%release_major @@ -62,7 +62,7 @@ Name: kernel-default Summary: The Standard Kernel Version: 2.6.30 -Release: 7 +Release: 8 %if %using_buildservice %else %endif @@ -759,8 +759,8 @@ This package contains additional modules not supported by Novell. %if %CONFIG_KMSG_IDS == "y" %package man -License: GPL v2 only Summary: The collection of man pages generated by the kmsg script. +License: GPL v2 only Group: System/Kernel %description man @@ -776,8 +776,8 @@ kmsg message documentation comments. %endif %package devel -License: GPL v2 only Summary: Development files necessary for building kernel modules +License: GPL v2 only Group: Development/Sources Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel @@ -811,6 +811,24 @@ kernel module packages) against the -default flavor of the kernel. %endif %changelog +* Fri Jun 12 2009 greg@suse.de +- scripts/sequence-patch.sh: fix bug in ketchup usage +* Wed Jun 10 2009 jeffm@suse.com +- Update to 2.6.30-final. +* Wed Jun 10 2009 jbeulich@novell.com +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. +* Tue Jun 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. +* Tue Jun 09 2009 jbeulich@novell.com +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. * Mon Jun 08 2009 jeffm@suse.com - patches.suse/reiser4-set_page_dirty_notag: mm: Add set_page_dirty_notag() helper for reiser4. diff --git a/kernel-kdump.changes b/kernel-kdump.changes index 9fdec3d6..2f8c8a87 100644 --- a/kernel-kdump.changes +++ b/kernel-kdump.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Jun 12 05:14:11 CEST 2009 - greg@suse.de + +- scripts/sequence-patch.sh: fix bug in ketchup usage + +------------------------------------------------------------------- +Wed Jun 10 16:12:01 CEST 2009 - jeffm@suse.com + +- Update to 2.6.30-final. + +------------------------------------------------------------------- +Wed Jun 10 10:31:34 CEST 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. + +------------------------------------------------------------------- +Tue Jun 9 17:14:45 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. + +------------------------------------------------------------------- +Tue Jun 9 17:06:06 CEST 2009 - jbeulich@novell.com + +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. + ------------------------------------------------------------------- Mon Jun 8 09:01:23 CEST 2009 - jeffm@suse.com diff --git a/kernel-kdump.spec b/kernel-kdump.spec index 8762dd4b..224d85a2 100644 --- a/kernel-kdump.spec +++ b/kernel-kdump.spec @@ -33,8 +33,8 @@ %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.29 -%define patchversion 2.6.30-rc8 +%define srcversion 2.6.30 +%define patchversion 2.6.30 %define variant %{nil} %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") %define kernelrelease %patchversion-%release_major @@ -62,7 +62,7 @@ Name: kernel-kdump Summary: kernel for kdump Version: 2.6.30 -Release: 7 +Release: 8 %if %using_buildservice %else %endif @@ -752,8 +752,8 @@ This package contains additional modules not supported by Novell. %if %CONFIG_KMSG_IDS == "y" %package man -License: GPL v2 only Summary: The collection of man pages generated by the kmsg script. +License: GPL v2 only Group: System/Kernel %description man @@ -769,8 +769,8 @@ kmsg message documentation comments. %endif %package devel -License: GPL v2 only Summary: Development files necessary for building kernel modules +License: GPL v2 only Group: Development/Sources Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel @@ -804,6 +804,24 @@ kernel module packages) against the -kdump flavor of the kernel. %endif %changelog +* Fri Jun 12 2009 greg@suse.de +- scripts/sequence-patch.sh: fix bug in ketchup usage +* Wed Jun 10 2009 jeffm@suse.com +- Update to 2.6.30-final. +* Wed Jun 10 2009 jbeulich@novell.com +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. +* Tue Jun 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. +* Tue Jun 09 2009 jbeulich@novell.com +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. * Mon Jun 08 2009 jeffm@suse.com - patches.suse/reiser4-set_page_dirty_notag: mm: Add set_page_dirty_notag() helper for reiser4. diff --git a/kernel-pae.changes b/kernel-pae.changes index 9fdec3d6..2f8c8a87 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Jun 12 05:14:11 CEST 2009 - greg@suse.de + +- scripts/sequence-patch.sh: fix bug in ketchup usage + +------------------------------------------------------------------- +Wed Jun 10 16:12:01 CEST 2009 - jeffm@suse.com + +- Update to 2.6.30-final. + +------------------------------------------------------------------- +Wed Jun 10 10:31:34 CEST 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. + +------------------------------------------------------------------- +Tue Jun 9 17:14:45 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. + +------------------------------------------------------------------- +Tue Jun 9 17:06:06 CEST 2009 - jbeulich@novell.com + +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. + ------------------------------------------------------------------- Mon Jun 8 09:01:23 CEST 2009 - jeffm@suse.com diff --git a/kernel-pae.spec b/kernel-pae.spec index d4095958..f696aa57 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -33,8 +33,8 @@ %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.29 -%define patchversion 2.6.30-rc8 +%define srcversion 2.6.30 +%define patchversion 2.6.30 %define variant %{nil} %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") %define kernelrelease %patchversion-%release_major @@ -62,7 +62,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 2.6.30 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -768,8 +768,8 @@ This package contains additional modules not supported by Novell. %if %CONFIG_KMSG_IDS == "y" %package man -License: GPL v2 only Summary: The collection of man pages generated by the kmsg script. +License: GPL v2 only Group: System/Kernel %description man @@ -785,8 +785,8 @@ kmsg message documentation comments. %endif %package devel -License: GPL v2 only Summary: Development files necessary for building kernel modules +License: GPL v2 only Group: Development/Sources Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel @@ -820,6 +820,24 @@ kernel module packages) against the -pae flavor of the kernel. %endif %changelog +* Fri Jun 12 2009 greg@suse.de +- scripts/sequence-patch.sh: fix bug in ketchup usage +* Wed Jun 10 2009 jeffm@suse.com +- Update to 2.6.30-final. +* Wed Jun 10 2009 jbeulich@novell.com +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. +* Tue Jun 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. +* Tue Jun 09 2009 jbeulich@novell.com +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. * Mon Jun 08 2009 jeffm@suse.com - patches.suse/reiser4-set_page_dirty_notag: mm: Add set_page_dirty_notag() helper for reiser4. diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes index 9fdec3d6..2f8c8a87 100644 --- a/kernel-ppc64.changes +++ b/kernel-ppc64.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Jun 12 05:14:11 CEST 2009 - greg@suse.de + +- scripts/sequence-patch.sh: fix bug in ketchup usage + +------------------------------------------------------------------- +Wed Jun 10 16:12:01 CEST 2009 - jeffm@suse.com + +- Update to 2.6.30-final. + +------------------------------------------------------------------- +Wed Jun 10 10:31:34 CEST 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. + +------------------------------------------------------------------- +Tue Jun 9 17:14:45 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. + +------------------------------------------------------------------- +Tue Jun 9 17:06:06 CEST 2009 - jbeulich@novell.com + +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. + ------------------------------------------------------------------- Mon Jun 8 09:01:23 CEST 2009 - jeffm@suse.com diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec index 0f9cd7d9..82bd4a13 100644 --- a/kernel-ppc64.spec +++ b/kernel-ppc64.spec @@ -33,8 +33,8 @@ %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.29 -%define patchversion 2.6.30-rc8 +%define srcversion 2.6.30 +%define patchversion 2.6.30 %define variant %{nil} %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") %define kernelrelease %patchversion-%release_major @@ -62,7 +62,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems Version: 2.6.30 -Release: 7 +Release: 8 %if %using_buildservice %else %endif @@ -789,8 +789,8 @@ Authors: %if %CONFIG_KMSG_IDS == "y" %package man -License: GPL v2 only Summary: The collection of man pages generated by the kmsg script. +License: GPL v2 only Group: System/Kernel %description man @@ -813,8 +813,8 @@ Authors: %endif %package devel -License: GPL v2 only Summary: Development files necessary for building kernel modules +License: GPL v2 only Group: Development/Sources Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel @@ -855,6 +855,24 @@ Authors: %endif %changelog +* Fri Jun 12 2009 greg@suse.de +- scripts/sequence-patch.sh: fix bug in ketchup usage +* Wed Jun 10 2009 jeffm@suse.com +- Update to 2.6.30-final. +* Wed Jun 10 2009 jbeulich@novell.com +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. +* Tue Jun 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. +* Tue Jun 09 2009 jbeulich@novell.com +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. * Mon Jun 08 2009 jeffm@suse.com - patches.suse/reiser4-set_page_dirty_notag: mm: Add set_page_dirty_notag() helper for reiser4. diff --git a/kernel-ps3.changes b/kernel-ps3.changes index 9fdec3d6..2f8c8a87 100644 --- a/kernel-ps3.changes +++ b/kernel-ps3.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Jun 12 05:14:11 CEST 2009 - greg@suse.de + +- scripts/sequence-patch.sh: fix bug in ketchup usage + +------------------------------------------------------------------- +Wed Jun 10 16:12:01 CEST 2009 - jeffm@suse.com + +- Update to 2.6.30-final. + +------------------------------------------------------------------- +Wed Jun 10 10:31:34 CEST 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. + +------------------------------------------------------------------- +Tue Jun 9 17:14:45 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. + +------------------------------------------------------------------- +Tue Jun 9 17:06:06 CEST 2009 - jbeulich@novell.com + +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. + ------------------------------------------------------------------- Mon Jun 8 09:01:23 CEST 2009 - jeffm@suse.com diff --git a/kernel-ps3.spec b/kernel-ps3.spec index c188d8e9..0714e60d 100644 --- a/kernel-ps3.spec +++ b/kernel-ps3.spec @@ -33,8 +33,8 @@ %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.29 -%define patchversion 2.6.30-rc8 +%define srcversion 2.6.30 +%define patchversion 2.6.30 %define variant %{nil} %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") %define kernelrelease %patchversion-%release_major @@ -62,7 +62,7 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader Version: 2.6.30 -Release: 7 +Release: 8 %if %using_buildservice %else %endif @@ -746,8 +746,8 @@ needs to be as small as possible. %if %CONFIG_KMSG_IDS == "y" %package man -License: GPL v2 only Summary: The collection of man pages generated by the kmsg script. +License: GPL v2 only Group: System/Kernel %description man @@ -763,8 +763,8 @@ kmsg message documentation comments. %endif %package devel -License: GPL v2 only Summary: Development files necessary for building kernel modules +License: GPL v2 only Group: Development/Sources Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel @@ -798,6 +798,24 @@ kernel module packages) against the -default flavor of the kernel. %endif %changelog +* Fri Jun 12 2009 greg@suse.de +- scripts/sequence-patch.sh: fix bug in ketchup usage +* Wed Jun 10 2009 jeffm@suse.com +- Update to 2.6.30-final. +* Wed Jun 10 2009 jbeulich@novell.com +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. +* Tue Jun 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. +* Tue Jun 09 2009 jbeulich@novell.com +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. * Mon Jun 08 2009 jeffm@suse.com - patches.suse/reiser4-set_page_dirty_notag: mm: Add set_page_dirty_notag() helper for reiser4. diff --git a/kernel-s390.changes b/kernel-s390.changes index 9fdec3d6..2f8c8a87 100644 --- a/kernel-s390.changes +++ b/kernel-s390.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Jun 12 05:14:11 CEST 2009 - greg@suse.de + +- scripts/sequence-patch.sh: fix bug in ketchup usage + +------------------------------------------------------------------- +Wed Jun 10 16:12:01 CEST 2009 - jeffm@suse.com + +- Update to 2.6.30-final. + +------------------------------------------------------------------- +Wed Jun 10 10:31:34 CEST 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. + +------------------------------------------------------------------- +Tue Jun 9 17:14:45 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. + +------------------------------------------------------------------- +Tue Jun 9 17:06:06 CEST 2009 - jbeulich@novell.com + +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. + ------------------------------------------------------------------- Mon Jun 8 09:01:23 CEST 2009 - jeffm@suse.com diff --git a/kernel-s390.spec b/kernel-s390.spec index e689590a..8a8cade6 100644 --- a/kernel-s390.spec +++ b/kernel-s390.spec @@ -33,8 +33,8 @@ %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.29 -%define patchversion 2.6.30-rc8 +%define srcversion 2.6.30 +%define patchversion 2.6.30 %define variant %{nil} %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") %define kernelrelease %patchversion-%release_major @@ -62,7 +62,7 @@ Name: kernel-s390 Summary: The Standard Kernel Version: 2.6.30 -Release: 7 +Release: 8 %if %using_buildservice %else %endif @@ -747,8 +747,8 @@ This package contains additional modules not supported by Novell. %if %CONFIG_KMSG_IDS == "y" %package man -License: GPL v2 only Summary: The collection of man pages generated by the kmsg script. +License: GPL v2 only Group: System/Kernel %description man @@ -764,8 +764,8 @@ kmsg message documentation comments. %endif %package devel -License: GPL v2 only Summary: Development files necessary for building kernel modules +License: GPL v2 only Group: Development/Sources Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel @@ -799,6 +799,24 @@ kernel module packages) against the -s390 flavor of the kernel. %endif %changelog +* Fri Jun 12 2009 greg@suse.de +- scripts/sequence-patch.sh: fix bug in ketchup usage +* Wed Jun 10 2009 jeffm@suse.com +- Update to 2.6.30-final. +* Wed Jun 10 2009 jbeulich@novell.com +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. +* Tue Jun 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. +* Tue Jun 09 2009 jbeulich@novell.com +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. * Mon Jun 08 2009 jeffm@suse.com - patches.suse/reiser4-set_page_dirty_notag: mm: Add set_page_dirty_notag() helper for reiser4. diff --git a/kernel-source.changes b/kernel-source.changes index 9fdec3d6..2f8c8a87 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Jun 12 05:14:11 CEST 2009 - greg@suse.de + +- scripts/sequence-patch.sh: fix bug in ketchup usage + +------------------------------------------------------------------- +Wed Jun 10 16:12:01 CEST 2009 - jeffm@suse.com + +- Update to 2.6.30-final. + +------------------------------------------------------------------- +Wed Jun 10 10:31:34 CEST 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. + +------------------------------------------------------------------- +Tue Jun 9 17:14:45 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. + +------------------------------------------------------------------- +Tue Jun 9 17:06:06 CEST 2009 - jbeulich@novell.com + +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. + ------------------------------------------------------------------- Mon Jun 8 09:01:23 CEST 2009 - jeffm@suse.com diff --git a/kernel-source.spec b/kernel-source.spec index cf08f4a0..bd011c7a 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -18,7 +18,6 @@ # norootforbuild # icecream 0 -Url: http://www.kernel.org/ %define using_buildservice 0%{?opensuse_bs} %if %using_buildservice # Strip off the build number ("y") from the "x.y" release number @@ -29,8 +28,8 @@ Url: http://www.kernel.org/ %endif # macro to add the source timestamp to package descriptions %define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) -%define srcversion 2.6.29 -%define patchversion 2.6.30-rc8 +%define srcversion 2.6.30 +%define patchversion 2.6.30 %define variant %{nil} %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") %define kernelrelease %patchversion-%release_major @@ -42,12 +41,13 @@ Url: http://www.kernel.org/ Name: kernel-source Summary: The Linux Kernel Sources Version: 2.6.30 -Release: 7 +Release: 8 %if %using_buildservice %else %endif License: GPL v2 only Group: Development/Sources +Url: http://www.kernel.org/ AutoReqProv: off BuildRequires: coreutils sed BuildRequires: fdupes @@ -130,8 +130,8 @@ Authors: %source_timestamp %package vanilla -License: GPL v2 only Summary: Vanilla Linux kernel sources with minor build fixes +License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -235,6 +235,24 @@ done %endif %changelog +* Fri Jun 12 2009 greg@suse.de +- scripts/sequence-patch.sh: fix bug in ketchup usage +* Wed Jun 10 2009 jeffm@suse.com +- Update to 2.6.30-final. +* Wed Jun 10 2009 jbeulich@novell.com +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. +* Tue Jun 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. +* Tue Jun 09 2009 jbeulich@novell.com +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. * Mon Jun 08 2009 jeffm@suse.com - patches.suse/reiser4-set_page_dirty_notag: mm: Add set_page_dirty_notag() helper for reiser4. diff --git a/kernel-source.spec.in b/kernel-source.spec.in index a59a1c1b..9cd6e610 100644 --- a/kernel-source.spec.in +++ b/kernel-source.spec.in @@ -1,17 +1,23 @@ # # spec file for package kernel-source@VARIANT@ (Version @RPMVERSION@) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild # icecream 0 -# FIXME: this check will go before the next release ... %define using_buildservice 0%{?opensuse_bs} @@ -38,76 +44,77 @@ %define tolerate_unknown_new_config_options @TOLERATE_UNKNOWN_NEW_CONFIG_OPTIONS@ -Name: kernel-source@VARIANT@ -Summary: The Linux Kernel Sources -Version: @RPMVERSION@ +Name: kernel-source@VARIANT@ +Summary: The Linux Kernel Sources +Version: @RPMVERSION@ %if %using_buildservice Release: @RELEASE_PREFIX@ %else Release: @RELEASE_PREFIX@0 %endif -License: GPL -Group: Development/Sources -AutoReqProv: off +License: GPL v2 only +Group: Development/Sources +Url: http://www.kernel.org/ +AutoReqProv: off BuildRequires: coreutils sed BuildRequires: fdupes Requires(post): coreutils sed Provides: linux Provides: %name = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 -Source2: source-post.sh -Source3: %name.rpmlintrc -Source8: devel-pre.sh -Source9: devel-post.sh -Source10: preun.sh -Source11: postun.sh -Source12: pre.sh -Source13: post.sh -Source14: series.conf -Source16: guards -Source21: config.conf -Source23: supported.conf -Source30: config-subst -Source33: check-for-config-changes -Source34: check-supported-list -Source37: README.SUSE -Source38: README.KSYMS -Source40: source-timestamp -Source41: built-in-where -Source44: find-provides -Source45: module-renames -Source46: modversions -Source47: extract-modaliases -Source48: macros.kernel-source -Source49: kernel-module-subpackage -Source50: symsets.pl -Source51: mkspec -Source52: kernel-source%variant.changes -Source53: kernel-source.spec.in -Source54: kernel-binary.spec.in -Source55: kernel-syms.spec.in -Source56: config.sh -Source57: compute-PATCHVERSION.sh -Source58: old-packages.conf -Source59: arch-symbols -Source60: package-descriptions -Source100: config.tar.bz2 -Source101: patches.arch.tar.bz2 -Source102: patches.drivers.tar.bz2 -Source103: patches.fixes.tar.bz2 -Source104: patches.rpmify.tar.bz2 -Source105: patches.suse.tar.bz2 -Source107: patches.xen.tar.bz2 -Source108: patches.addon.tar.bz2 -Source109: patches.kernel.org.tar.bz2 -Source110: patches.apparmor.tar.bz2 -Source111: patches.rt.tar.bz2 -Source112: patches.trace.tar.bz2 -Source113: patches.kabi.tar.bz2 -Source120: kabi.tar.bz2 -BuildRoot: %_tmppath/%name-%version-build -BuildArchitectures: noarch -Prefix: /usr/src +Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 +Source2: source-post.sh +Source3: %name.rpmlintrc +Source8: devel-pre.sh +Source9: devel-post.sh +Source10: preun.sh +Source11: postun.sh +Source12: pre.sh +Source13: post.sh +Source14: series.conf +Source16: guards +Source21: config.conf +Source23: supported.conf +Source30: config-subst +Source33: check-for-config-changes +Source34: check-supported-list +Source37: README.SUSE +Source38: README.KSYMS +Source40: source-timestamp +Source41: built-in-where +Source44: find-provides +Source45: module-renames +Source46: modversions +Source47: extract-modaliases +Source48: macros.kernel-source +Source49: kernel-module-subpackage +Source50: symsets.pl +Source51: mkspec +Source52: kernel-source%variant.changes +Source53: kernel-source.spec.in +Source54: kernel-binary.spec.in +Source55: kernel-syms.spec.in +Source56: config.sh +Source57: compute-PATCHVERSION.sh +Source58: old-packages.conf +Source59: arch-symbols +Source60: package-descriptions +Source100: config.tar.bz2 +Source101: patches.arch.tar.bz2 +Source102: patches.drivers.tar.bz2 +Source103: patches.fixes.tar.bz2 +Source104: patches.rpmify.tar.bz2 +Source105: patches.suse.tar.bz2 +Source107: patches.xen.tar.bz2 +Source108: patches.addon.tar.bz2 +Source109: patches.kernel.org.tar.bz2 +Source110: patches.apparmor.tar.bz2 +Source111: patches.rt.tar.bz2 +Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 +Source120: kabi.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +Prefix: /usr/src # Build with bash instead of sh as the shell: this turns on bash # extensions like <(...). @@ -128,9 +135,10 @@ Linux kernel sources with many fixes and improvements. %source_timestamp %package vanilla -Summary: Vanilla Linux kernel sources with minor build fixes. -Group: Development/Sources -AutoReqProv: off +Summary: Vanilla Linux kernel sources with minor build fixes. +License: GPL v2 only +Group: Development/Sources +AutoReqProv: off %description vanilla Vanilla Linux kernel sources with minor build fixes. diff --git a/kernel-syms.changes b/kernel-syms.changes index 9fdec3d6..2f8c8a87 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Jun 12 05:14:11 CEST 2009 - greg@suse.de + +- scripts/sequence-patch.sh: fix bug in ketchup usage + +------------------------------------------------------------------- +Wed Jun 10 16:12:01 CEST 2009 - jeffm@suse.com + +- Update to 2.6.30-final. + +------------------------------------------------------------------- +Wed Jun 10 10:31:34 CEST 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. + +------------------------------------------------------------------- +Tue Jun 9 17:14:45 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. + +------------------------------------------------------------------- +Tue Jun 9 17:06:06 CEST 2009 - jbeulich@novell.com + +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. + ------------------------------------------------------------------- Mon Jun 8 09:01:23 CEST 2009 - jeffm@suse.com diff --git a/kernel-syms.spec b/kernel-syms.spec index 8a482833..3dfbc792 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -17,7 +17,6 @@ # norootforbuild -Url: http://www.kernel.org/ %define using_buildservice 0%{?opensuse_bs} %if %using_buildservice # Strip off the build number ("y") from the "x.y" release number @@ -33,13 +32,14 @@ Url: http://www.kernel.org/ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.30 -Release: 7 +Release: 8 %if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) %endif License: GPL v2 only Group: Development/Sources +Url: http://www.kernel.org/ AutoReqProv: off BuildRequires: coreutils %ifarch %ix86 ia64 ppc64 x86_64 @@ -102,6 +102,24 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE %_docdir/%name/README.SUSE %changelog +* Fri Jun 12 2009 greg@suse.de +- scripts/sequence-patch.sh: fix bug in ketchup usage +* Wed Jun 10 2009 jeffm@suse.com +- Update to 2.6.30-final. +* Wed Jun 10 2009 jbeulich@novell.com +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. +* Tue Jun 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. +* Tue Jun 09 2009 jbeulich@novell.com +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. * Mon Jun 08 2009 jeffm@suse.com - patches.suse/reiser4-set_page_dirty_notag: mm: Add set_page_dirty_notag() helper for reiser4. diff --git a/kernel-syms.spec.in b/kernel-syms.spec.in index 2c74051d..88b88079 100644 --- a/kernel-syms.spec.in +++ b/kernel-syms.spec.in @@ -1,16 +1,21 @@ # # spec file for package kernel-syms@VARIANT@ (Version @RPMVERSION@) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -# ( kernel-binary-packages is expanded into the list of all binary kernel -# packages for each architecture by Autobuild. ) %define using_buildservice 0%{?opensuse_bs} @@ -27,24 +32,25 @@ %define variant @VARIANT@%{nil} -Name: kernel-syms@VARIANT@ -Summary: Kernel Symbol Versions (modversions) -Version: @RPMVERSION@ +Name: kernel-syms@VARIANT@ +Summary: Kernel Symbol Versions (modversions) +Version: @RPMVERSION@ %if %using_buildservice Release: @RELEASE_PREFIX@ %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) Release: %kernel_source_release %endif -License: GPL -Group: Development/Sources -AutoReqProv: off -BuildRequires: coreutils +License: GPL v2 only +Group: Development/Sources +Url: http://www.kernel.org/ +AutoReqProv: off +BuildRequires: coreutils @REQUIRES@ -Source: README.KSYMS -Requires: kernel-source%variant = %version-%source_rel -BuildRoot: %_tmppath/%name-%version-build -Prefix: /usr/src +Source: README.KSYMS +Requires: kernel-source%variant = %version-%source_rel +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Prefix: /usr/src %description Kernel symbols, such as functions and variables, have version diff --git a/kernel-trace.changes b/kernel-trace.changes index 9fdec3d6..2f8c8a87 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Jun 12 05:14:11 CEST 2009 - greg@suse.de + +- scripts/sequence-patch.sh: fix bug in ketchup usage + +------------------------------------------------------------------- +Wed Jun 10 16:12:01 CEST 2009 - jeffm@suse.com + +- Update to 2.6.30-final. + +------------------------------------------------------------------- +Wed Jun 10 10:31:34 CEST 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. + +------------------------------------------------------------------- +Tue Jun 9 17:14:45 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. + +------------------------------------------------------------------- +Tue Jun 9 17:06:06 CEST 2009 - jbeulich@novell.com + +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. + ------------------------------------------------------------------- Mon Jun 8 09:01:23 CEST 2009 - jeffm@suse.com diff --git a/kernel-trace.spec b/kernel-trace.spec index 80d242b5..2a6b911c 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -33,8 +33,8 @@ %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.29 -%define patchversion 2.6.30-rc8 +%define srcversion 2.6.30 +%define patchversion 2.6.30 %define variant %{nil} %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") %define kernelrelease %patchversion-%release_major @@ -62,7 +62,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel Version: 2.6.30 -Release: 7 +Release: 8 %if %using_buildservice %else %endif @@ -757,8 +757,8 @@ Authors: %if %CONFIG_KMSG_IDS == "y" %package man -License: GPL v2 only Summary: The collection of man pages generated by the kmsg script. +License: GPL v2 only Group: System/Kernel %description man @@ -780,8 +780,8 @@ Authors: %endif %package devel -License: GPL v2 only Summary: Development files necessary for building kernel modules +License: GPL v2 only Group: Development/Sources Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel @@ -821,6 +821,24 @@ Authors: %endif %changelog +* Fri Jun 12 2009 greg@suse.de +- scripts/sequence-patch.sh: fix bug in ketchup usage +* Wed Jun 10 2009 jeffm@suse.com +- Update to 2.6.30-final. +* Wed Jun 10 2009 jbeulich@novell.com +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. +* Tue Jun 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. +* Tue Jun 09 2009 jbeulich@novell.com +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. * Mon Jun 08 2009 jeffm@suse.com - patches.suse/reiser4-set_page_dirty_notag: mm: Add set_page_dirty_notag() helper for reiser4. diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 9fdec3d6..2f8c8a87 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Jun 12 05:14:11 CEST 2009 - greg@suse.de + +- scripts/sequence-patch.sh: fix bug in ketchup usage + +------------------------------------------------------------------- +Wed Jun 10 16:12:01 CEST 2009 - jeffm@suse.com + +- Update to 2.6.30-final. + +------------------------------------------------------------------- +Wed Jun 10 10:31:34 CEST 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. + +------------------------------------------------------------------- +Tue Jun 9 17:14:45 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. + +------------------------------------------------------------------- +Tue Jun 9 17:06:06 CEST 2009 - jbeulich@novell.com + +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. + ------------------------------------------------------------------- Mon Jun 8 09:01:23 CEST 2009 - jeffm@suse.com diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 8097693c..0bbef7fd 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -33,8 +33,8 @@ %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.29 -%define patchversion 2.6.30-rc8 +%define srcversion 2.6.30 +%define patchversion 2.6.30 %define variant %{nil} %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") %define kernelrelease %patchversion-%release_major @@ -62,7 +62,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches Version: 2.6.30 -Release: 7 +Release: 8 %if %using_buildservice %else %endif @@ -747,8 +747,8 @@ The standard kernel - without any SUSE patches %if %CONFIG_KMSG_IDS == "y" %package man -License: GPL v2 only Summary: The collection of man pages generated by the kmsg script. +License: GPL v2 only Group: System/Kernel %description man @@ -764,8 +764,8 @@ kmsg message documentation comments. %endif %package devel -License: GPL v2 only Summary: Development files necessary for building kernel modules +License: GPL v2 only Group: Development/Sources Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel @@ -799,6 +799,24 @@ kernel module packages) against the -vanilla flavor of the kernel. %endif %changelog +* Fri Jun 12 2009 greg@suse.de +- scripts/sequence-patch.sh: fix bug in ketchup usage +* Wed Jun 10 2009 jeffm@suse.com +- Update to 2.6.30-final. +* Wed Jun 10 2009 jbeulich@novell.com +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. +* Tue Jun 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. +* Tue Jun 09 2009 jbeulich@novell.com +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. * Mon Jun 08 2009 jeffm@suse.com - patches.suse/reiser4-set_page_dirty_notag: mm: Add set_page_dirty_notag() helper for reiser4. diff --git a/kernel-xen.changes b/kernel-xen.changes index 9fdec3d6..2f8c8a87 100644 --- a/kernel-xen.changes +++ b/kernel-xen.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Jun 12 05:14:11 CEST 2009 - greg@suse.de + +- scripts/sequence-patch.sh: fix bug in ketchup usage + +------------------------------------------------------------------- +Wed Jun 10 16:12:01 CEST 2009 - jeffm@suse.com + +- Update to 2.6.30-final. + +------------------------------------------------------------------- +Wed Jun 10 10:31:34 CEST 2009 - jbeulich@novell.com + +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. + +------------------------------------------------------------------- +Tue Jun 9 17:14:45 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. + +------------------------------------------------------------------- +Tue Jun 9 17:06:06 CEST 2009 - jbeulich@novell.com + +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. + ------------------------------------------------------------------- Mon Jun 8 09:01:23 CEST 2009 - jeffm@suse.com diff --git a/kernel-xen.spec b/kernel-xen.spec index 3e30d60c..b04aa254 100644 --- a/kernel-xen.spec +++ b/kernel-xen.spec @@ -33,8 +33,8 @@ %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") -%define srcversion 2.6.29 -%define patchversion 2.6.30-rc8 +%define srcversion 2.6.30 +%define patchversion 2.6.30 %define variant %{nil} %define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") %define kernelrelease %patchversion-%release_major @@ -62,7 +62,7 @@ Name: kernel-xen Summary: The Xen Kernel Version: 2.6.30 -Release: 7 +Release: 8 %if %using_buildservice %else %endif @@ -752,8 +752,8 @@ This package contains additional modules not supported by Novell. %if %CONFIG_KMSG_IDS == "y" %package man -License: GPL v2 only Summary: The collection of man pages generated by the kmsg script. +License: GPL v2 only Group: System/Kernel %description man @@ -769,8 +769,8 @@ kmsg message documentation comments. %endif %package devel -License: GPL v2 only Summary: Development files necessary for building kernel modules +License: GPL v2 only Group: Development/Sources Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel @@ -804,6 +804,24 @@ kernel module packages) against the -xen flavor of the kernel. %endif %changelog +* Fri Jun 12 2009 greg@suse.de +- scripts/sequence-patch.sh: fix bug in ketchup usage +* Wed Jun 10 2009 jeffm@suse.com +- Update to 2.6.30-final. +* Wed Jun 10 2009 jbeulich@novell.com +- Update Xen patches to 2.6.30-rc8 and c/s 898. +- Update Xen config files. +- patches.xen/pci-reserve: linux/pci: reserve io/memory space + for bridge. +- patches.xen/xen-x86-exports: Delete. +* Tue Jun 09 2009 mmarek@suse.cz +- rpm/kernel-binary.spec.in, rpm/kernel-source.spec.in, + rpm/kernel-syms.spec.in, rpm/mkspec: update copyright header and + change indentation to what autobuild enforces on checkin. No + functional change. +* Tue Jun 09 2009 jbeulich@novell.com +- patches.suse/stack-unwind-add-declaration.patch: Fold into ... +- patches.suse/stack-unwind: ... this one. * Mon Jun 08 2009 jeffm@suse.com - patches.suse/reiser4-set_page_dirty_notag: mm: Add set_page_dirty_notag() helper for reiser4. diff --git a/linux-2.6.29.tar.bz2 b/linux-2.6.29.tar.bz2 deleted file mode 100644 index c93fe6e4..00000000 --- a/linux-2.6.29.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f -size 56579370 diff --git a/linux-2.6.30.tar.bz2 b/linux-2.6.30.tar.bz2 new file mode 100644 index 00000000..9c851fa8 --- /dev/null +++ b/linux-2.6.30.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7b9f19b92fd5c693c16cd62f441d051b699f28ec6a175d1b464e58bacd8c78f +size 59435895 diff --git a/mkspec b/mkspec index abcfa24e..566557a6 100644 --- a/mkspec +++ b/mkspec @@ -88,7 +88,7 @@ do_spec('source', "kernel-source$variant.spec", %macros); next if $flavor eq "vanilla"; my @archs = arch2rpm(@{$flavor_archs{$flavor}}); $requires .= "%ifarch @archs\n"; - $requires .= "Requires: kernel-$flavor-devel = \%version-\%source_rel\n"; + $requires .= "Requires: kernel-$flavor-devel = \%version-\%source_rel\n"; $requires .= "%endif\n"; } chomp $requires; @@ -243,8 +243,8 @@ sub provides_obsoletes { my $rpmarch = arch2rpm($arch); chomp $rpmarch; $res .= "\%ifarch $rpmarch\n"; - $res .= "Provides: @packs\n"; - $res .= "Obsoletes: @packs\n"; + $res .= "Provides: @packs\n"; + $res .= "Obsoletes: @packs\n"; $res .= "\%endif\n"; } chomp $res; diff --git a/patches.arch.tar.bz2 b/patches.arch.tar.bz2 index 5dfcc6ca..45763a3e 100644 --- a/patches.arch.tar.bz2 +++ b/patches.arch.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c024c53fe2fe42461b138042acd0a5aa36c30428972d0449e2fbe921fe70e0b -size 36542 +oid sha256:5da18ced40bbe25da050b3879b624e5d78e23a056f9b62fd99dfcd63aecfa7ed +size 36586 diff --git a/patches.drivers.tar.bz2 b/patches.drivers.tar.bz2 index b3675be0..449017d9 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:01b619ed61731b654a3ba611f3536fcde7407357bb028c87a2353389be214ca9 -size 173151 +oid sha256:43d086644ff282d3e32eb609c4cd7a5d872856869c7830264cc27335ae5dbaf6 +size 173118 diff --git a/patches.fixes.tar.bz2 b/patches.fixes.tar.bz2 index 21ad212a..f970d7ba 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:f5ba14149c77d33bab5f81974136784374c32bcff2c3b13919bb9784ccd2e4cc -size 31775 +oid sha256:181ff19316761faf9f0fb44bd5e1bd0ba90003e5de2ba5d28944c84c88233282 +size 31765 diff --git a/patches.kernel.org.tar.bz2 b/patches.kernel.org.tar.bz2 index 3e0e01e5..40d4d0e0 100644 --- a/patches.kernel.org.tar.bz2 +++ b/patches.kernel.org.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8825ab441679047987fe1fb95acdfe8f6ccf0dddba714587218ae7ae5cd7ce29 -size 12626811 +oid sha256:05ecc844c2a70942c00a68e4adc00d56fbb22a0ea509c790bf999432b6a9e694 +size 4066 diff --git a/patches.rpmify.tar.bz2 b/patches.rpmify.tar.bz2 index 4e1469ba..5be41cb9 100644 --- a/patches.rpmify.tar.bz2 +++ b/patches.rpmify.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10685279b7a3674bcf0c1f8d37865c8c2590f57a3fc58790f8983e6efd4af1c8 -size 4128 +oid sha256:d62e86b860c2c56ceb8fbb281c6d59a99d3a1bbaf237df47a6d2397051a10a8a +size 4097 diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index 88571a24..0f860ea8 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:9008d22d8839a9baebd35a4d1a7c28a47b5fcabca6a8253bdac48cfae3b18ea4 -size 868167 +oid sha256:08c810f5529696910947944fcf39f50e4d08cd01c3ffe43cd8422ae851c5e68f +size 868293 diff --git a/patches.trace.tar.bz2 b/patches.trace.tar.bz2 index c7e4218d..866efbe3 100644 --- a/patches.trace.tar.bz2 +++ b/patches.trace.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74b07e566a135904d947a3a4cabcc3884a38de19105e1979f6de0cf5db64ff0b -size 43324 +oid sha256:cacd0551a6c5b296b220ad80d63571e9b25caeb5b0e8bd5a04f7210e7c62b007 +size 43300 diff --git a/patches.xen.tar.bz2 b/patches.xen.tar.bz2 index d9a7a14c..4084dd6a 100644 --- a/patches.xen.tar.bz2 +++ b/patches.xen.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a96a3c3749fca6424ced7827727155dd38a90c1ad31c4a779a80d27b54e59c46 -size 1765290 +oid sha256:1b5745739aeae216603fcbc3e81b7d5bad84f6aceeec0644c9a5d5ae0d32cb6f +size 1800081 diff --git a/series.conf b/series.conf index 7d5b6ae4..c071ab21 100644 --- a/series.conf +++ b/series.conf @@ -27,14 +27,6 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## - patches.kernel.org/patch-2.6.30-rc1 - patches.kernel.org/patch-2.6.30-rc1-rc2 - patches.kernel.org/patch-2.6.30-rc2-rc3 - patches.kernel.org/patch-2.6.30-rc3-rc4 - patches.kernel.org/patch-2.6.30-rc4-rc5 - patches.kernel.org/patch-2.6.30-rc5-rc6 - patches.kernel.org/patch-2.6.30-rc6-rc7 - patches.kernel.org/patch-2.6.30-rc7-rc8 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -592,7 +584,6 @@ ######################################################## patches.suse/crasher-26.diff patches.suse/stack-unwind - patches.suse/stack-unwind-add-declaration.patch patches.suse/no-frame-pointer-select patches.arch/x86_64-unwind-annotations @@ -665,6 +656,7 @@ patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch patches.xen/ipv6-no-autoconf patches.xen/pci-guestdev + patches.xen/pci-reserve patches.xen/sfc-driverlink patches.xen/sfc-resource-driver patches.xen/sfc-driverlink-conditional @@ -712,6 +704,8 @@ patches.xen/xen3-patch-2.6.29 patches.xen/xen3-patch-2.6.30-rc4 patches.xen/xen3-patch-2.6.30-rc4-rc5 + patches.xen/xen3-patch-2.6.30-rc6-rc7 + patches.xen/xen3-patch-2.6.30-rc7-rc8 patches.xen/xen3-seccomp-disable-tsc-option +needs_to_go_away patches.xen/xen3-x86-mark_rodata_rw.patch patches.xen/xen3-devtmpfs.patch @@ -749,7 +743,6 @@ patches.xen/xen-x86-bigmem patches.xen/xen-x86-machphys-prediction patches.xen/xen-x86-exit-mmap - patches.xen/xen-x86-exports patches.xen/xen-x86_64-pgd-pin patches.xen/xen-x86_64-pgd-alloc-order patches.xen/xen-x86_64-dump-user-pgt diff --git a/source-timestamp b/source-timestamp index ceadb01d..9340ab07 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2009-06-08 17:19:06 +0200 -GIT Revision: ca078b26294979059ad09f56bfef035e2b22cb90 +2009-06-12 15:37:20 +0200 +GIT Revision: c0a34099379453ea7bc011985219ebf2373a2106 GIT Branch: master