diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index 391a65e3..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/ diff --git a/kernel-cubox.changes b/kernel-cubox.changes index 75e6b4ad..4920e92a 100644 --- a/kernel-cubox.changes +++ b/kernel-cubox.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-cubox.spec b/kernel-cubox.spec index 4f5d4d07..6cd99a49 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: .g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-debug.changes b/kernel-debug.changes index 75e6b4ad..4920e92a 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-debug.spec b/kernel-debug.spec index f90c5577..f4bf75cc 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: .g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-default.changes b/kernel-default.changes index 75e6b4ad..4920e92a 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-default.spec b/kernel-default.spec index b369be64..dc51c376 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: .g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-desktop.changes b/kernel-desktop.changes index 75e6b4ad..4920e92a 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-desktop.spec b/kernel-desktop.spec index e1e68a7b..0e365059 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: .g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-docs.changes b/kernel-docs.changes index 75e6b4ad..4920e92a 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-docs.spec b/kernel-docs.spec index c4863117..c2eb10fd 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: .g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%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 75e6b4ad..4920e92a 100644 --- a/kernel-ec2.changes +++ b/kernel-ec2.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-ec2.spec b/kernel-ec2.spec index ce892e20..af8d29bb 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: .g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-exynos.changes b/kernel-exynos.changes index 75e6b4ad..4920e92a 100644 --- a/kernel-exynos.changes +++ b/kernel-exynos.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-exynos.spec b/kernel-exynos.spec index e8a46b81..546d2dc4 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: .g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 75e6b4ad..4920e92a 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-lpae.spec b/kernel-lpae.spec index 929c8d25..a22f4edb 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: .g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-pae.changes b/kernel-pae.changes index 75e6b4ad..4920e92a 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-pae.spec b/kernel-pae.spec index 97086d6b..7ce53ed2 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: .g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-source.changes b/kernel-source.changes index 75e6b4ad..4920e92a 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-source.spec b/kernel-source.spec index 6591a70b..913e2256 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: .g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ diff --git a/kernel-source.spec.in b/kernel-source.spec.in index a9a89154..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/ diff --git a/kernel-syms.changes b/kernel-syms.changes index 75e6b4ad..4920e92a 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-syms.spec b/kernel-syms.spec index e6fbb847..5d7016d8 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: .g420e19b +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%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 75e6b4ad..4920e92a 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-trace.spec b/kernel-trace.spec index dbf87133..8725c88d 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: .g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 75e6b4ad..4920e92a 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index df69e54d..a0f0d3ba 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: .g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-xen.changes b/kernel-xen.changes index 75e6b4ad..4920e92a 100644 --- a/kernel-xen.changes +++ b/kernel-xen.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-xen.spec b/kernel-xen.spec index 03d472ce..171f65ef 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: .g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: .g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/mkspec b/mkspec index 703d0479..d6aab7b1 100644 --- a/mkspec +++ b/mkspec @@ -67,6 +67,8 @@ if ($srcversion =~ /^(\d+)(?:\.\d+)*(-rc\d+)?$/) { $tarball_url = ""; } +my $commit = get_commit(); + my %macros = ( VARIANT => $variant, VANILLA_ONLY => $vanilla_only, @@ -75,6 +77,7 @@ my %macros = ( RPMVERSION => $rpmversion, TARBALL_URL => $tarball_url, RELEASE => $rpmrelease, + COMMIT => $commit, SOURCES => $sources, NOSOURCE => $nosource, UNPACK_PATCHES => $unpack_patches, @@ -303,6 +306,27 @@ sub provides_obsoletes { 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/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 99577535..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:2618fcce78ed614e1aa6ba5fcf798cbbd6182dd89535395a113fa953f5730987 -size 146436 +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 ddc0ae42..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. @@ -299,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 2fa60315..70628e12 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2013-09-28 18:00:10 +0200 -GIT Revision: 420e19b4bee99f40550c2a3f2514c48d13cdf435 +2013-10-02 07:54:02 +0200 +GIT Revision: 485f0d128ebc47c0d72393c99edb2b304f7cf487 GIT Branch: openSUSE-13.1