GIT Revision: 00ea2b5681fe1d1f548c5e873b3a9d0ef4c7b829

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7145
This commit is contained in:
Michal Marek 2011-10-15 05:01:43 +00:00 committed by Git OBS Bridge
parent 6a6c76c786
commit 8e1df7838b
34 changed files with 327 additions and 195 deletions

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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
@ -85,7 +98,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
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

View File

@ -56,14 +56,10 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 3.1.rc9
Release: <RELEASE>
%if %using_buildservice
%else
%endif
Release: 0
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: multiversion(kernel)
@ -749,7 +745,6 @@ Summary: A Debug Version of the Kernel - base modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
@ -787,7 +782,6 @@ Summary: A Debug Version of the Kernel - Unsupported kernel modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
@ -849,7 +843,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
@ -85,7 +98,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
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

View File

@ -56,14 +56,10 @@
Name: kernel-default
Summary: The Standard Kernel
Version: 3.1.rc9
Release: <RELEASE>
%if %using_buildservice
%else
%endif
Release: 0
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: multiversion(kernel)
@ -764,7 +760,6 @@ Summary: The Standard Kernel - base modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
@ -801,7 +796,6 @@ Summary: The Standard Kernel - Unsupported kernel modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
@ -862,7 +856,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
@ -85,7 +98,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
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

View File

@ -56,14 +56,10 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
Version: 3.1.rc9
Release: <RELEASE>
%if %using_buildservice
%else
%endif
Release: 0
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: multiversion(kernel)
@ -131,6 +127,7 @@ Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source2: source-post.sh
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.
%endif
%source_timestamp
%source_timestamp
%prep
if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
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
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
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.
%source_timestamp
%source_timestamp
%preun base -f preun-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
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
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.
%source_timestamp
%source_timestamp
%preun extra -f preun-extra.sh
%postun extra -f postun-extra.sh
@ -881,7 +876,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
@ -85,7 +98,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
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

View File

@ -25,16 +25,12 @@
Name: kernel-docs
Summary: Kernel Documentation
Version: 3.1.rc9
Release: <RELEASE>
%if %using_buildservice
%else
%endif
Release: 0
BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
BuildRequires: kernel-source%variant
Url: http://www.kernel.org/
License: GPL v2 or later
Group: Documentation/Man
AutoReqProv: on
Provides: %name = %version-%source_rel
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -46,6 +42,7 @@ thecurrent kernel sources.
%source_timestamp
%prep
cp -av /etc/texmf/web2c/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
# remain the property of their copyright owners, unless otherwise agreed
@ -25,21 +25,16 @@
Name: kernel-docs@VARIANT@
Summary: Kernel Documentation
Version: @RPMVERSION@
%if %using_buildservice
Release: @RELEASE_PREFIX@<RELEASE>
%else
Release: @RELEASE_PREFIX@0
%endif
Release: @RELEASE@
BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
BuildRequires: kernel-source%variant
Url: http://www.kernel.org/
License: GPL v2 or later
Group: Documentation/Man
AutoReqProv: on
Provides: %name = %version-%source_rel
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: kernel-spec-macros
Source: kernel-spec-macros
%description
These are the PDF documents and man pages (section 9) built from
@ -47,6 +42,7 @@ thecurrent kernel sources.
%source_timestamp
%prep
cp -av /etc/texmf/web2c/texmf.cnf .
cat << EOF >> texmf.cnf

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
@ -85,7 +98,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
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

View File

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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
@ -85,7 +98,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
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

View File

@ -56,14 +56,10 @@
Name: kernel-pae
Summary: Kernel with PAE Support
Version: 3.1.rc9
Release: <RELEASE>
%if %using_buildservice
%else
%endif
Release: 0
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: multiversion(kernel)
@ -755,7 +751,6 @@ Summary: Kernel with PAE Support - base modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
@ -799,7 +794,6 @@ Summary: Kernel with PAE Support - Unsupported kernel modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
@ -867,7 +861,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
@ -85,7 +98,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
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

View File

@ -56,14 +56,10 @@
Name: kernel-ppc64
Summary: Kernel for ppc64 Systems
Version: 3.1.rc9
Release: <RELEASE>
%if %using_buildservice
%else
%endif
Release: 0
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: multiversion(kernel)
@ -759,7 +755,6 @@ Summary: Kernel for ppc64 Systems - base modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
@ -803,7 +798,6 @@ Summary: Kernel for ppc64 Systems - Unsupported kernel modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
@ -871,7 +865,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
@ -85,7 +98,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
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

