Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2012-03-02 13:48:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source", Maintainer is "kernel-maintainers@forge.provo.novell.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2012-01-27 15:21:00.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2012-03-02 13:48:35.000000000 +0100
@@ -1,0 +2,113 @@
+Wed Feb 29 15:22:34 CET 2012 - jbeulich@novell.com
+
+- Update Xen patches to 3.3-rc5 and c/s 1157.
+- config.conf: Re-enable Xen configs.
+- Update config files.
+- commit f225622
+
+-------------------------------------------------------------------
+Mon Feb 27 03:38:40 CET 2012 - jeffm@suse.com
+
+- Updated to 3.3-rc5.
+- commit 0b7f048
+
+-------------------------------------------------------------------
+Sun Feb 19 18:00:16 CET 2012 - jeffm@suse.com
+
+- Updated to 3.3-rc4.
+- commit 8831dca
+
+-------------------------------------------------------------------
+Mon Feb 13 19:33:57 CET 2012 - trenn@suse.de
+
+- cpufreq/gx: Fix the compile error.
+- commit 4ba1d8b
+
+-------------------------------------------------------------------
+Mon Feb 13 17:23:49 CET 2012 - mmarek@suse.cz
+
+- nvme: Mark as broken on x86_32.
+- commit 28ad576
+
+-------------------------------------------------------------------
+Sun Feb 12 18:15:10 CET 2012 - trenn@suse.de
+
+- Add driver auto probing for x86 features v4
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- x86/cpu: Fix overrun check in arch_print_cpu_modalias()
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- crypto: Add support for x86 cpuid
+ auto loading for x86 crypto drivers
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- x86/cpu: Clean up modalias feature matching
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- intel-idle: convert to x86_cpu_id auto probing
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- intel_idle: Fix ID for Nehalem-EX Xeon in device ID table
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- HWMON: Convert via-cputemp to x86 cpuid autoprobing
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- powernow-k7: Fix CPU family number
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- ACPI: Load acpi-cpufreq from processor driver automatically
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- intel_idle: Revert change of auto_demotion_flags for Nehalem
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- HWMON: Convert coretemp to x86 cpuid autoprobing
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- powernow-k6: Really enable auto-loading
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- X86: Introduce HW-Pstate scattered cpuid feature
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- cpufreq: Add support for x86 cpuinfo auto loading v4
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- x86: autoload microcode driver on Intel and AMD systems v2
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- CPU: Introduce ARCH_HAS_CPU_AUTOPROBE and X86 parts
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- ACPI: remove duplicated lines of merging
+ problems with acpi_processor_start
+ (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- Update config files.
+- commit 6efe9b5
+
+-------------------------------------------------------------------
+Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
+-default (bnc#745632). KMPs are still built as i586.
+- commit 88a632b
+
+-------------------------------------------------------------------
+Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com
+
+- Update to 3.3-rc3.
+- commit 07ec27c
+
+-------------------------------------------------------------------
+Thu Feb 9 12:53:26 CET 2012 - agraf@suse.de
+
+- armv7l: Update config files.
+- commit d223353
+
+-------------------------------------------------------------------
+Thu Feb 9 12:48:21 CET 2012 - agraf@suse.de
+
+- armv7l: config: integrate bmwiedemann's updates to make it usable
+- commit 76d12ed
+
+-------------------------------------------------------------------
+Tue Feb 7 18:28:41 CET 2012 - jeffm@suse.com
+
+- Update vanilla config files.
+- commit fd3673f
+
+-------------------------------------------------------------------
+Tue Feb 7 18:12:40 CET 2012 - jeffm@suse.com
+
+- Update to 3.3-rc2.
+ - Eliminated 5 patches.
+ - Xen is disabled.
+- commit d017ea1
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-imx51.changes: same change
kernel-omap2plus.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-tegra.changes: same change
kernel-trace.changes: same change
kernel-u8500.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
Old:
----
linux-3.2.tar.bz2
New:
----
linux-3.3-rc5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor debug
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -135,7 +136,7 @@
Obsoletes: kernel-kdump
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -196,6 +197,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc64 x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -627,9 +639,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -906,9 +918,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor default
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-default
Summary: The Standard Kernel
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -151,7 +152,7 @@
Obsoletes: smp kernel-smp
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -212,6 +213,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: armv7l %ix86 ia64 ppc ppc64 s390x x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -642,9 +654,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -919,9 +931,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ kernel-desktop.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor desktop
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -132,7 +133,7 @@
Provides: kernel = %version-%source_rel
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -193,6 +194,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -636,9 +648,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -939,9 +951,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,14 @@
# norootforbuild
-%define patchversion 3.2.0
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
Name: kernel-docs
Summary: Kernel Documentation
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
BuildRequires: kernel-source%variant
++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor ec2
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -132,7 +133,7 @@
Provides: kernel = %version-%source_rel
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -193,6 +194,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -626,9 +638,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -909,9 +921,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ kernel-imx51.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor imx51
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-imx51
Summary: Kernel for Freescale's iMX SoC
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -132,7 +133,7 @@
Provides: kernel = %version-%source_rel
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -193,6 +194,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: armv7l
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -624,9 +636,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ kernel-omap2plus.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor omap2plus
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-omap2plus
Summary: Kernel for Texas instrument's OMAP SoC
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -132,7 +133,7 @@
Provides: kernel = %version-%source_rel
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -193,6 +194,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: armv7l
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -624,9 +636,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor pae
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-pae
Summary: Kernel with PAE Support
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -135,7 +136,7 @@
Obsoletes: kernel-bigsmp
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -196,6 +197,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -633,9 +645,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -924,9 +936,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor ppc64
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-ppc64
Summary: Kernel for ppc64 Systems
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -139,7 +140,7 @@
Obsoletes: kernel-kdump
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -200,6 +201,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc ppc64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -637,9 +649,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -928,9 +940,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor s390
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-s390
Summary: The Standard Kernel
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -135,7 +136,7 @@
Obsoletes: kernel-32bit
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -196,6 +197,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: s390
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -626,9 +638,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100
@@ -18,8 +18,8 @@
# norootforbuild
# icecream 0
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
@@ -29,7 +29,7 @@
Name: kernel-source
Summary: The Linux Kernel Sources
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: Development/Sources
@@ -41,7 +41,7 @@
Provides: multiversion(kernel)
Provides: linux
Provides: %name = %version-%source_rel
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100
@@ -23,7 +23,7 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
-Version: 3.2.0
+Version: 3.3.rc5
%if %using_buildservice
Release: 0
%else
++++++ kernel-tegra.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor tegra
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-tegra
Summary: Kernel for Nvidia's Tegra SoC
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -132,7 +133,7 @@
Provides: kernel = %version-%source_rel
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -193,6 +194,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: armv7l
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -624,9 +636,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor trace
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-trace
Summary: The Standard Kernel with Tracing Features
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -143,7 +144,7 @@
Obsoletes: kernel-64bit
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -204,6 +205,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc64 s390 s390x x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -634,9 +646,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -911,9 +923,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ kernel-u8500.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor u8500
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-u8500
Summary: Kernel for ST-Ericsson's Nova SoC
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -132,7 +133,7 @@
Provides: kernel = %version-%source_rel
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -193,6 +194,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: armv7l
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -624,9 +636,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor vanilla
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -139,7 +140,7 @@
Obsoletes: kernel-64bit
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -200,6 +201,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -630,9 +642,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -907,9 +919,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
# norootforbuild
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor xen
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
Name: kernel-xen
Summary: The Xen Kernel
-Version: 3.2.0
+Version: 3.3.rc5
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -132,7 +133,7 @@
Provides: kernel = %version-%source_rel
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz...
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -193,6 +194,17 @@
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
NoSource: 0
@@ -626,9 +638,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -909,9 +921,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=3.2
+SRCVERSION=3.3-rc5
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against
++++++ config.tar.bz2 ++++++
++++ 32014 lines of diff (skipped)
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100
@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros
%define build_flavor @FLAVOR@
+%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
@@ -134,6 +135,17 @@
@SOURCES@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: @ARCHS@
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch: i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
# These files are found in the kernel-source package:
@NOSOURCE@
@@ -548,9 +560,9 @@
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
- if [ ! -e %rpm_install_dir/%_target_cpu ]; then
- ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
- ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+ if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+ ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+ ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -825,9 +837,9 @@
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
%endif
%endif
++++++ patches.arch.tar.bz2 ++++++
++++ 2417 lines of diff (skipped)
++++++ patches.drivers.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/elousb.patch new/patches.drivers/elousb.patch
--- old/patches.drivers/elousb.patch 2011-11-16 06:32:19.000000000 +0100
+++ new/patches.drivers/elousb.patch 2012-02-07 18:12:40.000000000 +0100
@@ -19,9 +19,9 @@
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1643,6 +1643,8 @@ static const struct hid_device_id hid_ig
- { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },
{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },
{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x0004) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x000a) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_4000U) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_4500U) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
@@ -68,9 +68,9 @@
obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o
obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o
+obj-$(CONFIG_TOUCHSCREEN_ELOUSB) += elousb.o
+ obj-$(CONFIG_TOUCHSCREEN_EGALAX) += egalax_ts.o
obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o
obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o
- obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o
--- /dev/null
+++ b/drivers/input/touchscreen/elousb.c
@@ -0,0 +1,305 @@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/input-Add-LED-support-to-Synaptics-device new/patches.drivers/input-Add-LED-support-to-Synaptics-device
--- old/patches.drivers/input-Add-LED-support-to-Synaptics-device 2011-11-16 06:32:19.000000000 +0100
+++ new/patches.drivers/input-Add-LED-support-to-Synaptics-device 2012-02-07 18:12:40.000000000 +0100
@@ -34,7 +34,7 @@
help
Say Y here if you have a PS/2 mouse connected to your system. This
includes the standard 2 or 3-button PS/2 mouse, as well as PS/2
-@@ -67,6 +68,14 @@ config MOUSE_PS2_SYNAPTICS
+@@ -68,6 +69,14 @@ config MOUSE_PS2_SYNAPTICS
If unsure, say Y.
@@ -51,7 +51,7 @@
default y
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
-@@ -28,6 +28,7 @@
+@@ -29,6 +29,7 @@
#include