Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at 2011-10-24 13:41:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source", Maintainer is
"kernel-maintain...@forge.provo.novell.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes
2011-10-16 12:55:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes
2011-10-24 13:44:57.000000000 +0200
@@ -1,0 +2,26 @@
+Thu Oct 20 10:02:15 CEST 2011 - e...@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 - je...@suse.com
+
+-Update to 3.1-rc10.
+- commit 239957e
+
+-------------------------------------------------------------------
+Fri Oct 14 14:23:02 CEST 2011 - tr...@suse.de
+
+- x86: Fix reboot issue for Dell Optiplex 990.
+- commit 00ea2b5
+
+-------------------------------------------------------------------
+Fri Oct 14 12:19:06 CEST 2011 - mma...@suse.cz
+
+- rpm/*.spec.in, rpm/mkspec: Generate specfiles according to Factory
+ requirements.
+- commit aebe2d9
+
+-------------------------------------------------------------------
@@ -88 +114,6 @@
-- 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
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-trace.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
Old:
----
linux-3.1-rc9.tar.bz2
New:
----
linux-3.1-rc10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:07.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:07.000000000 +0200
@@ -17,8 +17,8 @@
# norootforbuild
-%define srcversion 3.1-rc9
-%define patchversion 3.1.0-rc9
+%define srcversion 3.1-rc10
+%define patchversion 3.1.0-rc10
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -55,15 +55,11 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
-Version: 3.1.rc9
-Release: <RELEASE>
-%if %using_buildservice
-%else
-%endif
+Version: 3.1.rc10
+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 @@
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 @@
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: %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-default.spec: same change
++++++ kernel-desktop.spec ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:07.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:07.000000000 +0200
@@ -17,8 +17,8 @@
# norootforbuild
-%define srcversion 3.1-rc9
-%define patchversion 3.1.0-rc9
+%define srcversion 3.1-rc10
+%define patchversion 3.1.0-rc10
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -55,15 +55,11 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
-Version: 3.1.rc9
-Release: <RELEASE>
-%if %using_buildservice
-%else
-%endif
+Version: 3.1.rc10
+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 @@
%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 @@
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 @@
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 @@
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 @@
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 @@
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: %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-docs.spec ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -17,24 +17,20 @@
# norootforbuild
-%define patchversion 3.1.0-rc9
+%define patchversion 3.1.0-rc10
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
Name: kernel-docs
Summary: Kernel Documentation
-Version: 3.1.rc9
-Release: <RELEASE>
-%if %using_buildservice
-%else
-%endif
+Version: 3.1.rc10
+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 @@
+%source_timestamp
%prep
cp -av /etc/texmf/web2c/texmf.cnf .
cat << EOF >> texmf.cnf
++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -17,8 +17,8 @@
# norootforbuild
-%define srcversion 3.1-rc9
-%define patchversion 3.1.0-rc9
+%define srcversion 3.1-rc10
+%define patchversion 3.1.0-rc10
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -55,15 +55,11 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
-Version: 3.1.rc9
-Release: <RELEASE>
-%if %using_buildservice
-%else
-%endif
+Version: 3.1.rc10
+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 @@
%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 @@
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 @@
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: %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-pae.spec ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -17,8 +17,8 @@
# norootforbuild
-%define srcversion 3.1-rc9
-%define patchversion 3.1.0-rc9
+%define srcversion 3.1-rc10
+%define patchversion 3.1.0-rc10
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -55,15 +55,11 @@
Name: kernel-pae
Summary: Kernel with PAE Support
-Version: 3.1.rc9
-Release: <RELEASE>
-%if %using_buildservice
-%else
-%endif
+Version: 3.1.rc10
+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 @@
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 @@
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: %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-ppc64.spec: same change
kernel-s390.spec: same change
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -18,8 +18,8 @@
# norootforbuild
# icecream 0
-%define srcversion 3.1-rc9
-%define patchversion 3.1.0-rc9
+%define srcversion 3.1-rc10
+%define patchversion 3.1.0-rc10
%define variant %{nil}
%define vanilla_only 0
@@ -29,11 +29,8 @@
Name: kernel-source
Summary: The Linux Kernel Sources
-Version: 3.1.rc9
-Release: <RELEASE>
-%if %using_buildservice
-%else
-%endif
+Version: 3.1.rc10
+Release: 0
License: GPL v2 only
Group: Development/Sources
Url: http://www.kernel.org/
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -23,11 +23,12 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
-Version: 3.1.rc9
-Release: <RELEASE>
+Version: 3.1.rc10
%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
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -17,8 +17,8 @@
# norootforbuild
-%define srcversion 3.1-rc9
-%define patchversion 3.1.0-rc9
+%define srcversion 3.1-rc10
+%define patchversion 3.1.0-rc10
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -55,15 +55,11 @@
Name: kernel-trace
Summary: The Standard Kernel with Tracing Features
-Version: 3.1.rc9
-Release: <RELEASE>
-%if %using_buildservice
-%else
-%endif
+Version: 3.1.rc10
+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 @@
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 @@
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: %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-vanilla.spec: same change
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -17,8 +17,8 @@
# norootforbuild
-%define srcversion 3.1-rc9
-%define patchversion 3.1.0-rc9
+%define srcversion 3.1-rc10
+%define patchversion 3.1.0-rc10
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -55,15 +55,11 @@
Name: kernel-xen
Summary: The Xen Kernel
-Version: 3.1.rc9
-Release: <RELEASE>
-%if %using_buildservice
-%else
-%endif
+Version: 3.1.rc10
+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 @@
%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 @@
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 @@
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: %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
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -1,5 +1,5 @@
# 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=
# buildservice projects to build the kernel against
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -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 @@
%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 @@
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 @@
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 @@
%fdupes $RPM_BUILD_ROOT/lib
%preun -f preun.sh
+
%postun -f postun.sh
+
%pre -f pre.sh
-%post -f post.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 @@
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 @@
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 @@
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 @@
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 @@
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: %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 @@
%description devel-debuginfo
Debug information for package %name-devel
-%source_timestamp
+%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog
++++++ kernel-docs.spec.in ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -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 @@
+%source_timestamp
%prep
cp -av /etc/texmf/web2c/texmf.cnf .
cat << EOF >> texmf.cnf
++++++ kernel-source.spec.in ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -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 @@
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 @@
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 @@
%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 @@
%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 @@
mv linux-%srcversion linux-%kernelrelease%variant
fi
-
%if %do_vanilla
%if %vanilla_only
mv \
@@ -250,6 +245,7 @@
%endif
%if %do_vanilla
+
%files vanilla
%defattr(-, root, root)
/usr/src/linux-%kernelrelease-vanilla
++++++ kernel-syms.spec.in ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -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 @@
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 @@
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
++++++ linux-3.1-rc9.tar.bz2 -> linux-3.1-rc10.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/kernel-source/linux-3.1-rc9.tar.bz2
/work/SRC/openSUSE:Factory/.kernel-source.new/linux-3.1-rc10.tar.bz2 differ:
char 11, line 1
++++++ mkspec ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -29,9 +29,6 @@
($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 @@
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 @@
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 @@
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 @@
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 @@
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;
++++++ patches.arch.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches.arch/dell_optiplex_990_fix_reboot.patch
new/patches.arch/dell_optiplex_990_fix_reboot.patch
--- old/patches.arch/dell_optiplex_990_fix_reboot.patch 1970-01-01
01:00:00.000000000 +0100
+++ new/patches.arch/dell_optiplex_990_fix_reboot.patch 2011-10-14
14:23:02.000000000 +0200
@@ -0,0 +1,29 @@
+From: Thomas Renninger <tr...@suse.de>
+Subject: x86: Fix reboot issue for Dell Optiplex 990
+References: none
+Patch-Mainline: not yet
+
+---
+ arch/x86/kernel/reboot.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+Index: linux-3.1-rc9-master/arch/x86/kernel/reboot.c
+===================================================================
+--- linux-3.1-rc9-master.orig/arch/x86/kernel/reboot.c
++++ linux-3.1-rc9-master/arch/x86/kernel/reboot.c
+@@ -443,6 +443,15 @@ static struct dmi_system_id __initdata p
+ DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"),
+ },
+ },
++ { /* Handle problems with rebooting on the Latitude E6420. */
++ .callback = set_pci_reboot,
++ .ident = "Dell Optiplex 990",
++ .matches = {
++ /* Found in BIOS version A06 */
++ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
++ DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"),
++ },
++ },
+ { }
+ };
+
++++++ patches.suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches.suse/SUSE-bootsplash
new/patches.suse/SUSE-bootsplash
--- old/patches.suse/SUSE-bootsplash 2011-10-12 21:56:23.000000000 +0200
+++ new/patches.suse/SUSE-bootsplash 2011-10-20 10:17:26.000000000 +0200
@@ -39,7 +39,7 @@
include/linux/bootsplash.h | 85 +
include/linux/console_struct.h | 3
include/linux/fb.h | 4
- 17 files changed, 4351 insertions(+)
+ 17 files changed, 4350 insertions(+)
create mode 100644 drivers/video/bootsplash/Kconfig
create mode 100644 drivers/video/bootsplash/Makefile
create mode 100644 drivers/video/bootsplash/bootsplash.c
@@ -48,8 +48,8 @@
create mode 100644 drivers/video/bootsplash/render.c
create mode 100644 include/linux/bootsplash.h
---- linux-3.1-rc6-master.orig/drivers/tty/n_tty.c
-+++ linux-3.1-rc6-master/drivers/tty/n_tty.c
+--- a/drivers/tty/n_tty.c
++++ b/drivers/tty/n_tty.c
@@ -50,6 +50,8 @@
#include <linux/uaccess.h>
#include <linux/module.h>
@@ -75,8 +75,8 @@
if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) {
retval = -EIO;
break;
---- linux-3.1-rc6-master.orig/drivers/tty/vt/keyboard.c
-+++ linux-3.1-rc6-master/drivers/tty/vt/keyboard.c
+--- a/drivers/tty/vt/keyboard.c
++++ b/drivers/tty/vt/keyboard.c
@@ -43,6 +43,8 @@
#include <linux/notifier.h>
#include <linux/jiffies.h>
@@ -100,8 +100,8 @@
#ifdef CONFIG_SPARC
if (keycode == KEY_A && sparc_l1_a_state) {
sparc_l1_a_state = false;
---- linux-3.1-rc6-master.orig/drivers/tty/vt/vt.c
-+++ linux-3.1-rc6-master/drivers/tty/vt/vt.c
+--- a/drivers/tty/vt/vt.c
++++ b/drivers/tty/vt/vt.c
@@ -4204,6 +4204,35 @@ void vcs_scr_updated(struct vc_data *vc)
notify_update(vc);
}
@@ -138,8 +138,8 @@
/*
* Visible symbols for modules
*/
---- linux-3.1-rc6-master.orig/drivers/video/Kconfig
-+++ linux-3.1-rc6-master/drivers/video/Kconfig
+--- a/drivers/video/Kconfig
++++ b/drivers/video/Kconfig
@@ -2397,4 +2397,8 @@ if FB || SGI_NEWPORT_CONSOLE
source "drivers/video/logo/Kconfig"
endif
@@ -149,8 +149,8 @@
+endif
+
endmenu
---- linux-3.1-rc6-master.orig/drivers/video/Makefile
-+++ linux-3.1-rc6-master/drivers/video/Makefile
+--- a/drivers/video/Makefile
++++ b/drivers/video/Makefile
@@ -14,6 +14,7 @@ fb-objs := $(f
obj-$(CONFIG_VT) += console/
obj-$(CONFIG_LOGO) += logo/
@@ -160,7 +160,7 @@
obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o
obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o
--- /dev/null
-+++ linux-3.1-rc6-master/drivers/video/bootsplash/Kconfig
++++ b/drivers/video/bootsplash/Kconfig
@@ -0,0 +1,17 @@
+#
+# Bootsplash configuration
@@ -180,7 +180,7 @@
+endmenu
+
--- /dev/null
-+++ linux-3.1-rc6-master/drivers/video/bootsplash/Makefile
++++ b/drivers/video/bootsplash/Makefile
@@ -0,0 +1,5 @@
+# Makefile for the Linux bootsplash
+
@@ -188,7 +188,7 @@
+obj-$(CONFIG_BOOTSPLASH) += decode-jpg.o
+obj-$(CONFIG_BOOTSPLASH) += render.o
--- /dev/null
-+++ linux-3.1-rc6-master/drivers/video/bootsplash/bootsplash.c
++++ b/drivers/video/bootsplash/bootsplash.c
@@ -0,0 +1,2473 @@
+/*
+ * linux/drivers/video/bootsplash/bootsplash.c -
@@ -222,7 +222,7 @@
+#include "../console/fbcon.h"
+#include <linux/bootsplash.h>
+#include "decode-jpg.h"
-+
++#define DEBUG
+#ifndef DEBUG
+# define SPLASH_DEBUG(fmt, args...)
+#else
@@ -688,13 +688,13 @@
+ if (screen_w == pic_w)
+ *x_off = 0;
+ else {
-+ if (x_center < (pic_w + pic_w / 10) >> 1
-+ && x_center > (pic_w - pic_w / 10) >> 1) {
++ if (x_center < (pic_w + pic_w / 5) >> 1 &&
++ x_center > (pic_w - pic_w / 5) >> 1) {
+ *x_off = (screen_w - pic_w) >> 1;
+ } else {
+ int x = x_center * screen_w / pic_w;
+ *x_off = x - x_center;
-+ if (x_min + x_off > 0)
++ if (x_min + *x_off < 0)
+ *x_off = 0;
+ if (x_max + *x_off > screen_w)
+ *x_off = screen_w - pic_w;
@@ -703,13 +703,13 @@
+ if (screen_h == pic_h)
+ *y_off = 0;
+ else {
-+ if (y_center < (pic_h + pic_h / 10) >> 1 &&
-+ y_center > (pic_h - pic_h / 10) >> 1)
++ if (y_center < (pic_h + pic_h / 5) >> 1 &&
++ y_center > (pic_h - pic_h / 5) >> 1)
+ *y_off = (screen_h - pic_h) >> 1;
+ else {
+ int x = y_center * screen_h / pic_h;
+ *y_off = x - y_center;
-+ if (y_min + y_off > 0)
++ if (y_min + *y_off < 0)
+ *y_off = 0;
+ if (y_max + *x_off > screen_h)
+ *y_off = screen_h - pic_h;
@@ -2664,7 +2664,7 @@
+ return 0;
+}
--- /dev/null
-+++ linux-3.1-rc6-master/drivers/video/bootsplash/decode-jpg.c
++++ b/drivers/video/bootsplash/decode-jpg.c
@@ -0,0 +1,1045 @@
+/*
+ * linux/drivers/video/bootsplash/decode-jpg.c - a tiny jpeg decoder.
@@ -3712,7 +3712,7 @@
+ }
+}
--- /dev/null
-+++ linux-3.1-rc6-master/drivers/video/bootsplash/decode-jpg.h
++++ b/drivers/video/bootsplash/decode-jpg.h
@@ -0,0 +1,37 @@
+/*
+ * linux/drivers/video/bootsplash/decode-jpg.h - a tiny jpeg decoder.
@@ -3752,7 +3752,7 @@
+
+#endif
--- /dev/null
-+++ linux-3.1-rc6-master/drivers/video/bootsplash/render.c
++++ b/drivers/video/bootsplash/render.c
@@ -0,0 +1,491 @@
+/*
+ * linux/drivers/video/bootsplash/render.c - splash screen render
functions.
@@ -4245,8 +4245,8 @@
+ /* update_screen(vc->vc_num); */
+ }
+}
---- linux-3.1-rc6-master.orig/drivers/video/console/bitblit.c
-+++ linux-3.1-rc6-master/drivers/video/console/bitblit.c
+--- a/drivers/video/console/bitblit.c
++++ b/drivers/video/console/bitblit.c
@@ -19,6 +19,9 @@
#include <asm/types.h>
#include "fbcon.h"
@@ -4320,8 +4320,8 @@
if (info->fbops->fb_cursor)
err = info->fbops->fb_cursor(info, &cursor);
---- linux-3.1-rc6-master.orig/drivers/video/console/fbcon.c
-+++ linux-3.1-rc6-master/drivers/video/console/fbcon.c
+--- a/drivers/video/console/fbcon.c
++++ b/drivers/video/console/fbcon.c
@@ -80,6 +80,7 @@
#include <asm/system.h>
@@ -4451,8 +4451,8 @@
cols /= w;
rows /= h;
vc_resize(vc, cols, rows);
---- linux-3.1-rc6-master.orig/drivers/video/console/fbcon.h
-+++ linux-3.1-rc6-master/drivers/video/console/fbcon.h
+--- a/drivers/video/console/fbcon.h
++++ b/drivers/video/console/fbcon.h
@@ -25,6 +25,53 @@
* low-level frame buffer device
*/
@@ -4508,7 +4508,7 @@
/* Filled in by the low-level console driver */
const u_char *fontdata;
--- /dev/null
-+++ linux-3.1-rc6-master/include/linux/bootsplash.h
++++ b/include/linux/bootsplash.h
@@ -0,0 +1,85 @@
+/*
+ * linux/drivers/video/bootsplash/bootsplash.h - splash screen definition.
@@ -4595,8 +4595,8 @@
+# endif
+
+#endif
---- linux-3.1-rc6-master.orig/include/linux/console_struct.h
-+++ linux-3.1-rc6-master/include/linux/console_struct.h
+--- a/include/linux/console_struct.h
++++ b/include/linux/console_struct.h
@@ -107,6 +107,9 @@ struct vc_data {
unsigned long vc_uni_pagedir;
unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir
variable for this console */
@@ -4607,8 +4607,8 @@
/* additional information is in vt_kern.h */
};
---- linux-3.1-rc6-master.orig/include/linux/fb.h
-+++ linux-3.1-rc6-master/include/linux/fb.h
+--- a/include/linux/fb.h
++++ b/include/linux/fb.h
@@ -878,6 +878,10 @@ struct fb_info {
void *fbcon_par; /* fbcon use-only private area */
/* From here on everything is device dependent */
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -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
########################################################
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.Hc6wsm/_old 2011-10-24 13:45:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Hc6wsm/_new 2011-10-24 13:45:08.000000000 +0200
@@ -1,3 +1,3 @@
-2011-10-13 21:25:59 +0200
-GIT Revision: 11f65b5512da502604a9f942806fa742ecb4294b
+2011-10-20 10:17:26 +0200
+GIT Revision: f6d77d445d2f3bba72c183ad7a2b5f39495e767d
GIT Branch: master
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
