From 378b5ddc4c091cc3c639b5dcacc4430c092fb4f1afb2010dbbd349877c65aa54 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Thu, 16 Dec 2010 06:00:42 +0000 Subject: [PATCH] GIT Revision: 0926a180c11c189c5d166ac9687829c78e4e78c6 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=6884 --- kernel-binary.spec.in | 11 ++++++++--- kernel-debug.changes | 9 +++++++++ kernel-debug.spec | 17 ++++++++++++++--- kernel-default.changes | 9 +++++++++ kernel-default.spec | 17 ++++++++++++++--- kernel-desktop.changes | 9 +++++++++ kernel-desktop.spec | 17 ++++++++++++++--- kernel-docs.changes | 9 +++++++++ kernel-docs.spec | 6 ++++++ kernel-ec2.changes | 9 +++++++++ kernel-ec2.spec | 17 ++++++++++++++--- kernel-net.changes | 9 +++++++++ kernel-net.spec | 17 ++++++++++++++--- kernel-pae.changes | 9 +++++++++ kernel-pae.spec | 17 ++++++++++++++--- kernel-ppc64.changes | 9 +++++++++ kernel-ppc64.spec | 17 ++++++++++++++--- kernel-ps3.changes | 9 +++++++++ kernel-ps3.spec | 17 ++++++++++++++--- kernel-s390.changes | 9 +++++++++ kernel-s390.spec | 17 ++++++++++++++--- kernel-source.changes | 9 +++++++++ kernel-source.spec | 6 ++++++ kernel-spec-macros | 3 --- kernel-syms.changes | 9 +++++++++ kernel-syms.spec | 6 ++++++ kernel-trace.changes | 9 +++++++++ kernel-trace.spec | 17 ++++++++++++++--- kernel-vanilla.changes | 9 +++++++++ kernel-vanilla.spec | 17 ++++++++++++++--- kernel-vmi.changes | 9 +++++++++ kernel-vmi.spec | 17 ++++++++++++++--- kernel-xen.changes | 9 +++++++++ kernel-xen.spec | 17 ++++++++++++++--- source-timestamp | 4 ++-- 35 files changed, 354 insertions(+), 47 deletions(-) diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index 846adaa59..89f9d9df4 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -18,7 +18,7 @@ # norootforbuild %define srcversion @SRCVERSION@ -%define patchversion @PATCHVERSION@ +%define kernelrelease @PATCHVERSION@ %define variant @VARIANT@%{nil} %include %_sourcedir/kernel-spec-macros @@ -227,8 +227,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -237,7 +243,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else diff --git a/kernel-debug.changes b/kernel-debug.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-debug.spec b/kernel-debug.spec index 517a9c76f..1598bbe91 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -303,8 +303,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -313,7 +319,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -880,6 +885,7 @@ Debug information for package %name-devel - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -1150,6 +1156,11 @@ Debug information for package %name-devel * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-default.changes b/kernel-default.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-default.spec b/kernel-default.spec index f1098f537..7ba925a83 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -318,8 +318,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -328,7 +334,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -893,6 +898,7 @@ Debug information for package %name-devel - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -1163,6 +1169,11 @@ Debug information for package %name-devel * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-desktop.changes b/kernel-desktop.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-desktop.spec b/kernel-desktop.spec index 9e8525923..913c02983 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -312,8 +312,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -322,7 +328,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -913,6 +918,7 @@ Debug information for package %name-devel - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -1183,6 +1189,11 @@ Debug information for package %name-devel * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-docs.changes b/kernel-docs.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-docs.spec b/kernel-docs.spec index 7e2aab1db..b8e57c3d6 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -114,6 +114,7 @@ rm -rf $RPM_BUILD_ROOT - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -384,6 +385,11 @@ rm -rf $RPM_BUILD_ROOT * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-ec2.changes b/kernel-ec2.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-ec2.changes +++ b/kernel-ec2.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-ec2.spec b/kernel-ec2.spec index 439c01a49..225841a02 100644 --- a/kernel-ec2.spec +++ b/kernel-ec2.spec @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -302,8 +302,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -312,7 +318,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -883,6 +888,7 @@ Debug information for package %name-devel - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -1153,6 +1159,11 @@ Debug information for package %name-devel * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-net.changes b/kernel-net.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-net.changes +++ b/kernel-net.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-net.spec b/kernel-net.spec index 3bbcb52c7..9eb84e945 100644 --- a/kernel-net.spec +++ b/kernel-net.spec @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -301,8 +301,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -311,7 +317,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -880,6 +885,7 @@ Debug information for package %name-devel - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -1150,6 +1156,11 @@ Debug information for package %name-devel * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-pae.changes b/kernel-pae.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-pae.spec b/kernel-pae.spec index 101693a3f..1aaa33c8e 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -309,8 +309,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -319,7 +325,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -898,6 +903,7 @@ Debug information for package %name-devel - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -1168,6 +1174,11 @@ Debug information for package %name-devel * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-ppc64.changes +++ b/kernel-ppc64.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec index c5b2a4767..68286b21d 100644 --- a/kernel-ppc64.spec +++ b/kernel-ppc64.spec @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -313,8 +313,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -323,7 +329,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -902,6 +907,7 @@ Debug information for package %name-devel - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -1172,6 +1178,11 @@ Debug information for package %name-devel * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-ps3.changes b/kernel-ps3.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-ps3.changes +++ b/kernel-ps3.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-ps3.spec b/kernel-ps3.spec index 1d137cb1c..1548a6272 100644 --- a/kernel-ps3.spec +++ b/kernel-ps3.spec @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -302,8 +302,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -312,7 +318,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -883,6 +888,7 @@ Debug information for package %name-devel - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -1153,6 +1159,11 @@ Debug information for package %name-devel * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-s390.changes b/kernel-s390.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-s390.changes +++ b/kernel-s390.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-s390.spec b/kernel-s390.spec index 8564530b6..25fa09b4b 100644 --- a/kernel-s390.spec +++ b/kernel-s390.spec @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -302,8 +302,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -312,7 +318,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -877,6 +882,7 @@ Debug information for package %name-devel - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -1147,6 +1153,11 @@ Debug information for package %name-devel * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-source.changes b/kernel-source.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-source.spec b/kernel-source.spec index 034d392f0..3af8e1aa9 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -258,6 +258,7 @@ popd - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -528,6 +529,11 @@ popd * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-spec-macros b/kernel-spec-macros index f45599500..8458be55d 100644 --- a/kernel-spec-macros +++ b/kernel-spec-macros @@ -11,9 +11,6 @@ %define source_rel %(release=%release; echo ${release%.*}) %endif -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major - %define my_builddir %_builddir/%{name}-%{version} # macro to add the source timestamp to package descriptions diff --git a/kernel-syms.changes b/kernel-syms.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-syms.spec b/kernel-syms.spec index d592a8265..d74c4f198 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -96,6 +96,7 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -366,6 +367,11 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-trace.changes b/kernel-trace.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-trace.spec b/kernel-trace.spec index 490ead566..1d0fd6366 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -310,8 +310,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -320,7 +326,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -885,6 +890,7 @@ Debug information for package %name-devel - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -1155,6 +1161,11 @@ Debug information for package %name-devel * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 3ef35cb18..6a4250e1e 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -306,8 +306,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -316,7 +322,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -881,6 +886,7 @@ Debug information for package %name-devel - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -1151,6 +1157,11 @@ Debug information for package %name-devel * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-vmi.changes b/kernel-vmi.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-vmi.changes +++ b/kernel-vmi.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-vmi.spec b/kernel-vmi.spec index 52cc72e34..0265b2a60 100644 --- a/kernel-vmi.spec +++ b/kernel-vmi.spec @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -300,8 +300,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -310,7 +316,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -877,6 +882,7 @@ Debug information for package %name-devel - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -1147,6 +1153,11 @@ Debug information for package %name-devel * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/kernel-xen.changes b/kernel-xen.changes index ec6e1bf23..c788451c9 100644 --- a/kernel-xen.changes +++ b/kernel-xen.changes @@ -26,6 +26,7 @@ Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com ------------------------------------------------------------------- Thu Dec 9 15:32:30 CET 2010 - mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b @@ -478,6 +479,14 @@ Fri Sep 24 09:54:16 CEST 2010 - jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 + ------------------------------------------------------------------- Thu Sep 23 19:16:00 CEST 2010 - jeffm@suse.de diff --git a/kernel-xen.spec b/kernel-xen.spec index 56179155d..844b4f9c2 100644 --- a/kernel-xen.spec +++ b/kernel-xen.spec @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -302,8 +302,14 @@ if test -e ../config.addon/%cpu_arch_flavor; then else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -312,7 +318,6 @@ fi --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else @@ -883,6 +888,7 @@ Debug information for package %name-devel - commit bef1a0d * Thu Dec 09 2010 mmarek@suse.cz - rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config - commit 149d22b * Thu Dec 09 2010 mmarek@suse.cz - rpm/config.sh: Build against openSUSE:Factory @@ -1153,6 +1159,11 @@ Debug information for package %name-devel * Fri Sep 24 2010 jbeulich@novell.com - Update Xen patches to 2.6.36-rc5 and c/s 1038. - commit 7b86243 +* Thu Sep 23 2010 mmarek@suse.cz +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 * Thu Sep 23 2010 jeffm@suse.de - rose: Fix signedness issues wrt. digi count (CVE-2010-3310 bnc#640721). diff --git a/source-timestamp b/source-timestamp index c25974e71..694e0238c 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2010-12-13 12:17:49 +0100 -GIT Revision: d385dff55766cdd94009a68f87fc4f5f056d415a +2010-12-14 14:33:59 +0100 +GIT Revision: 0926a180c11c189c5d166ac9687829c78e4e78c6 GIT Branch: master