diff --git a/config.tar.bz2 b/config.tar.bz2 index 0843f99a..94e2081a 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b66b3dc59909aaa6b1e5f2d688af947da291f67e7f9d6b5166377698dba863f -size 312826 +oid sha256:327b2aff16ac566865efe07f87cd0fbc2407a143a71680c1348ffb3a092a0721 +size 312728 diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index 3f28aebf..3d6634dc 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -60,7 +60,11 @@ Name: kernel-@FLAVOR@ Summary: @SUMMARY@ Version: @RPMVERSION@ +%if 0%{?is_kotd} +Release: .g@COMMIT@ +%else Release: @RELEASE@ +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -118,19 +122,11 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen -%ifarch %ix86 -%if %build_flavor != "ec2" -Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae < %version -%endif -%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl -Provides: %name-nongpl = %version -Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -169,29 +165,51 @@ BuildArch: i686 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. +# Usage: obsolete_kmp +# Note that KMPs embed the version of the kernel built against, that's why +# the _3 suffix for 2.6.x-based KMPs +%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ +Provides: %1-kmp = %2 \ +Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor -# sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor -# 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +%obsolete_kmp iwlwifi 1.3.27_3 +%obsolete_kmp ipw3945 1.2.2_3 +# sled10 / 11.0 +%obsolete_kmp uvcvideo r200_3 # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +%obsolete_kmp enic 0.0.1_3 +%obsolete_kmp fnic 1.0.0_3 +%obsolete_kmp brocade-bfa 1.1.0.2_3 +%obsolete_kmp kvm 78.2.6.30.1_3 +%obsolete_kmp perfmon 2_3 +%obsolete_kmp iwlagn-2-6-27 1.0_3 +%obsolete_kmp msi-wmi 1.0_3 +# sle11 +%obsolete_kmp ocfs2 1.6_4 # 11.1 -Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +%obsolete_kmp quickcam 0.6.7 +# sle11-sp1 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -792,6 +810,7 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd +@PROVIDES_OBSOLETES_BASE@ %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-cubox.changes b/kernel-cubox.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-cubox.changes +++ b/kernel-cubox.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-cubox.spec b/kernel-cubox.spec index 63ea232f..a1a51283 100644 --- a/kernel-cubox.spec +++ b/kernel-cubox.spec @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-cubox Summary: Kernel for SolidRun Cubox -Version: 3.11.2 -Release: .g4c1fc5a +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -118,19 +122,11 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen -%ifarch %ix86 -%if %build_flavor != "ec2" -Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae < %version -%endif -%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl -Provides: %name-nongpl = %version -Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -186,7 +182,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-packages.conf +Source62: old-flavors Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -245,29 +241,51 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. +# Usage: obsolete_kmp +# Note that KMPs embed the version of the kernel built against, that's why +# the _3 suffix for 2.6.x-based KMPs +%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ +Provides: %1-kmp = %2 \ +Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor -# sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor -# 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +%obsolete_kmp iwlwifi 1.3.27_3 +%obsolete_kmp ipw3945 1.2.2_3 +# sled10 / 11.0 +%obsolete_kmp uvcvideo r200_3 # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +%obsolete_kmp enic 0.0.1_3 +%obsolete_kmp fnic 1.0.0_3 +%obsolete_kmp brocade-bfa 1.1.0.2_3 +%obsolete_kmp kvm 78.2.6.30.1_3 +%obsolete_kmp perfmon 2_3 +%obsolete_kmp iwlagn-2-6-27 1.0_3 +%obsolete_kmp msi-wmi 1.0_3 +# sle11 +%obsolete_kmp ocfs2 1.6_4 # 11.1 -Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +%obsolete_kmp quickcam 0.6.7 +# sle11-sp1 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -869,6 +887,7 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd + %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-debug.changes b/kernel-debug.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-debug.spec b/kernel-debug.spec index 3e0c189f..93fb2712 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 3.11.2 -Release: .g4c1fc5a +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -118,19 +122,11 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen -%ifarch %ix86 -%if %build_flavor != "ec2" -Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae < %version -%endif -%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl -Provides: %name-nongpl = %version -Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -149,8 +145,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel %ifarch ppc64 -Provides: kernel-kdump -Obsoletes: kernel-kdump +Provides: kernel-kdump = 2.6.28 +Obsoletes: kernel-kdump <= 2.6.28 %endif Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 @@ -189,7 +185,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-packages.conf +Source62: old-flavors Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -248,29 +244,51 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. +# Usage: obsolete_kmp +# Note that KMPs embed the version of the kernel built against, that's why +# the _3 suffix for 2.6.x-based KMPs +%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ +Provides: %1-kmp = %2 \ +Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor -# sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor -# 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +%obsolete_kmp iwlwifi 1.3.27_3 +%obsolete_kmp ipw3945 1.2.2_3 +# sled10 / 11.0 +%obsolete_kmp uvcvideo r200_3 # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +%obsolete_kmp enic 0.0.1_3 +%obsolete_kmp fnic 1.0.0_3 +%obsolete_kmp brocade-bfa 1.1.0.2_3 +%obsolete_kmp kvm 78.2.6.30.1_3 +%obsolete_kmp perfmon 2_3 +%obsolete_kmp iwlagn-2-6-27 1.0_3 +%obsolete_kmp msi-wmi 1.0_3 +# sle11 +%obsolete_kmp ocfs2 1.6_4 # 11.1 -Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +%obsolete_kmp quickcam 0.6.7 +# sle11-sp1 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -872,6 +890,7 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd + %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-default.changes b/kernel-default.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-default.spec b/kernel-default.spec index e2b1f53b..b81d1a48 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-default Summary: The Standard Kernel -Version: 3.11.2 -Release: .g4c1fc5a +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -118,19 +122,11 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen -%ifarch %ix86 -%if %build_flavor != "ec2" -Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae < %version -%endif -%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl -Provides: %name-nongpl = %version -Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -149,24 +145,20 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel %ifarch %ix86 -Provides: smp kernel-smp -Obsoletes: smp kernel-smp +Provides: kernel-smp = 2.6.17 +Obsoletes: kernel-smp <= 2.6.17 %endif %ifarch ia64 -Provides: kernel-sn2 -Obsoletes: kernel-sn2 +Provides: kernel-sn2 = 2.6.6 +Obsoletes: kernel-sn2 <= 2.6.6 %endif %ifarch ppc64 -Provides: kernel-kdump -Obsoletes: kernel-kdump -%endif -%ifarch s390x -Provides: kernel-64bit -Obsoletes: kernel-64bit +Provides: kernel-kdump = 2.6.28 +Obsoletes: kernel-kdump <= 2.6.28 %endif %ifarch x86_64 -Provides: smp kernel-smp -Obsoletes: smp kernel-smp +Provides: kernel-smp = 2.6.17 +Obsoletes: kernel-smp <= 2.6.17 %endif Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 @@ -205,7 +197,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-packages.conf +Source62: old-flavors Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -264,29 +256,51 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. +# Usage: obsolete_kmp +# Note that KMPs embed the version of the kernel built against, that's why +# the _3 suffix for 2.6.x-based KMPs +%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ +Provides: %1-kmp = %2 \ +Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor -# sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor -# 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +%obsolete_kmp iwlwifi 1.3.27_3 +%obsolete_kmp ipw3945 1.2.2_3 +# sled10 / 11.0 +%obsolete_kmp uvcvideo r200_3 # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +%obsolete_kmp enic 0.0.1_3 +%obsolete_kmp fnic 1.0.0_3 +%obsolete_kmp brocade-bfa 1.1.0.2_3 +%obsolete_kmp kvm 78.2.6.30.1_3 +%obsolete_kmp perfmon 2_3 +%obsolete_kmp iwlagn-2-6-27 1.0_3 +%obsolete_kmp msi-wmi 1.0_3 +# sle11 +%obsolete_kmp ocfs2 1.6_4 # 11.1 -Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +%obsolete_kmp quickcam 0.6.7 +# sle11-sp1 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -887,6 +901,7 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd + %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-desktop.changes b/kernel-desktop.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-desktop.spec b/kernel-desktop.spec index 3d6ad3d9..92e26e2f 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop -Version: 3.11.2 -Release: .g4c1fc5a +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -118,19 +122,11 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen -%ifarch %ix86 -%if %build_flavor != "ec2" -Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae < %version -%endif -%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl -Provides: %name-nongpl = %version -Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -186,7 +182,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-packages.conf +Source62: old-flavors Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -245,29 +241,51 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. +# Usage: obsolete_kmp +# Note that KMPs embed the version of the kernel built against, that's why +# the _3 suffix for 2.6.x-based KMPs +%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ +Provides: %1-kmp = %2 \ +Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor -# sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor -# 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +%obsolete_kmp iwlwifi 1.3.27_3 +%obsolete_kmp ipw3945 1.2.2_3 +# sled10 / 11.0 +%obsolete_kmp uvcvideo r200_3 # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +%obsolete_kmp enic 0.0.1_3 +%obsolete_kmp fnic 1.0.0_3 +%obsolete_kmp brocade-bfa 1.1.0.2_3 +%obsolete_kmp kvm 78.2.6.30.1_3 +%obsolete_kmp perfmon 2_3 +%obsolete_kmp iwlagn-2-6-27 1.0_3 +%obsolete_kmp msi-wmi 1.0_3 +# sle11 +%obsolete_kmp ocfs2 1.6_4 # 11.1 -Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +%obsolete_kmp quickcam 0.6.7 +# sle11-sp1 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -881,6 +899,7 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd + %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-docs.changes b/kernel-docs.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-docs.spec b/kernel-docs.spec index 1b9a97ad..65547d25 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -17,15 +17,19 @@ # norootforbuild -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-docs Summary: Kernel Documentation -Version: 3.11.2 -Release: .g4c1fc5a +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant Url: http://www.kernel.org/ diff --git a/kernel-docs.spec.in b/kernel-docs.spec.in index b8dead40..a8ee3668 100644 --- a/kernel-docs.spec.in +++ b/kernel-docs.spec.in @@ -25,7 +25,11 @@ Name: kernel-docs@VARIANT@ Summary: Kernel Documentation Version: @RPMVERSION@ +%if 0%{?is_kotd} +Release: .g@COMMIT@ +%else Release: @RELEASE@ +%endif BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant Url: http://www.kernel.org/ diff --git a/kernel-ec2.changes b/kernel-ec2.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-ec2.changes +++ b/kernel-ec2.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-ec2.spec b/kernel-ec2.spec index e6797586..a1fdad51 100644 --- a/kernel-ec2.spec +++ b/kernel-ec2.spec @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel -Version: 3.11.2 -Release: .g4c1fc5a +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -118,19 +122,11 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen -%ifarch %ix86 -%if %build_flavor != "ec2" -Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae < %version -%endif -%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl -Provides: %name-nongpl = %version -Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -186,7 +182,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-packages.conf +Source62: old-flavors Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -245,29 +241,51 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. +# Usage: obsolete_kmp +# Note that KMPs embed the version of the kernel built against, that's why +# the _3 suffix for 2.6.x-based KMPs +%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ +Provides: %1-kmp = %2 \ +Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor -# sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor -# 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +%obsolete_kmp iwlwifi 1.3.27_3 +%obsolete_kmp ipw3945 1.2.2_3 +# sled10 / 11.0 +%obsolete_kmp uvcvideo r200_3 # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +%obsolete_kmp enic 0.0.1_3 +%obsolete_kmp fnic 1.0.0_3 +%obsolete_kmp brocade-bfa 1.1.0.2_3 +%obsolete_kmp kvm 78.2.6.30.1_3 +%obsolete_kmp perfmon 2_3 +%obsolete_kmp iwlagn-2-6-27 1.0_3 +%obsolete_kmp msi-wmi 1.0_3 +# sle11 +%obsolete_kmp ocfs2 1.6_4 # 11.1 -Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +%obsolete_kmp quickcam 0.6.7 +# sle11-sp1 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -871,6 +889,7 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd + %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-exynos.changes b/kernel-exynos.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-exynos.changes +++ b/kernel-exynos.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-exynos.spec b/kernel-exynos.spec index 3fe7b7d3..5861f81e 100644 --- a/kernel-exynos.spec +++ b/kernel-exynos.spec @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-exynos Summary: Kernel for Samsung's Exynos SoC -Version: 3.11.2 -Release: .g4c1fc5a +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -118,19 +122,11 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen -%ifarch %ix86 -%if %build_flavor != "ec2" -Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae < %version -%endif -%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl -Provides: %name-nongpl = %version -Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -186,7 +182,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-packages.conf +Source62: old-flavors Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -245,29 +241,51 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. +# Usage: obsolete_kmp +# Note that KMPs embed the version of the kernel built against, that's why +# the _3 suffix for 2.6.x-based KMPs +%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ +Provides: %1-kmp = %2 \ +Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor -# sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor -# 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +%obsolete_kmp iwlwifi 1.3.27_3 +%obsolete_kmp ipw3945 1.2.2_3 +# sled10 / 11.0 +%obsolete_kmp uvcvideo r200_3 # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +%obsolete_kmp enic 0.0.1_3 +%obsolete_kmp fnic 1.0.0_3 +%obsolete_kmp brocade-bfa 1.1.0.2_3 +%obsolete_kmp kvm 78.2.6.30.1_3 +%obsolete_kmp perfmon 2_3 +%obsolete_kmp iwlagn-2-6-27 1.0_3 +%obsolete_kmp msi-wmi 1.0_3 +# sle11 +%obsolete_kmp ocfs2 1.6_4 # 11.1 -Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +%obsolete_kmp quickcam 0.6.7 +# sle11-sp1 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -868,6 +886,7 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd + %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-lpae.spec b/kernel-lpae.spec index 8bc06d13..4df75bf6 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-lpae Summary: Kernel for LPAE enabled systems -Version: 3.11.2 -Release: .g4c1fc5a +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -118,19 +122,11 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen -%ifarch %ix86 -%if %build_flavor != "ec2" -Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae < %version -%endif -%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl -Provides: %name-nongpl = %version -Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -186,7 +182,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-packages.conf +Source62: old-flavors Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -245,29 +241,51 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. +# Usage: obsolete_kmp +# Note that KMPs embed the version of the kernel built against, that's why +# the _3 suffix for 2.6.x-based KMPs +%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ +Provides: %1-kmp = %2 \ +Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor -# sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor -# 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +%obsolete_kmp iwlwifi 1.3.27_3 +%obsolete_kmp ipw3945 1.2.2_3 +# sled10 / 11.0 +%obsolete_kmp uvcvideo r200_3 # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +%obsolete_kmp enic 0.0.1_3 +%obsolete_kmp fnic 1.0.0_3 +%obsolete_kmp brocade-bfa 1.1.0.2_3 +%obsolete_kmp kvm 78.2.6.30.1_3 +%obsolete_kmp perfmon 2_3 +%obsolete_kmp iwlagn-2-6-27 1.0_3 +%obsolete_kmp msi-wmi 1.0_3 +# sle11 +%obsolete_kmp ocfs2 1.6_4 # 11.1 -Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +%obsolete_kmp quickcam 0.6.7 +# sle11-sp1 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -869,6 +887,7 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd + %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-module-subpackage b/kernel-module-subpackage index ebcaf5a6..32cbd318 100644 --- a/kernel-module-subpackage +++ b/kernel-module-subpackage @@ -26,6 +26,11 @@ Provides: multiversion(kernel) Requires: coreutils grep %{-c:Requires: %{-n*}-ueficert} Enhances: kernel-%1 +%ifarch %ix86 +%if %1 == "default" +Obsoletes: %{-n*}-vmi +%endif +%endif AutoReqProv: on %{-p:%{expand:%(cd %_sourcedir; cat %{-p*})}} %description -n %{-n*}-kmp-%1 diff --git a/kernel-pae.changes b/kernel-pae.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-pae.spec b/kernel-pae.spec index b43c6be5..14c8cb61 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 3.11.2 -Release: .g4c1fc5a +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -118,19 +122,11 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen -%ifarch %ix86 -%if %build_flavor != "ec2" -Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae < %version -%endif -%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl -Provides: %name-nongpl = %version -Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -149,8 +145,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel %ifarch %ix86 -Provides: kernel-bigsmp -Obsoletes: kernel-bigsmp +Provides: kernel-bigsmp = 2.6.17 +Obsoletes: kernel-bigsmp <= 2.6.17 +Provides: kernel-vmi = 2.6.38 +Obsoletes: kernel-vmi <= 2.6.38 %endif Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 @@ -189,7 +187,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-packages.conf +Source62: old-flavors Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -248,29 +246,51 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. +# Usage: obsolete_kmp +# Note that KMPs embed the version of the kernel built against, that's why +# the _3 suffix for 2.6.x-based KMPs +%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ +Provides: %1-kmp = %2 \ +Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor -# sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor -# 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +%obsolete_kmp iwlwifi 1.3.27_3 +%obsolete_kmp ipw3945 1.2.2_3 +# sled10 / 11.0 +%obsolete_kmp uvcvideo r200_3 # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +%obsolete_kmp enic 0.0.1_3 +%obsolete_kmp fnic 1.0.0_3 +%obsolete_kmp brocade-bfa 1.1.0.2_3 +%obsolete_kmp kvm 78.2.6.30.1_3 +%obsolete_kmp perfmon 2_3 +%obsolete_kmp iwlagn-2-6-27 1.0_3 +%obsolete_kmp msi-wmi 1.0_3 +# sle11 +%obsolete_kmp ocfs2 1.6_4 # 11.1 -Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +%obsolete_kmp quickcam 0.6.7 +# sle11-sp1 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -879,6 +899,10 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd %ifarch %ix86 +Provides: kernel-vmi-base = 2.6.38 +Obsoletes: kernel-vmi-base <= 2.6.38 +%endif +%ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-source.changes b/kernel-source.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-source.spec b/kernel-source.spec index 656d7b99..0f620634 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -19,7 +19,7 @@ # icecream 0 %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -29,8 +29,12 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 3.11.2 -Release: .g4c1fc5a +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ @@ -77,7 +81,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-packages.conf +Source62: old-flavors Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros diff --git a/kernel-source.spec.in b/kernel-source.spec.in index 4f6e4267..10f1b7d1 100644 --- a/kernel-source.spec.in +++ b/kernel-source.spec.in @@ -30,7 +30,11 @@ Name: kernel-source@VARIANT@ Summary: The Linux Kernel Sources Version: @RPMVERSION@ +%if 0%{?is_kotd} +Release: .g@COMMIT@ +%else Release: @RELEASE@ +%endif License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ @@ -77,7 +81,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-packages.conf +Source62: old-flavors Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros diff --git a/kernel-syms.changes b/kernel-syms.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-syms.spec b/kernel-syms.spec index 8e436e85..56d44e0c 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -23,9 +23,13 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 3.11.2 +Version: 3.11.3 %if %using_buildservice -Release: .g4c1fc5a +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif %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 diff --git a/kernel-syms.spec.in b/kernel-syms.spec.in index 1872d75f..10d665e4 100644 --- a/kernel-syms.spec.in +++ b/kernel-syms.spec.in @@ -25,7 +25,11 @@ Name: kernel-syms@VARIANT@ Summary: Kernel Symbol Versions (modversions) Version: @RPMVERSION@ %if %using_buildservice +%if 0%{?is_kotd} +Release: .g@COMMIT@ +%else Release: @RELEASE@ +%endif %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 diff --git a/kernel-trace.changes b/kernel-trace.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-trace.spec b/kernel-trace.spec index 49e6981e..6e607a0f 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features -Version: 3.11.2 -Release: .g4c1fc5a +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -118,19 +122,11 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen -%ifarch %ix86 -%if %build_flavor != "ec2" -Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae < %version -%endif -%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl -Provides: %name-nongpl = %version -Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -149,12 +145,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel %ifarch ppc64 -Provides: kernel-kdump -Obsoletes: kernel-kdump -%endif -%ifarch s390x -Provides: kernel-64bit -Obsoletes: kernel-64bit +Provides: kernel-kdump = 2.6.28 +Obsoletes: kernel-kdump <= 2.6.28 %endif Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 @@ -193,7 +185,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-packages.conf +Source62: old-flavors Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -252,29 +244,51 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. +# Usage: obsolete_kmp +# Note that KMPs embed the version of the kernel built against, that's why +# the _3 suffix for 2.6.x-based KMPs +%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ +Provides: %1-kmp = %2 \ +Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor -# sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor -# 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +%obsolete_kmp iwlwifi 1.3.27_3 +%obsolete_kmp ipw3945 1.2.2_3 +# sled10 / 11.0 +%obsolete_kmp uvcvideo r200_3 # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +%obsolete_kmp enic 0.0.1_3 +%obsolete_kmp fnic 1.0.0_3 +%obsolete_kmp brocade-bfa 1.1.0.2_3 +%obsolete_kmp kvm 78.2.6.30.1_3 +%obsolete_kmp perfmon 2_3 +%obsolete_kmp iwlagn-2-6-27 1.0_3 +%obsolete_kmp msi-wmi 1.0_3 +# sle11 +%obsolete_kmp ocfs2 1.6_4 # 11.1 -Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +%obsolete_kmp quickcam 0.6.7 +# sle11-sp1 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -875,6 +889,7 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd + %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 02503224..2cf7fc5f 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches -Version: 3.11.2 -Release: .g4c1fc5a +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -118,19 +122,11 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen -%ifarch %ix86 -%if %build_flavor != "ec2" -Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae < %version -%endif -%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl -Provides: %name-nongpl = %version -Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -148,10 +144,7 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -%ifarch s390x -Provides: kernel-64bit -Obsoletes: kernel-64bit -%endif + Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh @@ -189,7 +182,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-packages.conf +Source62: old-flavors Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -248,29 +241,51 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. +# Usage: obsolete_kmp +# Note that KMPs embed the version of the kernel built against, that's why +# the _3 suffix for 2.6.x-based KMPs +%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ +Provides: %1-kmp = %2 \ +Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor -# sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor -# 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +%obsolete_kmp iwlwifi 1.3.27_3 +%obsolete_kmp ipw3945 1.2.2_3 +# sled10 / 11.0 +%obsolete_kmp uvcvideo r200_3 # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +%obsolete_kmp enic 0.0.1_3 +%obsolete_kmp fnic 1.0.0_3 +%obsolete_kmp brocade-bfa 1.1.0.2_3 +%obsolete_kmp kvm 78.2.6.30.1_3 +%obsolete_kmp perfmon 2_3 +%obsolete_kmp iwlagn-2-6-27 1.0_3 +%obsolete_kmp msi-wmi 1.0_3 +# sle11 +%obsolete_kmp ocfs2 1.6_4 # 11.1 -Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +%obsolete_kmp quickcam 0.6.7 +# sle11-sp1 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -871,6 +886,7 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd + %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-xen.changes b/kernel-xen.changes index 03bbcc6c..d55f457d 100644 --- a/kernel-xen.changes +++ b/kernel-xen.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- +Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. + actually assign the divide result to hv_lapic_frequency +- commit 420e19b + +------------------------------------------------------------------- +Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 +- commit 221133c + +------------------------------------------------------------------- +Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are + versioned (bnc#821465). +- commit d802bf2 + +------------------------------------------------------------------- +Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) +- commit f5449e6 + +------------------------------------------------------------------- +Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes + for packages that were only seen in openSUSE releases up to 11.0. + (bnc#821465). +- commit 7e1f4b6 + +------------------------------------------------------------------- +Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. +- commit 83e7e53 + +------------------------------------------------------------------- +Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de + +- X86: Hyper-V: Get the local APIC timer frequency from the + hypervisor. +- commit 4f400e1 + +------------------------------------------------------------------- +Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de + +- Input: add a driver to support Hyper-V synthetic keyboard + (fate#315887). +- Update config files. +- commit 7affb28 + +------------------------------------------------------------------- +Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors, rpm/mkspec: Add version information to obsolete + flavors (bnc#821465). +- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the + old-flavors file. +- commit 25c1b0d + +------------------------------------------------------------------- +Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz + +- rpm/old-flavors: Convert the old-packages.conf file to a flat + list. +- rpm/mkspec: Adjust. +- rpm/old-packages.conf: Delete. +- commit 4037e16 + +------------------------------------------------------------------- +Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz + +- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) +- commit 50c4c23 + ------------------------------------------------------------------- Fri Sep 27 11:05:13 CEST 2013 - jslaby@suse.cz @@ -235,7 +337,7 @@ Thu Aug 29 21:20:20 CEST 2013 - jslaby@suse.cz Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 7032523 +- commit 280c88e ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -429,7 +531,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 3fb567f +- commit 43e5ff5 ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -650,7 +752,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 62a3621 +- commit 51c5edf ------------------------------------------------------------------- Fri Jun 28 01:52:25 CEST 2013 - jslaby@suse.cz @@ -684,7 +786,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit 0fcc327 +- commit d8f6242 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -898,7 +1000,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit ba8f987 +- commit af248e4 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1033,7 +1135,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 97197ff +- commit 882120e ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1307,11 +1409,12 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de +- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 5457ebe +- commit 958fe54 ------------------------------------------------------------------- Fri Apr 5 20:48:02 CEST 2013 - jslaby@suse.cz @@ -1417,7 +1520,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit 801a982 +- commit b9fe3d9 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1636,7 +1739,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit b1aa50e +- commit 09220ef ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -11363,6 +11466,26 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). +------------------------------------------------------------------- +Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: + Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). +- commit a48fbdf + +------------------------------------------------------------------- +Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz + +- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that + obsolete kernel-kdump. +- commit 0a4f75b + +------------------------------------------------------------------- +Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. +- commit 0e039b7 + ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -11747,6 +11870,13 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. +------------------------------------------------------------------- +Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz + +- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. +- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. +- commit bf55479 + ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-xen.spec b/kernel-xen.spec index 3ddde413..3cb4a6f0 100644 --- a/kernel-xen.spec +++ b/kernel-xen.spec @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-xen Summary: The Xen Kernel -Version: 3.11.2 -Release: .g4c1fc5a +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .gb1e6ec5 +%else +Release: .gb1e6ec5 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -118,19 +122,11 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen -%ifarch %ix86 -%if %build_flavor != "ec2" -Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae < %version -%endif -%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl -Provides: %name-nongpl = %version -Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -148,7 +144,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel - +%ifarch %ix86 +Provides: kernel-xenpae = 2.6.17 +Obsoletes: kernel-xenpae <= 2.6.17 +%endif Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh @@ -186,7 +185,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-packages.conf +Source62: old-flavors Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -245,29 +244,51 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. +# Usage: obsolete_kmp +# Note that KMPs embed the version of the kernel built against, that's why +# the _3 suffix for 2.6.x-based KMPs +%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ +Provides: %1-kmp = %2 \ +Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor -# sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor -# 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +%obsolete_kmp iwlwifi 1.3.27_3 +%obsolete_kmp ipw3945 1.2.2_3 +# sled10 / 11.0 +%obsolete_kmp uvcvideo r200_3 # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +%obsolete_kmp enic 0.0.1_3 +%obsolete_kmp fnic 1.0.0_3 +%obsolete_kmp brocade-bfa 1.1.0.2_3 +%obsolete_kmp kvm 78.2.6.30.1_3 +%obsolete_kmp perfmon 2_3 +%obsolete_kmp iwlagn-2-6-27 1.0_3 +%obsolete_kmp msi-wmi 1.0_3 +# sle11 +%obsolete_kmp ocfs2 1.6_4 # 11.1 -Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +%obsolete_kmp quickcam 0.6.7 +# sle11-sp1 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -871,6 +892,7 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd + %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/mkspec b/mkspec index baefa8b4..d6aab7b1 100644 --- a/mkspec +++ b/mkspec @@ -32,6 +32,9 @@ $vanilla_only ||= "0"; # package name -> [summary, description] my %binary_descriptions = parse_descriptions(); +# arch -> flavor -> [obsoleted packages] +my %obsolete_packages = parse_old_flavors(); + $patches="--patches $patches" if $patches; my $patchversion = `$dir/compute-PATCHVERSION.sh $patches`; chomp $patchversion; @@ -64,6 +67,8 @@ if ($srcversion =~ /^(\d+)(?:\.\d+)*(-rc\d+)?$/) { $tarball_url = ""; } +my $commit = get_commit(); + my %macros = ( VARIANT => $variant, VANILLA_ONLY => $vanilla_only, @@ -72,6 +77,7 @@ my %macros = ( RPMVERSION => $rpmversion, TARBALL_URL => $tarball_url, RELEASE => $rpmrelease, + COMMIT => $commit, SOURCES => $sources, NOSOURCE => $nosource, UNPACK_PATCHES => $unpack_patches, @@ -96,7 +102,10 @@ for my $flavor (sort keys(%flavor_archs)) { SUMMARY => $summary, DESCRIPTION => $description, ARCHS => join(" ", arch2rpm(@{$flavor_archs{$flavor}})), - PROVIDES_OBSOLETES => provides_obsoletes($flavor, @{$flavor_archs{$flavor}}), + PROVIDES_OBSOLETES => + provides_obsoletes($flavor, @{$flavor_archs{$flavor}}), + PROVIDES_OBSOLETES_BASE => + provides_obsoletes("$flavor-base", @{$flavor_archs{$flavor}}), ); } # kernel-source.spec @@ -226,6 +235,28 @@ sub parse_descriptions { return %res; } +sub parse_old_flavors{ + my %res; + + + xopen(my $fh, '<', "$dir/old-flavors"); + while (<$fh>) { + chomp; + next if /^\s*(#|$)/; + if (!m:^\s*(\w+)/([\w-]+)\s+([\w-]+)\s+([\w.-]+)\s*$:) { + print STDERR "$dir/old-flavors:$.: expected arch/flavor \n"; + next; + } + my ($arch, $flavor, $old_flavor, $old_version) = ($1, $2, $3, $4); + $res{$arch} ||= {}; + $res{$arch}{$flavor} ||= []; + push(@{$res{$arch}{$flavor}}, + ["kernel-$old_flavor", $old_version]); + } + close($fh); + return %res; +} + sub is_script { my $script = shift; @@ -258,20 +289,44 @@ sub provides_obsoletes { my $res = ""; for my $arch (@archs) { - my @packs = `$dir/guards $arch $flavor <$dir/old-packages.conf`; - chomp @packs; + my @packs = @{$obsolete_packages{$arch}{$flavor} || []}; next if (!@packs); my $rpmarch = arch2rpm($arch); chomp $rpmarch; $res .= "\%ifarch $rpmarch\n"; - $res .= "Provides: @packs\n"; - $res .= "Obsoletes: @packs\n"; + for my $pack (@packs) { + my $name = $pack->[0]; + my $version = $pack->[1]; + $res .= "Provides: $name = $version\n"; + $res .= "Obsoletes: $name <= $version\n"; + } $res .= "\%endif\n"; } chomp $res; return $res; } +sub get_commit { + my ($commit, $fh); + + if (!open($fh, '<', "source-timestamp")) { + print STDERR "warning: source-timestamp: $!\n"; + print STDERR "warning: Cannot determine commit id\n"; + return "0000000"; + } + while (<$fh>) { + if (/^GIT Revision: ([0-9a-f]{7})/) { + $commit = $1; + } + } + close($fh); + if (!$commit) { + print STDERR "warning: Commit id missing in source-timestamp file\n"; + return "0000000"; + } + return $commit; +} + sub do_spec { my $template = shift; my $specfile = shift; diff --git a/old-flavors b/old-flavors new file mode 100644 index 00000000..a3a6ba34 --- /dev/null +++ b/old-flavors @@ -0,0 +1,32 @@ +# List of obsolete kernel flavors +# / + +# SLES 9 +ia64/default sn2 2.6.6 + +ppc/ppc64 pmac64 2.6.6 +ppc/ppc64 pseries64 2.6.6 + +# SLES 10 +i386/default smp 2.6.17 +i386/pae bigsmp 2.6.17 +i386/xen xenpae 2.6.17 + +x86_64/default smp 2.6.17 + +ppc/ppc64 iseries64 2.6.17 +ppc/ppc64 kdump 2.6.17 + +# SLES 11 GA only +# FIXME: more architectures had kdump in SLES 10 +ppc64/debug kdump 2.6.28 +ppc64/default kdump 2.6.28 +ppc64/ppc64 kdump 2.6.28 +ppc64/trace kdump 2.6.28 + +# SLES 11 GA only / 11.4 +i386/pae vmi 2.6.38 +i386/pae-base vmi-base 2.6.38 + + + diff --git a/patches.kernel.org.tar.bz2 b/patches.kernel.org.tar.bz2 index dd0b5a44..375b65bd 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:50f951ff63baffd5de61b453de0038adbb465a84bfa1c097a2f3639a92d4e412 -size 47329 +oid sha256:8a406ebbae6b318b7c4818f6ad89aab3ad562c8fb9ddb5e5e5a0db4ee416d9c7 +size 74745 diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index f561bb62..61eef39e 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:f0b8916408b27223ef7616d30271d03b6ccdefb850179aec3d6efa06915553c6 -size 142066 +oid sha256:47abb2c9a2fbfcc90bc5196e9adc8fb337f9dce4cb67e3cae00221af8795da3e +size 146914 diff --git a/patches.xen.tar.bz2 b/patches.xen.tar.bz2 index 80dbf91e..1adb5ac8 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:bcbc0d3d3c541bace8350f1031be217fb3110c3803944b552159ffc59c2b6d48 -size 2122696 +oid sha256:98d9b94243368fb170bdbc4691f6dcce8d08de7c41c02b47d40fd4667bbdcea3 +size 2121868 diff --git a/series.conf b/series.conf index edc5818c..cdfd45d2 100644 --- a/series.conf +++ b/series.conf @@ -29,6 +29,7 @@ ######################################################## patches.kernel.org/patch-3.11.1 patches.kernel.org/patch-3.11.1-2 + patches.kernel.org/patch-3.11.2-3 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -228,6 +229,8 @@ ######################################################## patches.suse/suse-hv-Drivers-hv-util-Fix-a-bug-in-version-negotiation-cod.patch patches.suse/suse-hv-Drivers-hv-util-Fix-a-bug-in-util-version-negotiatio.patch + patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch + patches.suse/suse-hv-Input-add-a-driver-to-support-Hyper-V-synthetic-keyb.patch ######################################################## # Networking, IPv6 @@ -297,6 +300,7 @@ patches.suse/btrfs-0033-remove-ourselves-from-the-cluster-list-under-l.patch +dsterba patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch + patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch patches.suse/btrfs-use-end-trans-in-label-ioctl patches.suse/btrfs-add-ability-to-query-change-feature-bits-online-ioctl patches.suse/introduce-kobj_completion diff --git a/source-timestamp b/source-timestamp index bfa2f1f4..9ee44f28 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2013-09-27 11:05:13 +0200 -GIT Revision: 4c1fc5ab7e91b09a2e0e6e29471ff7a5c1d58312 +2013-10-02 17:41:54 +0200 +GIT Revision: b1e6ec5d0f47ca874fea4c9c02fc6aae7066d18d GIT Branch: stable