Accepting request 89038 from Kernel:HEAD

- bootsplash: fix logo location when a splash image with an off-center
  logo is rescaled (bnc #722471).
- commit f6d77d4

-Update to 3.1-rc10.
- commit 239957e

- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5

- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
  requirements.
- commit aebe2d9

OBS-URL: https://build.opensuse.org/request/show/89038
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=157
This commit is contained in:
Stephan Kulow 2011-10-24 11:41:52 +00:00 committed by Git OBS Bridge
commit 0e5886c6a6
38 changed files with 538 additions and 237 deletions

View File

@ -1,5 +1,5 @@
# The version of the main tarball to use # The version of the main tarball to use
SRCVERSION=3.1-rc9 SRCVERSION=3.1-rc10
# variant of the kernel-source package, either empty or "-rt" # variant of the kernel-source package, either empty or "-rt"
VARIANT= VARIANT=
# buildservice projects to build the kernel against # buildservice projects to build the kernel against

View File

@ -1,7 +1,7 @@
# #
# spec file for package kernel-@FLAVOR@ (Version @RPMVERSION@) # spec file for package kernel-@FLAVOR@
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) @YEAR@ SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -56,15 +56,10 @@
Name: kernel-@FLAVOR@ Name: kernel-@FLAVOR@
Summary: @SUMMARY@ Summary: @SUMMARY@
Version: @RPMVERSION@ Version: @RPMVERSION@
%if %using_buildservice Release: @RELEASE@
Release: @RELEASE_PREFIX@<RELEASE>
%else
Release: @RELEASE_PREFIX@0
%endif
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: multiversion(kernel) Provides: multiversion(kernel)
@ -176,8 +171,8 @@ Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
%description %description
@DESCRIPTION@ @DESCRIPTION@
%source_timestamp
%source_timestamp
%prep %prep
if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
echo "The %name-%version.nosrc.rpm package does not contain the" \ echo "The %name-%version.nosrc.rpm package does not contain the" \
@ -304,7 +299,6 @@ fi
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif %endif
%install %install
# get rid of /usr/lib/rpm/brp-strip-debug # get rid of /usr/lib/rpm/brp-strip-debug
@ -437,7 +431,6 @@ for sub in '-base' '' '-extra'; do
done done
done done
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 %if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh # keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor suffix=-%build_flavor
@ -653,14 +646,18 @@ rm %my_builddir/tmp
%fdupes $RPM_BUILD_ROOT/lib %fdupes $RPM_BUILD_ROOT/lib
%preun -f preun.sh %preun -f preun.sh
%postun -f postun.sh %postun -f postun.sh
%pre -f pre.sh %pre -f pre.sh
%post -f post.sh %post -f post.sh
%if %split_base %if %split_base
%files -f kernel-main.files %files -f kernel-main.files
%else %else
%files -f kernel-base.files %files -f kernel-base.files
%endif %endif
%defattr(-, root, root) %defattr(-, root, root)
@ -670,7 +667,6 @@ Summary: @SUMMARY@ - base modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -686,14 +682,18 @@ Conflicts: libc.so.6()(64bit)
This package contains only the base modules, required in all installs. This package contains only the base modules, required in all installs.
%source_timestamp
%source_timestamp
%preun base -f preun-base.sh %preun base -f preun-base.sh
%postun base -f postun-base.sh %postun base -f postun-base.sh
%pre base -f pre-base.sh %pre base -f pre-base.sh
%post base -f post-base.sh %post base -f post-base.sh
%if %split_base %if %split_base
%files base -f kernel-base.files %files base -f kernel-base.files
%defattr(-, root, root) %defattr(-, root, root)
%endif %endif
@ -703,7 +703,6 @@ Summary: @SUMMARY@ - Unsupported kernel modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel Provides: kernel-extra = %version-%source_rel
@ -722,19 +721,24 @@ Conflicts: libc.so.6()(64bit)
This package contains additional modules not supported by Novell. This package contains additional modules not supported by Novell.
%source_timestamp
%source_timestamp
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
%postun extra -f postun-extra.sh %postun extra -f postun-extra.sh
%pre extra -f pre-extra.sh %pre extra -f pre-extra.sh
%post extra -f post-extra.sh %post extra -f post-extra.sh
%if %split_extra %if %split_extra
%files extra -f kernel-extra.files %files extra -f kernel-extra.files
%defattr(-, root, root) %defattr(-, root, root)
%endif %endif
%if %CONFIG_KMSG_IDS == "y" %if %CONFIG_KMSG_IDS == "y"
%package man %package man
Summary: The collection of man pages generated by the kmsg script. Summary: The collection of man pages generated by the kmsg script.
License: GPL v2 only License: GPL v2 only
@ -744,8 +748,8 @@ Group: System/Kernel
This package includes the man pages that have been generated from the This package includes the man pages that have been generated from the
kmsg message documentation comments. kmsg message documentation comments.
%source_timestamp
%source_timestamp
%files man %files man
%defattr(-,root,root) %defattr(-,root,root)
/usr/share/man/man9/* /usr/share/man/man9/*
@ -759,17 +763,19 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant) Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel %description devel
This package contains files necessary for building kernel modules (and This package contains files necessary for building kernel modules (and
kernel module packages) against the %build_flavor flavor of the kernel. kernel module packages) against the %build_flavor flavor of the kernel.
%source_timestamp
%source_timestamp
%if %CONFIG_MODULES == "y" %if %CONFIG_MODULES == "y"
%pre devel -f devel-pre.sh %pre devel -f devel-pre.sh
%post devel -f devel-post.sh %post devel -f devel-post.sh
%files devel -f kernel-devel.files %files devel -f kernel-devel.files
%defattr(-,root,root) %defattr(-,root,root)
%dir %obj_install_dir %dir %obj_install_dir
@ -793,8 +799,8 @@ Group: Development/Debug
%description devel-debuginfo %description devel-debuginfo
Debug information for package %name-devel Debug information for package %name-devel
%source_timestamp
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files %files devel-debuginfo -f vmlinux.debug.files
%changelog %changelog

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Oct 20 10:02:15 CEST 2011 - eich@suse.de
- bootsplash: fix logo location when a splash image with an off-center
logo is rescaled (bnc #722471).
- commit f6d77d4
-------------------------------------------------------------------
Tue Oct 18 23:44:16 CEST 2011 - jeffm@suse.com
-Update to 3.1-rc10.
- commit 239957e
-------------------------------------------------------------------
Fri Oct 14 14:23:02 CEST 2011 - trenn@suse.de
- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5
-------------------------------------------------------------------
Fri Oct 14 12:19:06 CEST 2011 - mmarek@suse.cz
- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
requirements.
- commit aebe2d9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de
@ -85,7 +111,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include - rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling %_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs. userspace programs.
- commit 1de2384 - rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
in userspace programs, so that they keep working on older systems.
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs.
- commit e3c78cf
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com

View File

@ -17,8 +17,8 @@
# norootforbuild # norootforbuild
%define srcversion 3.1-rc9 %define srcversion 3.1-rc10
%define patchversion 3.1.0-rc9 %define patchversion 3.1.0-rc10
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -55,15 +55,11 @@
Name: kernel-debug Name: kernel-debug
Summary: A Debug Version of the Kernel Summary: A Debug Version of the Kernel
Version: 3.1.rc9 Version: 3.1.rc10
Release: <RELEASE> Release: 0
%if %using_buildservice
%else
%endif
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: multiversion(kernel) Provides: multiversion(kernel)
@ -749,7 +745,6 @@ Summary: A Debug Version of the Kernel - base modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -787,7 +782,6 @@ Summary: A Debug Version of the Kernel - Unsupported kernel modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel Provides: kernel-extra = %version-%source_rel
@ -849,7 +843,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant) Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel %description devel
This package contains files necessary for building kernel modules (and This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Oct 20 10:02:15 CEST 2011 - eich@suse.de
- bootsplash: fix logo location when a splash image with an off-center
logo is rescaled (bnc #722471).
- commit f6d77d4
-------------------------------------------------------------------
Tue Oct 18 23:44:16 CEST 2011 - jeffm@suse.com
-Update to 3.1-rc10.
- commit 239957e
-------------------------------------------------------------------
Fri Oct 14 14:23:02 CEST 2011 - trenn@suse.de
- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5
-------------------------------------------------------------------
Fri Oct 14 12:19:06 CEST 2011 - mmarek@suse.cz
- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
requirements.
- commit aebe2d9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de
@ -85,7 +111,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include - rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling %_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs. userspace programs.
- commit 1de2384 - rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
in userspace programs, so that they keep working on older systems.
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs.
- commit e3c78cf
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com

View File

@ -17,8 +17,8 @@
# norootforbuild # norootforbuild
%define srcversion 3.1-rc9 %define srcversion 3.1-rc10
%define patchversion 3.1.0-rc9 %define patchversion 3.1.0-rc10
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -55,15 +55,11 @@
Name: kernel-default Name: kernel-default
Summary: The Standard Kernel Summary: The Standard Kernel
Version: 3.1.rc9 Version: 3.1.rc10
Release: <RELEASE> Release: 0
%if %using_buildservice
%else
%endif
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: multiversion(kernel) Provides: multiversion(kernel)
@ -764,7 +760,6 @@ Summary: The Standard Kernel - base modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -801,7 +796,6 @@ Summary: The Standard Kernel - Unsupported kernel modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel Provides: kernel-extra = %version-%source_rel
@ -862,7 +856,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant) Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel %description devel
This package contains files necessary for building kernel modules (and This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Oct 20 10:02:15 CEST 2011 - eich@suse.de
- bootsplash: fix logo location when a splash image with an off-center
logo is rescaled (bnc #722471).
- commit f6d77d4
-------------------------------------------------------------------
Tue Oct 18 23:44:16 CEST 2011 - jeffm@suse.com
-Update to 3.1-rc10.
- commit 239957e
-------------------------------------------------------------------
Fri Oct 14 14:23:02 CEST 2011 - trenn@suse.de
- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5
-------------------------------------------------------------------
Fri Oct 14 12:19:06 CEST 2011 - mmarek@suse.cz
- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
requirements.
- commit aebe2d9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de
@ -85,7 +111,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include - rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling %_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs. userspace programs.
- commit 1de2384 - rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
in userspace programs, so that they keep working on older systems.
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs.
- commit e3c78cf
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com

View File

@ -17,8 +17,8 @@
# norootforbuild # norootforbuild
%define srcversion 3.1-rc9 %define srcversion 3.1-rc10
%define patchversion 3.1.0-rc9 %define patchversion 3.1.0-rc10
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -55,15 +55,11 @@
Name: kernel-desktop Name: kernel-desktop
Summary: Kernel optimized for the desktop Summary: Kernel optimized for the desktop
Version: 3.1.rc9 Version: 3.1.rc10
Release: <RELEASE> Release: 0
%if %using_buildservice
%else
%endif
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: multiversion(kernel) Provides: multiversion(kernel)
@ -131,6 +127,7 @@ Conflicts: libc.so.6()(64bit)
%endif %endif
Provides: kernel = %version-%source_rel Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source2: source-post.sh Source2: source-post.sh
Source3: kernel-source.rpmlintrc Source3: kernel-source.rpmlintrc
@ -261,8 +258,8 @@ non-executable. Therefore, the PAE kernel should be used on any systems
that support it, regardless of the amount of main memory. that support it, regardless of the amount of main memory.
%endif %endif
%source_timestamp
%source_timestamp
%prep %prep
if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
echo "The %name-%version.nosrc.rpm package does not contain the" \ echo "The %name-%version.nosrc.rpm package does not contain the" \
@ -757,7 +754,6 @@ Summary: Kernel optimized for the desktop - base modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -786,8 +782,8 @@ that support it, regardless of the amount of main memory.
This package contains only the base modules, required in all installs. This package contains only the base modules, required in all installs.
%source_timestamp
%source_timestamp
%preun base -f preun-base.sh %preun base -f preun-base.sh
%postun base -f postun-base.sh %postun base -f postun-base.sh
@ -807,7 +803,6 @@ Summary: Kernel optimized for the desktop - Unsupported kernel modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel Provides: kernel-extra = %version-%source_rel
@ -839,8 +834,8 @@ that support it, regardless of the amount of main memory.
This package contains additional modules not supported by Novell. This package contains additional modules not supported by Novell.
%source_timestamp
%source_timestamp
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
%postun extra -f postun-extra.sh %postun extra -f postun-extra.sh
@ -881,7 +876,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant) Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel %description devel
This package contains files necessary for building kernel modules (and This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Oct 20 10:02:15 CEST 2011 - eich@suse.de
- bootsplash: fix logo location when a splash image with an off-center
logo is rescaled (bnc #722471).
- commit f6d77d4
-------------------------------------------------------------------
Tue Oct 18 23:44:16 CEST 2011 - jeffm@suse.com
-Update to 3.1-rc10.
- commit 239957e
-------------------------------------------------------------------
Fri Oct 14 14:23:02 CEST 2011 - trenn@suse.de
- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5
-------------------------------------------------------------------
Fri Oct 14 12:19:06 CEST 2011 - mmarek@suse.cz
- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
requirements.
- commit aebe2d9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de
@ -85,7 +111,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include - rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling %_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs. userspace programs.
- commit 1de2384 - rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
in userspace programs, so that they keep working on older systems.
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs.
- commit e3c78cf
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com

View File

@ -17,24 +17,20 @@
# norootforbuild # norootforbuild
%define patchversion 3.1.0-rc9 %define patchversion 3.1.0-rc10
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
Name: kernel-docs Name: kernel-docs
Summary: Kernel Documentation Summary: Kernel Documentation
Version: 3.1.rc9 Version: 3.1.rc10
Release: <RELEASE> Release: 0
%if %using_buildservice
%else
%endif
BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
BuildRequires: kernel-source%variant BuildRequires: kernel-source%variant
Url: http://www.kernel.org/ Url: http://www.kernel.org/
License: GPL v2 or later License: GPL v2 or later
Group: Documentation/Man Group: Documentation/Man
AutoReqProv: on
Provides: %name = %version-%source_rel Provides: %name = %version-%source_rel
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -46,6 +42,7 @@ thecurrent kernel sources.
%source_timestamp
%prep %prep
cp -av /etc/texmf/web2c/texmf.cnf . cp -av /etc/texmf/web2c/texmf.cnf .
cat << EOF >> texmf.cnf cat << EOF >> texmf.cnf

View File

@ -1,7 +1,7 @@
# #
# spec file for package kernel-docs@VARIANT@ (Version @RPMVERSION@) # spec file for package kernel-docs@VARIANT@
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) @YEAR@ SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -25,17 +25,12 @@
Name: kernel-docs@VARIANT@ Name: kernel-docs@VARIANT@
Summary: Kernel Documentation Summary: Kernel Documentation
Version: @RPMVERSION@ Version: @RPMVERSION@
%if %using_buildservice Release: @RELEASE@
Release: @RELEASE_PREFIX@<RELEASE>
%else
Release: @RELEASE_PREFIX@0
%endif
BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
BuildRequires: kernel-source%variant BuildRequires: kernel-source%variant
Url: http://www.kernel.org/ Url: http://www.kernel.org/
License: GPL v2 or later License: GPL v2 or later
Group: Documentation/Man Group: Documentation/Man
AutoReqProv: on
Provides: %name = %version-%source_rel Provides: %name = %version-%source_rel
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -47,6 +42,7 @@ thecurrent kernel sources.
%source_timestamp
%prep %prep
cp -av /etc/texmf/web2c/texmf.cnf . cp -av /etc/texmf/web2c/texmf.cnf .
cat << EOF >> texmf.cnf cat << EOF >> texmf.cnf

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Oct 20 10:02:15 CEST 2011 - eich@suse.de
- bootsplash: fix logo location when a splash image with an off-center
logo is rescaled (bnc #722471).
- commit f6d77d4
-------------------------------------------------------------------
Tue Oct 18 23:44:16 CEST 2011 - jeffm@suse.com
-Update to 3.1-rc10.
- commit 239957e
-------------------------------------------------------------------
Fri Oct 14 14:23:02 CEST 2011 - trenn@suse.de
- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5
-------------------------------------------------------------------
Fri Oct 14 12:19:06 CEST 2011 - mmarek@suse.cz
- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
requirements.
- commit aebe2d9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de
@ -85,7 +111,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include - rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling %_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs. userspace programs.
- commit 1de2384 - rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
in userspace programs, so that they keep working on older systems.
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs.
- commit e3c78cf
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com

View File

@ -17,8 +17,8 @@
# norootforbuild # norootforbuild
%define srcversion 3.1-rc9 %define srcversion 3.1-rc10
%define patchversion 3.1.0-rc9 %define patchversion 3.1.0-rc10
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -55,15 +55,11 @@
Name: kernel-ec2 Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel Summary: The Amazon EC2 Xen Kernel
Version: 3.1.rc9 Version: 3.1.rc10
Release: <RELEASE> Release: 0
%if %using_buildservice
%else
%endif
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: multiversion(kernel) Provides: multiversion(kernel)
@ -131,6 +127,7 @@ Conflicts: libc.so.6()(64bit)
%endif %endif
Provides: kernel = %version-%source_rel Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source2: source-post.sh Source2: source-post.sh
Source3: kernel-source.rpmlintrc Source3: kernel-source.rpmlintrc
@ -747,7 +744,6 @@ Summary: The Amazon EC2 Xen Kernel - base modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -787,7 +783,6 @@ Summary: The Amazon EC2 Xen Kernel - Unsupported kernel modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel Provides: kernel-extra = %version-%source_rel
@ -851,7 +846,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant) Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel %description devel
This package contains files necessary for building kernel modules (and This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Oct 20 10:02:15 CEST 2011 - eich@suse.de
- bootsplash: fix logo location when a splash image with an off-center
logo is rescaled (bnc #722471).
- commit f6d77d4
-------------------------------------------------------------------
Tue Oct 18 23:44:16 CEST 2011 - jeffm@suse.com
-Update to 3.1-rc10.
- commit 239957e
-------------------------------------------------------------------
Fri Oct 14 14:23:02 CEST 2011 - trenn@suse.de
- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5
-------------------------------------------------------------------
Fri Oct 14 12:19:06 CEST 2011 - mmarek@suse.cz
- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
requirements.
- commit aebe2d9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de
@ -85,7 +111,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include - rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling %_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs. userspace programs.
- commit 1de2384 - rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
in userspace programs, so that they keep working on older systems.
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs.
- commit e3c78cf
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com

View File

@ -17,8 +17,8 @@
# norootforbuild # norootforbuild
%define srcversion 3.1-rc9 %define srcversion 3.1-rc10
%define patchversion 3.1.0-rc9 %define patchversion 3.1.0-rc10
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -55,15 +55,11 @@
Name: kernel-pae Name: kernel-pae
Summary: Kernel with PAE Support Summary: Kernel with PAE Support
Version: 3.1.rc9 Version: 3.1.rc10
Release: <RELEASE> Release: 0
%if %using_buildservice
%else
%endif
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: multiversion(kernel) Provides: multiversion(kernel)
@ -755,7 +751,6 @@ Summary: Kernel with PAE Support - base modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -799,7 +794,6 @@ Summary: Kernel with PAE Support - Unsupported kernel modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel Provides: kernel-extra = %version-%source_rel
@ -867,7 +861,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant) Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel %description devel
This package contains files necessary for building kernel modules (and This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Oct 20 10:02:15 CEST 2011 - eich@suse.de
- bootsplash: fix logo location when a splash image with an off-center
logo is rescaled (bnc #722471).
- commit f6d77d4
-------------------------------------------------------------------
Tue Oct 18 23:44:16 CEST 2011 - jeffm@suse.com
-Update to 3.1-rc10.
- commit 239957e
-------------------------------------------------------------------
Fri Oct 14 14:23:02 CEST 2011 - trenn@suse.de
- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5
-------------------------------------------------------------------
Fri Oct 14 12:19:06 CEST 2011 - mmarek@suse.cz
- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
requirements.
- commit aebe2d9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de
@ -85,7 +111,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include - rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling %_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs. userspace programs.
- commit 1de2384 - rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
in userspace programs, so that they keep working on older systems.
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs.
- commit e3c78cf
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com

View File

@ -17,8 +17,8 @@
# norootforbuild # norootforbuild
%define srcversion 3.1-rc9 %define srcversion 3.1-rc10
%define patchversion 3.1.0-rc9 %define patchversion 3.1.0-rc10
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -55,15 +55,11 @@
Name: kernel-ppc64 Name: kernel-ppc64
Summary: Kernel for ppc64 Systems Summary: Kernel for ppc64 Systems
Version: 3.1.rc9 Version: 3.1.rc10
Release: <RELEASE> Release: 0
%if %using_buildservice
%else
%endif
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: multiversion(kernel) Provides: multiversion(kernel)
@ -759,7 +755,6 @@ Summary: Kernel for ppc64 Systems - base modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -803,7 +798,6 @@ Summary: Kernel for ppc64 Systems - Unsupported kernel modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel Provides: kernel-extra = %version-%source_rel
@ -871,7 +865,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant) Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel %description devel
This package contains files necessary for building kernel modules (and This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Oct 20 10:02:15 CEST 2011 - eich@suse.de
- bootsplash: fix logo location when a splash image with an off-center
logo is rescaled (bnc #722471).
- commit f6d77d4
-------------------------------------------------------------------
Tue Oct 18 23:44:16 CEST 2011 - jeffm@suse.com
-Update to 3.1-rc10.
- commit 239957e
-------------------------------------------------------------------
Fri Oct 14 14:23:02 CEST 2011 - trenn@suse.de
- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5
-------------------------------------------------------------------
Fri Oct 14 12:19:06 CEST 2011 - mmarek@suse.cz
- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
requirements.
- commit aebe2d9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de
@ -85,7 +111,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include - rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling %_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs. userspace programs.
- commit 1de2384 - rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
in userspace programs, so that they keep working on older systems.
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs.
- commit e3c78cf
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com

View File

@ -17,8 +17,8 @@
# norootforbuild # norootforbuild
%define srcversion 3.1-rc9 %define srcversion 3.1-rc10
%define patchversion 3.1.0-rc9 %define patchversion 3.1.0-rc10
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -55,15 +55,11 @@
Name: kernel-s390 Name: kernel-s390
Summary: The Standard Kernel Summary: The Standard Kernel
Version: 3.1.rc9 Version: 3.1.rc10
Release: <RELEASE> Release: 0
%if %using_buildservice
%else
%endif
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: multiversion(kernel) Provides: multiversion(kernel)
@ -748,7 +744,6 @@ Summary: The Standard Kernel - base modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -785,7 +780,6 @@ Summary: The Standard Kernel - Unsupported kernel modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel Provides: kernel-extra = %version-%source_rel
@ -846,7 +840,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant) Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel %description devel
This package contains files necessary for building kernel modules (and This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Oct 20 10:02:15 CEST 2011 - eich@suse.de
- bootsplash: fix logo location when a splash image with an off-center
logo is rescaled (bnc #722471).
- commit f6d77d4
-------------------------------------------------------------------
Tue Oct 18 23:44:16 CEST 2011 - jeffm@suse.com
-Update to 3.1-rc10.
- commit 239957e
-------------------------------------------------------------------
Fri Oct 14 14:23:02 CEST 2011 - trenn@suse.de
- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5
-------------------------------------------------------------------
Fri Oct 14 12:19:06 CEST 2011 - mmarek@suse.cz
- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
requirements.
- commit aebe2d9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de
@ -85,7 +111,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include - rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling %_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs. userspace programs.
- commit 1de2384 - rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
in userspace programs, so that they keep working on older systems.
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs.
- commit e3c78cf
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com

View File

@ -18,8 +18,8 @@
# norootforbuild # norootforbuild
# icecream 0 # icecream 0
%define srcversion 3.1-rc9 %define srcversion 3.1-rc10
%define patchversion 3.1.0-rc9 %define patchversion 3.1.0-rc10
%define variant %{nil} %define variant %{nil}
%define vanilla_only 0 %define vanilla_only 0
@ -29,11 +29,8 @@
Name: kernel-source Name: kernel-source
Summary: The Linux Kernel Sources Summary: The Linux Kernel Sources
Version: 3.1.rc9 Version: 3.1.rc10
Release: <RELEASE> Release: 0
%if %using_buildservice
%else
%endif
License: GPL v2 only License: GPL v2 only
Group: Development/Sources Group: Development/Sources
Url: http://www.kernel.org/ Url: http://www.kernel.org/

View File

@ -1,7 +1,7 @@
# #
# spec file for package kernel-source@VARIANT@ (Version @RPMVERSION@) # spec file for package kernel-source@VARIANT@
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) @YEAR@ SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -30,11 +30,7 @@
Name: kernel-source@VARIANT@ Name: kernel-source@VARIANT@
Summary: The Linux Kernel Sources Summary: The Linux Kernel Sources
Version: @RPMVERSION@ Version: @RPMVERSION@
%if %using_buildservice Release: @RELEASE@
Release: @RELEASE_PREFIX@<RELEASE>
%else
Release: @RELEASE_PREFIX@0
%endif
License: GPL v2 only License: GPL v2 only
Group: Development/Sources Group: Development/Sources
Url: http://www.kernel.org/ Url: http://www.kernel.org/
@ -119,8 +115,8 @@ Requires: kernel-devel = %version-%release
%description %description
Linux kernel sources with many fixes and improvements. Linux kernel sources with many fixes and improvements.
%source_timestamp
%source_timestamp
%package -n kernel-devel%variant %package -n kernel-devel%variant
Summary: Development files needed for building kernel modules Summary: Development files needed for building kernel modules
License: GPL v2 only License: GPL v2 only
@ -133,8 +129,8 @@ Provides: kernel-devel%variant = %version-%source_rel
Kernel-level headers and Makefiles required for development of Kernel-level headers and Makefiles required for development of
external kernel modules. external kernel modules.
%source_timestamp
%source_timestamp
%package vanilla %package vanilla
Summary: Vanilla Linux kernel sources with minor build fixes. Summary: Vanilla Linux kernel sources with minor build fixes.
License: GPL v2 only License: GPL v2 only
@ -146,8 +142,8 @@ Provides: %name-vanilla = %version-%source_rel
%description vanilla %description vanilla
Vanilla Linux kernel sources with minor build fixes. Vanilla Linux kernel sources with minor build fixes.
%source_timestamp
%source_timestamp
%prep %prep
if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
echo "Please get a copy of linux-%srcversion.tar.bz2 from" \ echo "Please get a copy of linux-%srcversion.tar.bz2 from" \
@ -169,7 +165,6 @@ if test "%srcversion" != "%kernelrelease%variant"; then
mv linux-%srcversion linux-%kernelrelease%variant mv linux-%srcversion linux-%kernelrelease%variant
fi fi
%if %do_vanilla %if %do_vanilla
%if %vanilla_only %if %vanilla_only
mv \ mv \
@ -250,6 +245,7 @@ find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts"
%endif %endif
%if %do_vanilla %if %do_vanilla
%files vanilla %files vanilla
%defattr(-, root, root) %defattr(-, root, root)
/usr/src/linux-%kernelrelease-vanilla /usr/src/linux-%kernelrelease-vanilla

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Oct 20 10:02:15 CEST 2011 - eich@suse.de
- bootsplash: fix logo location when a splash image with an off-center
logo is rescaled (bnc #722471).
- commit f6d77d4
-------------------------------------------------------------------
Tue Oct 18 23:44:16 CEST 2011 - jeffm@suse.com
-Update to 3.1-rc10.
- commit 239957e
-------------------------------------------------------------------
Fri Oct 14 14:23:02 CEST 2011 - trenn@suse.de
- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5
-------------------------------------------------------------------
Fri Oct 14 12:19:06 CEST 2011 - mmarek@suse.cz
- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
requirements.
- commit aebe2d9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de
@ -85,7 +111,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include - rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling %_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs. userspace programs.
- commit 1de2384 - rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
in userspace programs, so that they keep working on older systems.
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs.
- commit e3c78cf
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com

View File

@ -23,11 +23,12 @@
Name: kernel-syms Name: kernel-syms
Summary: Kernel Symbol Versions (modversions) Summary: Kernel Symbol Versions (modversions)
Version: 3.1.rc9 Version: 3.1.rc10
Release: <RELEASE>
%if %using_buildservice %if %using_buildservice
Release: 0
%else %else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) %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
%endif %endif
License: GPL v2 only License: GPL v2 only
Group: Development/Sources Group: Development/Sources

View File

@ -1,7 +1,7 @@
# #
# spec file for package kernel-syms@VARIANT@ (Version @RPMVERSION@) # spec file for package kernel-syms@VARIANT@
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) @YEAR@ SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -25,7 +25,7 @@ Name: kernel-syms@VARIANT@
Summary: Kernel Symbol Versions (modversions) Summary: Kernel Symbol Versions (modversions)
Version: @RPMVERSION@ Version: @RPMVERSION@
%if %using_buildservice %if %using_buildservice
Release: @RELEASE_PREFIX@<RELEASE> Release: @RELEASE@
%else %else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) %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 Release: %kernel_source_release
@ -52,9 +52,10 @@ for the standard kernels.
This package is needed for compiling kernel module packages with proper This package is needed for compiling kernel module packages with proper
package dependencies. package dependencies.
%source_timestamp
%source_timestamp
%prep %prep
%install %install
install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Oct 20 10:02:15 CEST 2011 - eich@suse.de
- bootsplash: fix logo location when a splash image with an off-center
logo is rescaled (bnc #722471).
- commit f6d77d4
-------------------------------------------------------------------
Tue Oct 18 23:44:16 CEST 2011 - jeffm@suse.com
-Update to 3.1-rc10.
- commit 239957e
-------------------------------------------------------------------
Fri Oct 14 14:23:02 CEST 2011 - trenn@suse.de
- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5
-------------------------------------------------------------------
Fri Oct 14 12:19:06 CEST 2011 - mmarek@suse.cz
- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
requirements.
- commit aebe2d9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de
@ -85,7 +111,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include - rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling %_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs. userspace programs.
- commit 1de2384 - rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
in userspace programs, so that they keep working on older systems.
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs.
- commit e3c78cf
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com

View File

@ -17,8 +17,8 @@
# norootforbuild # norootforbuild
%define srcversion 3.1-rc9 %define srcversion 3.1-rc10
%define patchversion 3.1.0-rc9 %define patchversion 3.1.0-rc10
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -55,15 +55,11 @@
Name: kernel-trace Name: kernel-trace
Summary: The Standard Kernel with Tracing Features Summary: The Standard Kernel with Tracing Features
Version: 3.1.rc9 Version: 3.1.rc10
Release: <RELEASE> Release: 0
%if %using_buildservice
%else
%endif
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: multiversion(kernel) Provides: multiversion(kernel)
@ -756,7 +752,6 @@ Summary: The Standard Kernel with Tracing Features - base modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -793,7 +788,6 @@ Summary: The Standard Kernel with Tracing Features - Unsupported kernel m
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel Provides: kernel-extra = %version-%source_rel
@ -854,7 +848,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant) Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel %description devel
This package contains files necessary for building kernel modules (and This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Oct 20 10:02:15 CEST 2011 - eich@suse.de
- bootsplash: fix logo location when a splash image with an off-center
logo is rescaled (bnc #722471).
- commit f6d77d4
-------------------------------------------------------------------
Tue Oct 18 23:44:16 CEST 2011 - jeffm@suse.com
-Update to 3.1-rc10.
- commit 239957e
-------------------------------------------------------------------
Fri Oct 14 14:23:02 CEST 2011 - trenn@suse.de
- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5
-------------------------------------------------------------------
Fri Oct 14 12:19:06 CEST 2011 - mmarek@suse.cz
- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
requirements.
- commit aebe2d9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de
@ -85,7 +111,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include - rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling %_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs. userspace programs.
- commit 1de2384 - rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
in userspace programs, so that they keep working on older systems.
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs.
- commit e3c78cf
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com

View File

@ -17,8 +17,8 @@
# norootforbuild # norootforbuild
%define srcversion 3.1-rc9 %define srcversion 3.1-rc10
%define patchversion 3.1.0-rc9 %define patchversion 3.1.0-rc10
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -55,15 +55,11 @@
Name: kernel-vanilla Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches Summary: The Standard Kernel - without any SUSE patches
Version: 3.1.rc9 Version: 3.1.rc10
Release: <RELEASE> Release: 0
%if %using_buildservice
%else
%endif
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: multiversion(kernel) Provides: multiversion(kernel)
@ -752,7 +748,6 @@ Summary: The Standard Kernel - without any SUSE patches - base modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -789,7 +784,6 @@ Summary: The Standard Kernel - without any SUSE patches - Unsupported ker
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel Provides: kernel-extra = %version-%source_rel
@ -850,7 +844,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant) Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel %description devel
This package contains files necessary for building kernel modules (and This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Oct 20 10:02:15 CEST 2011 - eich@suse.de
- bootsplash: fix logo location when a splash image with an off-center
logo is rescaled (bnc #722471).
- commit f6d77d4
-------------------------------------------------------------------
Tue Oct 18 23:44:16 CEST 2011 - jeffm@suse.com
-Update to 3.1-rc10.
- commit 239957e
-------------------------------------------------------------------
Fri Oct 14 14:23:02 CEST 2011 - trenn@suse.de
- x86: Fix reboot issue for Dell Optiplex 990.
- commit 00ea2b5
-------------------------------------------------------------------
Fri Oct 14 12:19:06 CEST 2011 - mmarek@suse.cz
- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
requirements.
- commit aebe2d9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de Thu Oct 13 21:25:59 CEST 2011 - ohering@suse.de
@ -85,7 +111,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include - rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling %_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs. userspace programs.
- commit 1de2384 - rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
in userspace programs, so that they keep working on older systems.
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
userspace programs.
- commit e3c78cf
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com

View File

@ -17,8 +17,8 @@
# norootforbuild # norootforbuild
%define srcversion 3.1-rc9 %define srcversion 3.1-rc10
%define patchversion 3.1.0-rc9 %define patchversion 3.1.0-rc10
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -55,15 +55,11 @@
Name: kernel-xen Name: kernel-xen
Summary: The Xen Kernel Summary: The Xen Kernel
Version: 3.1.rc9 Version: 3.1.rc10
Release: <RELEASE> Release: 0
%if %using_buildservice
%else
%endif
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes BuildRequires: fdupes
Provides: multiversion(kernel) Provides: multiversion(kernel)
@ -131,6 +127,7 @@ Conflicts: libc.so.6()(64bit)
%endif %endif
Provides: kernel = %version-%source_rel Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source2: source-post.sh Source2: source-post.sh
Source3: kernel-source.rpmlintrc Source3: kernel-source.rpmlintrc
@ -747,7 +744,6 @@ Summary: The Xen Kernel - base modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -787,7 +783,6 @@ Summary: The Xen Kernel - Unsupported kernel modules
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel Provides: kernel-extra = %version-%source_rel
@ -851,7 +846,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant) Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel %description devel
This package contains files necessary for building kernel modules (and This package contains files necessary for building kernel modules (and

3
linux-3.1-rc10.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e3fe1c2e846cd5998cb32c97c81ac330222ac2cb541e47a61abf5bdceabba15
size 77238046

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49085ffec7e42b17381af3ddf61c1255065a933e5e2653465d225e505182a4e9
size 77219486

37
mkspec
View File

@ -29,9 +29,6 @@ my ($srcversion, $variant, $vanilla_only) =
($vars{'SRCVERSION'}, $vars{'VARIANT'}, $vars{'VANILLA_ONLY'}); ($vars{'SRCVERSION'}, $vars{'VARIANT'}, $vars{'VANILLA_ONLY'});
$vanilla_only ||= "0"; $vanilla_only ||= "0";
# rpm changelog
my $changelog = convert_changes();
# package name -> [summary, description] # package name -> [summary, description]
my %binary_descriptions = parse_descriptions(); my %binary_descriptions = parse_descriptions();
@ -52,9 +49,8 @@ if (defined($rpmrelease)) {
close($fh); close($fh);
chmod(0755, "$dir/get_release_number.sh"); chmod(0755, "$dir/get_release_number.sh");
} else { } else {
$rpmrelease = ""; $rpmrelease = "0";
} }
$rpmrelease =~ s/[^.]$/$&./;
$rpmrelease =~ s/-/./g; $rpmrelease =~ s/-/./g;
my $sources = join("", $templates{source} =~ /\nSource\d+:[^\n]*/mg); my $sources = join("", $templates{source} =~ /\nSource\d+:[^\n]*/mg);
@ -75,11 +71,12 @@ my %macros = (
SRCVERSION => $srcversion, SRCVERSION => $srcversion,
PATCHVERSION => $patchversion, PATCHVERSION => $patchversion,
RPMVERSION => $rpmversion, RPMVERSION => $rpmversion,
RELEASE_PREFIX => $rpmrelease, RELEASE => $rpmrelease,
SOURCES => $sources, SOURCES => $sources,
NOSOURCE => $nosource, NOSOURCE => $nosource,
UNPACK_PATCHES => $unpack_patches, UNPACK_PATCHES => $unpack_patches,
SCRIPTS => $scripts, SCRIPTS => $scripts,
YEAR => (localtime time)[5] + 1900,
); );
# binary spec files # binary spec files
@ -180,25 +177,6 @@ sub parse_config_sh {
return %res; return %res;
} }
# convert kernel-source.changes to rpm changelog
sub convert_changes {
my $res = "\%changelog\n";
my @progs = qw(/usr/lib/build/changelog2spec
/work/src/bin/tools/convert_changes_to_rpm_changelog);
my $changesfile = "$dir/kernel-source$variant.changes";
if (-e $changesfile) {
for my $prog (@progs) {
if (-x $prog) {
$res .= `$prog $changesfile`;
last;
}
}
}
chomp $res;
return $res;
}
sub parse_descriptions { sub parse_descriptions {
my %res; my %res;
my $current; my $current;
@ -273,14 +251,6 @@ sub _arch2rpm {
return $arch; return $arch;
} }
sub append_changelog {
my $changelog = $_[1];
if ($_[0] =~ s/\%changelog$/$changelog/) {
return;
}
$_[0] .= $changelog;
}
sub provides_obsoletes { sub provides_obsoletes {
my $flavor = shift; my $flavor = shift;
my @archs = @_; my @archs = @_;
@ -310,7 +280,6 @@ sub do_spec {
for my $m (keys %macros) { for my $m (keys %macros) {
$text =~ s/\@$m\@/$macros{$m}/g; $text =~ s/\@$m\@/$macros{$m}/g;
} }
append_changelog($text, $changelog);
print "$specfile\n"; print "$specfile\n";
xopen(my $fh, '>', "$dir/$specfile"); xopen(my $fh, '>', "$dir/$specfile");
print $fh $text; print $fh $text;

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:2ebdb967856ac0c240facb7e8c715ce48dd7d11768d7074e0ba66413317f0e02 oid sha256:7504875c1bb97601eb56ef79a033bef7b5519e4ed85736c428486eca427507a9
size 73885 size 74096

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:68e34f264be7502e9513a30c002bf2752210beaf5e1035f2c3367ad6880972d4 oid sha256:625b79462eebff090551af183e454e457c00d4048f645a95adb799db4e897d09
size 214600 size 214464

View File

@ -221,6 +221,8 @@
patches.arch/acpica_fix_wrongly_mapped_acpi_table_header_when_overriding_via_initrd.patch patches.arch/acpica_fix_wrongly_mapped_acpi_table_header_when_overriding_via_initrd.patch
patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch
patches.arch/dell_optiplex_990_fix_reboot.patch
######################################################## ########################################################
# CPUFREQ # CPUFREQ
######################################################## ########################################################

View File

@ -1,3 +1,3 @@
2011-10-13 21:25:59 +0200 2011-10-20 10:17:26 +0200
GIT Revision: 11f65b5512da502604a9f942806fa742ecb4294b GIT Revision: f6d77d445d2f3bba72c183ad7a2b5f39495e767d
GIT Branch: master GIT Branch: master