View File

@ -56,14 +56,10 @@
Name: kernel-s390
Summary: The Standard Kernel
Version: 3.1.rc9
Release: <RELEASE>
%if %using_buildservice
%else
%endif
Release: 0
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: multiversion(kernel)
@ -748,7 +744,6 @@ Summary: The Standard Kernel - base modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
@ -785,7 +780,6 @@ Summary: The Standard Kernel - Unsupported kernel modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
AutoReqProv: on
Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
@ -846,7 +840,6 @@ Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
AutoReqProv: on
%description devel
This package contains files necessary for building kernel modules (and

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
@ -85,7 +98,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
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

View File

@ -30,10 +30,7 @@
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 3.1.rc9
Release: <RELEASE>
%if %using_buildservice
%else
%endif
Release: 0
License: GPL v2 only
Group: Development/Sources
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
# remain the property of their copyright owners, unless otherwise agreed
@ -30,11 +30,7 @@
Name: kernel-source@VARIANT@
Summary: The Linux Kernel Sources
Version: @RPMVERSION@
%if %using_buildservice
Release: @RELEASE_PREFIX@<RELEASE>
%else
Release: @RELEASE_PREFIX@0
%endif
Release: @RELEASE@
License: GPL v2 only
Group: Development/Sources
Url: http://www.kernel.org/
@ -61,7 +57,7 @@ Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source39: config-options.changes.txt
@ -107,7 +103,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Prefix: /usr/src
# Source is only complete with devel files.
Requires: kernel-devel = %version-%release
Requires: kernel-devel = %version-%release
%(chmod +x %_sourcedir/{@SCRIPTS@})
@ -119,22 +115,22 @@ Requires: kernel-devel = %version-%release
%description
Linux kernel sources with many fixes and improvements.
%source_timestamp
%source_timestamp
%package -n kernel-devel%variant
Summary: Development files needed for building kernel modules
License: GPL v2 only
Group: Development/Sources
AutoReqProv: off
Provides: multiversion(kernel)
Summary: Development files needed for building kernel modules
License: GPL v2 only
Group: Development/Sources
AutoReqProv: off
Provides: multiversion(kernel)
Provides: kernel-devel%variant = %version-%source_rel
%description -n kernel-devel%variant
Kernel-level headers and Makefiles required for development of
external kernel modules.
%source_timestamp
%source_timestamp
%package vanilla
Summary: Vanilla Linux kernel sources with minor build fixes.
License: GPL v2 only
@ -146,8 +142,8 @@ Provides: %name-vanilla = %version-%source_rel
%description vanilla
Vanilla Linux kernel sources with minor build fixes.
%source_timestamp
%source_timestamp
%prep
if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
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
fi
%if %do_vanilla
%if %vanilla_only
mv \
@ -250,6 +245,7 @@ find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts"
%endif
%if %do_vanilla
%files vanilla
%defattr(-, root, root)
/usr/src/linux-%kernelrelease-vanilla

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
@ -85,7 +98,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
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

View File

@ -24,10 +24,11 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 3.1.rc9
Release: <RELEASE>
%if %using_buildservice
Release: 0
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
Release: %kernel_source_release
%endif
License: GPL v2 only
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
# remain the property of their copyright owners, unless otherwise agreed
@ -25,7 +25,7 @@ Name: kernel-syms@VARIANT@
Summary: Kernel Symbol Versions (modversions)
Version: @RPMVERSION@
%if %using_buildservice
Release: @RELEASE_PREFIX@<RELEASE>
Release: @RELEASE@
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
Release: %kernel_source_release
@ -52,9 +52,10 @@ for the standard kernels.
This package is needed for compiling kernel module packages with proper
package dependencies.
%source_timestamp
%source_timestamp
%prep
%install
install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
@ -85,7 +98,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
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

View File

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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
@ -85,7 +98,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
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

View File

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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
@ -85,7 +98,12 @@ Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Pass -include
%_sourcedir/host-memcpy-hack.h to the compiler when compiling
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

View File

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

37
mkspec
View File

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

View File

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

View File

@ -221,6 +221,8 @@
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/dell_optiplex_990_fix_reboot.patch
########################################################
# CPUFREQ
########################################################

View File

@ -1,3 +1,3 @@
2011-10-13 21:25:59 +0200
GIT Revision: 11f65b5512da502604a9f942806fa742ecb4294b
2011-10-14 14:23:02 +0200
GIT Revision: 00ea2b5681fe1d1f548c5e873b3a9d0ef4c7b829
GIT Branch: master