GIT Revision: 9a3bc94376296119957b334bdce69e132206b6d3

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=6913
This commit is contained in:
Michal Marek 2011-02-08 06:03:18 +00:00 committed by Git OBS Bridge
parent 8bba5c86cc
commit 8bcf16698c
31 changed files with 213 additions and 17 deletions

View File

@ -228,7 +228,7 @@ else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -304,7 +304,7 @@ else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@ -865,6 +865,11 @@ Debug information for package %name-devel
%files devel-debuginfo -f vmlinux.debug.files
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -319,7 +319,7 @@ else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@ -878,6 +878,11 @@ Debug information for package %name-devel
%files devel-debuginfo -f vmlinux.debug.files
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -313,7 +313,7 @@ else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@ -898,6 +898,11 @@ Debug information for package %name-devel
%files devel-debuginfo -f vmlinux.debug.files
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -99,6 +99,11 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/doc/kernel
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -302,7 +302,7 @@ else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@ -865,6 +865,11 @@ Debug information for package %name-devel
%files devel-debuginfo -f vmlinux.debug.files
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -310,7 +310,7 @@ else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@ -883,6 +883,11 @@ Debug information for package %name-devel
%files devel-debuginfo -f vmlinux.debug.files
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -314,7 +314,7 @@ else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@ -887,6 +887,11 @@ Debug information for package %name-devel
%files devel-debuginfo -f vmlinux.debug.files
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -303,7 +303,7 @@ else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@ -868,6 +868,11 @@ Debug information for package %name-devel
%files devel-debuginfo -f vmlinux.debug.files
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -303,7 +303,7 @@ else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@ -862,6 +862,11 @@ Debug information for package %name-devel
%files devel-debuginfo -f vmlinux.debug.files
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -245,6 +245,11 @@ popd
%endif
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -5,14 +5,28 @@
%define _buildshell /bin/bash
%define using_buildservice 0%{?opensuse_bs}
# source_rel is the package release string, without the rebuild counter
# generated by the build service. In non-official builds, the upstream
# EXTRAVERSION component is also part of the release string,
# e.g. next.20110101.9.6 (hyphens are replaced by periods). Builds in the
# official distribution projects replace the release string though.
%define source_rel %release
%if %using_buildservice
# The last digit is a volatile rebuild counter, strip it
%define source_rel %(release=%release; echo ${release%.*})
%endif
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
# release_num is the numeric source revision part of the release number,
# i.e. source_rel without the upstream tags like -rcX. A hyphen is added
# automatically for convenient use.
# examples: rc3 -> "", rc3.1 -> -1, next.20110101.9 -> -9
#
# patchversion is inserted into the spec files by the mkspec script, it is the
# upstream release string unchanged, e.g. 2.6.38-rc3
%define release_num %(upstream=%patchversion; upstream=${upstream#%version}; upstream=${upstream#-}; upstream=${upstream//-/.}; rel="%source_rel" ; res="${rel#$upstream}"; res=${res#.}; echo ${res:+-}${res})
# how the kernel release string (uname -r) should look like
%define kernelrelease %patchversion%release_num
%define my_builddir %_builddir/%{name}-%{version}

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -78,6 +78,11 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
%_docdir/%name/README.SUSE
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -311,7 +311,7 @@ else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@ -870,6 +870,11 @@ Debug information for package %name-devel
%files devel-debuginfo -f vmlinux.debug.files
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -307,7 +307,7 @@ else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@ -866,6 +866,11 @@ Debug information for package %name-devel
%files devel-debuginfo -f vmlinux.debug.files
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 7 14:27:36 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %release_major and rename it to %release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
-------------------------------------------------------------------
Fri Feb 4 01:46:21 CET 2011 - jeffm@suse.com

View File

@ -301,7 +301,7 @@ else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@ -862,6 +862,11 @@ Debug information for package %name-devel
%files devel-debuginfo -f vmlinux.debug.files
%changelog
* Mon Feb 07 2011 mmarek@suse.cz
- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
of %%release_major and rename it to %%release_num to better describe
what it does. Add some comments to explain how the versioning works.
- commit 9a3bc94
* Fri Feb 04 2011 jeffm@suse.com
- hfs: avoid crash in hfs_bnode_create (bnc#552250).
- commit d84296a

View File

@ -1,3 +1,3 @@
2011-02-04 01:48:44 +0100
GIT Revision: e4a2bedcea575f221b51b9a0b85954a00870cd3f
2011-02-07 15:11:49 +0100
GIT Revision: 9a3bc94376296119957b334bdce69e132206b6d3
GIT Branch: master