From 170fe0e6384922c5b70f3df9bfa12f32a0cf951a941e9df57a603bfc2218f697 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Fri, 6 Jun 2014 06:02:12 +0000 Subject: [PATCH] commit f1c1b51b9bffc86f6695645ada856c2ac11ca7d0 OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=291 --- kernel-binary.spec.in | 6 ++++++ kernel-debug.changes | 12 ++++++++++++ kernel-debug.spec | 10 ++++++++-- kernel-default.changes | 12 ++++++++++++ kernel-default.spec | 10 ++++++++-- kernel-desktop.changes | 12 ++++++++++++ kernel-desktop.spec | 10 ++++++++-- kernel-docs.changes | 12 ++++++++++++ kernel-docs.spec | 4 ++-- kernel-ec2.changes | 12 ++++++++++++ kernel-ec2.spec | 10 ++++++++-- kernel-exynos.changes | 12 ++++++++++++ kernel-exynos.spec | 10 ++++++++-- kernel-lpae.changes | 12 ++++++++++++ kernel-lpae.spec | 10 ++++++++-- kernel-obs-build.changes | 12 ++++++++++++ kernel-obs-build.spec | 4 ++-- kernel-obs-qa-xen.changes | 12 ++++++++++++ kernel-obs-qa-xen.spec | 4 ++-- kernel-obs-qa.changes | 12 ++++++++++++ kernel-obs-qa.spec | 4 ++-- kernel-pae.changes | 12 ++++++++++++ kernel-pae.spec | 10 ++++++++-- kernel-source.changes | 12 ++++++++++++ kernel-source.spec | 4 ++-- kernel-syms.changes | 12 ++++++++++++ kernel-syms.spec | 4 ++-- kernel-vanilla.changes | 12 ++++++++++++ kernel-vanilla.spec | 10 ++++++++-- kernel-xen.changes | 12 ++++++++++++ kernel-xen.spec | 10 ++++++++-- source-timestamp | 4 ++-- 32 files changed, 272 insertions(+), 32 deletions(-) diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index f60077de..08ac9c8a 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -69,7 +69,9 @@ Url: http://www.kernel.org/ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +%if 0%{?suse_version} > 1310 BuildRequires: hmaccalc +%endif BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -418,6 +420,7 @@ add_vmlinux() # reasonably small local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) + cp %buildroot/$vmlinux{,.save} objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -428,6 +431,9 @@ add_vmlinux() rm -f %buildroot/$vmlinux_debug %endif gzip -n -k -9 %buildroot/$vmlinux + if test -e %buildroot/$vmlinux.save; then + mv -f %buildroot/$vmlinux{.save,} + fi ghost_vmlinux=true else ghost_vmlinux=false diff --git a/kernel-debug.changes b/kernel-debug.changes index 87814051..19558eff 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-debug.spec b/kernel-debug.spec index bfa978a0..41066039 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -61,15 +61,17 @@ License: GPL-2.0 Group: System/Kernel Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif Url: http://www.kernel.org/ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +%if 0%{?suse_version} > 1310 BuildRequires: hmaccalc +%endif BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -544,6 +546,7 @@ add_vmlinux() # reasonably small local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) + cp %buildroot/$vmlinux{,.save} objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -554,6 +557,9 @@ add_vmlinux() rm -f %buildroot/$vmlinux_debug %endif gzip -n -k -9 %buildroot/$vmlinux + if test -e %buildroot/$vmlinux.save; then + mv -f %buildroot/$vmlinux{.save,} + fi ghost_vmlinux=true else ghost_vmlinux=false diff --git a/kernel-default.changes b/kernel-default.changes index 87814051..19558eff 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-default.spec b/kernel-default.spec index 8dd5b6d4..574ec392 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -61,15 +61,17 @@ License: GPL-2.0 Group: System/Kernel Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif Url: http://www.kernel.org/ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +%if 0%{?suse_version} > 1310 BuildRequires: hmaccalc +%endif BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -559,6 +561,7 @@ add_vmlinux() # reasonably small local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) + cp %buildroot/$vmlinux{,.save} objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -569,6 +572,9 @@ add_vmlinux() rm -f %buildroot/$vmlinux_debug %endif gzip -n -k -9 %buildroot/$vmlinux + if test -e %buildroot/$vmlinux.save; then + mv -f %buildroot/$vmlinux{.save,} + fi ghost_vmlinux=true else ghost_vmlinux=false diff --git a/kernel-desktop.changes b/kernel-desktop.changes index 87814051..19558eff 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-desktop.spec b/kernel-desktop.spec index 6f28cc54..2650e5d8 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -61,15 +61,17 @@ License: GPL-2.0 Group: System/Kernel Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif Url: http://www.kernel.org/ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +%if 0%{?suse_version} > 1310 BuildRequires: hmaccalc +%endif BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -553,6 +555,7 @@ add_vmlinux() # reasonably small local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) + cp %buildroot/$vmlinux{,.save} objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -563,6 +566,9 @@ add_vmlinux() rm -f %buildroot/$vmlinux_debug %endif gzip -n -k -9 %buildroot/$vmlinux + if test -e %buildroot/$vmlinux.save; then + mv -f %buildroot/$vmlinux{.save,} + fi ghost_vmlinux=true else ghost_vmlinux=false diff --git a/kernel-docs.changes b/kernel-docs.changes index 87814051..19558eff 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-docs.spec b/kernel-docs.spec index ee8035cf..7f82cdd1 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -27,9 +27,9 @@ License: GPL-2.0 Group: Documentation/Man Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif BuildRequires: docbook-toys BuildRequires: docbook-utils diff --git a/kernel-ec2.changes b/kernel-ec2.changes index 87814051..19558eff 100644 --- a/kernel-ec2.changes +++ b/kernel-ec2.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-ec2.spec b/kernel-ec2.spec index 756c05b9..a01ea461 100644 --- a/kernel-ec2.spec +++ b/kernel-ec2.spec @@ -61,15 +61,17 @@ License: GPL-2.0 Group: System/Kernel Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif Url: http://www.kernel.org/ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +%if 0%{?suse_version} > 1310 BuildRequires: hmaccalc +%endif BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -543,6 +545,7 @@ add_vmlinux() # reasonably small local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) + cp %buildroot/$vmlinux{,.save} objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -553,6 +556,9 @@ add_vmlinux() rm -f %buildroot/$vmlinux_debug %endif gzip -n -k -9 %buildroot/$vmlinux + if test -e %buildroot/$vmlinux.save; then + mv -f %buildroot/$vmlinux{.save,} + fi ghost_vmlinux=true else ghost_vmlinux=false diff --git a/kernel-exynos.changes b/kernel-exynos.changes index 87814051..19558eff 100644 --- a/kernel-exynos.changes +++ b/kernel-exynos.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-exynos.spec b/kernel-exynos.spec index 635eeabd..f964bcdc 100644 --- a/kernel-exynos.spec +++ b/kernel-exynos.spec @@ -61,15 +61,17 @@ License: GPL-2.0 Group: System/Kernel Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif Url: http://www.kernel.org/ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +%if 0%{?suse_version} > 1310 BuildRequires: hmaccalc +%endif BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -540,6 +542,7 @@ add_vmlinux() # reasonably small local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) + cp %buildroot/$vmlinux{,.save} objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -550,6 +553,9 @@ add_vmlinux() rm -f %buildroot/$vmlinux_debug %endif gzip -n -k -9 %buildroot/$vmlinux + if test -e %buildroot/$vmlinux.save; then + mv -f %buildroot/$vmlinux{.save,} + fi ghost_vmlinux=true else ghost_vmlinux=false diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 87814051..19558eff 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-lpae.spec b/kernel-lpae.spec index 7ed75cfd..e508f46d 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -61,15 +61,17 @@ License: GPL-2.0 Group: System/Kernel Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif Url: http://www.kernel.org/ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +%if 0%{?suse_version} > 1310 BuildRequires: hmaccalc +%endif BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -541,6 +543,7 @@ add_vmlinux() # reasonably small local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) + cp %buildroot/$vmlinux{,.save} objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -551,6 +554,9 @@ add_vmlinux() rm -f %buildroot/$vmlinux_debug %endif gzip -n -k -9 %buildroot/$vmlinux + if test -e %buildroot/$vmlinux.save; then + mv -f %buildroot/$vmlinux{.save,} + fi ghost_vmlinux=true else ghost_vmlinux=false diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index 87814051..19558eff 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index e45794b0..e6603e97 100644 --- a/kernel-obs-build.spec +++ b/kernel-obs-build.spec @@ -47,9 +47,9 @@ License: GPL-2.0 Group: SLES Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif %description diff --git a/kernel-obs-qa-xen.changes b/kernel-obs-qa-xen.changes index 87814051..19558eff 100644 --- a/kernel-obs-qa-xen.changes +++ b/kernel-obs-qa-xen.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-obs-qa-xen.spec b/kernel-obs-qa-xen.spec index acf2d9d7..1065c05c 100644 --- a/kernel-obs-qa-xen.spec +++ b/kernel-obs-qa-xen.spec @@ -38,9 +38,9 @@ License: GPL-2.0 Group: SLES Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif %description diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index 87814051..19558eff 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index a05cd9f2..b6d9c0b7 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -38,9 +38,9 @@ License: GPL-2.0 Group: SLES Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif %description diff --git a/kernel-pae.changes b/kernel-pae.changes index 87814051..19558eff 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-pae.spec b/kernel-pae.spec index d527faf0..c1d5df4f 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -61,15 +61,17 @@ License: GPL-2.0 Group: System/Kernel Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif Url: http://www.kernel.org/ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +%if 0%{?suse_version} > 1310 BuildRequires: hmaccalc +%endif BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -552,6 +554,7 @@ add_vmlinux() # reasonably small local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) + cp %buildroot/$vmlinux{,.save} objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -562,6 +565,9 @@ add_vmlinux() rm -f %buildroot/$vmlinux_debug %endif gzip -n -k -9 %buildroot/$vmlinux + if test -e %buildroot/$vmlinux.save; then + mv -f %buildroot/$vmlinux{.save,} + fi ghost_vmlinux=true else ghost_vmlinux=false diff --git a/kernel-source.changes b/kernel-source.changes index 87814051..19558eff 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-source.spec b/kernel-source.spec index 44cd14ed..0ecbd746 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -32,9 +32,9 @@ License: GPL-2.0 Group: Development/Sources Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif Url: http://www.kernel.org/ AutoReqProv: off diff --git a/kernel-syms.changes b/kernel-syms.changes index 87814051..19558eff 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-syms.spec b/kernel-syms.spec index d3ba9bd6..748d0c97 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -27,9 +27,9 @@ Group: Development/Sources Version: 3.14.5 %if %using_buildservice %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 87814051..19558eff 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 59ed5636..9ef192a6 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -61,15 +61,17 @@ License: GPL-2.0 Group: System/Kernel Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif Url: http://www.kernel.org/ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +%if 0%{?suse_version} > 1310 BuildRequires: hmaccalc +%endif BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -540,6 +542,7 @@ add_vmlinux() # reasonably small local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) + cp %buildroot/$vmlinux{,.save} objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -550,6 +553,9 @@ add_vmlinux() rm -f %buildroot/$vmlinux_debug %endif gzip -n -k -9 %buildroot/$vmlinux + if test -e %buildroot/$vmlinux.save; then + mv -f %buildroot/$vmlinux{.save,} + fi ghost_vmlinux=true else ghost_vmlinux=false diff --git a/kernel-xen.changes b/kernel-xen.changes index 87814051..19558eff 100644 --- a/kernel-xen.changes +++ b/kernel-xen.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 5 15:42:57 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Do not require hmaccalc on 13.1 and earlier +- commit d7a84f7 + +------------------------------------------------------------------- +Wed Jun 4 11:56:58 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Allow find-debuginfo.sh to create vmlinux.debug +- commit 9b3c48f + ------------------------------------------------------------------- Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz diff --git a/kernel-xen.spec b/kernel-xen.spec index ff8788bd..1f25035a 100644 --- a/kernel-xen.spec +++ b/kernel-xen.spec @@ -61,15 +61,17 @@ License: GPL-2.0 Group: System/Kernel Version: 3.14.5 %if 0%{?is_kotd} -Release: .gf973c87 +Release: .gf1c1b51 %else -Release: .gf973c87 +Release: .gf1c1b51 %endif Url: http://www.kernel.org/ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +%if 0%{?suse_version} > 1310 BuildRequires: hmaccalc +%endif BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -546,6 +548,7 @@ add_vmlinux() # reasonably small local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) + cp %buildroot/$vmlinux{,.save} objcopy --only-keep-debug \ %buildroot/$vmlinux \ %buildroot/$vmlinux_debug || : @@ -556,6 +559,9 @@ add_vmlinux() rm -f %buildroot/$vmlinux_debug %endif gzip -n -k -9 %buildroot/$vmlinux + if test -e %buildroot/$vmlinux.save; then + mv -f %buildroot/$vmlinux{.save,} + fi ghost_vmlinux=true else ghost_vmlinux=false diff --git a/source-timestamp b/source-timestamp index 134fd4b9..2aa5df30 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2014-06-04 14:14:16 +0200 -GIT Revision: f973c870694f10ae9b91cfc899c4863972a44a98 +2014-06-05 15:44:09 +0200 +GIT Revision: f1c1b51b9bffc86f6695645ada856c2ac11ca7d0 GIT Branch: stable