From 87a6819490fcef1b86d53daf0f64bf2de1544472df86b53dbf769ee70967a966 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Fri, 27 Sep 2013 06:01:32 +0000 Subject: [PATCH] commit 954d4c151bb67f7fe37c3370d00ba803c38947ae OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7627 --- config.conf | 14 +++++++------- config.tar.bz2 | 4 ++-- kernel-cubox.changes | 12 ++++++++++++ kernel-cubox.spec | 2 +- kernel-debug.changes | 12 ++++++++++++ kernel-debug.spec | 4 ++-- kernel-default.changes | 12 ++++++++++++ kernel-default.spec | 12 ++++++++++-- kernel-desktop.changes | 12 ++++++++++++ kernel-desktop.spec | 2 +- kernel-docs.changes | 12 ++++++++++++ kernel-docs.spec | 2 +- kernel-exynos.changes | 12 ++++++++++++ kernel-exynos.spec | 2 +- kernel-lpae.changes | 12 ++++++++++++ kernel-lpae.spec | 2 +- kernel-pae.changes | 12 ++++++++++++ kernel-pae.spec | 2 +- kernel-source.changes | 12 ++++++++++++ kernel-source.spec | 2 +- kernel-syms.changes | 12 ++++++++++++ kernel-syms.spec | 6 +++--- kernel-trace.changes | 12 ++++++++++++ kernel-trace.spec | 8 ++++++-- kernel-vanilla.changes | 12 ++++++++++++ kernel-vanilla.spec | 9 ++++++--- patches.drivers.tar.bz2 | 4 ++-- series.conf | 1 + series.confe | 1 + source-timestamp | 4 ++-- 30 files changed, 193 insertions(+), 32 deletions(-) diff --git a/config.conf b/config.conf index 03173ee4..e855a7eb 100644 --- a/config.conf +++ b/config.conf @@ -17,10 +17,10 @@ +i386 i386/vanilla +i386 -syms i386/trace -#+ia64 ia64/default -#+ia64 -syms ia64/debug -#+ia64 ia64/vanilla -#+ia64 -syms ia64/trace ++ia64 ia64/default ++ia64 -syms ia64/debug ++ia64 ia64/vanilla ++ia64 -syms ia64/trace +x86_64 x86_64/default +x86_64 x86_64/desktop @@ -48,6 +48,6 @@ #+s390 s390/s390 #+s390 -syms s390/trace #+s390 s390/vanilla -#+s390x s390x/default -#+s390x -syms s390x/trace -#+s390x s390x/vanilla ++s390x s390x/default ++s390x -syms s390x/trace ++s390x s390x/vanilla diff --git a/config.tar.bz2 b/config.tar.bz2 index d87ecc0c..f09d3874 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:755a1d1014830e35283f113983abf20504705575cb029db4f78d139bdbf6a114 -size 244539 +oid sha256:e381bfe51e9b5285e77b8cbebd5c78139bee99c6fb187f4d1ba80b42dac955e9 +size 258699 diff --git a/kernel-cubox.changes b/kernel-cubox.changes index 8a97b42d..b98f0ea1 100644 --- a/kernel-cubox.changes +++ b/kernel-cubox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 16:27:42 CEST 2013 - jeffm@suse.com + +- config.conf: Re-enable s390x and ia64 configs +- commit 954d4c1 + +------------------------------------------------------------------- +Thu Sep 26 11:53:35 CEST 2013 - jdelvare@suse.de + +- Build gpio-ucb1400 as a module +- commit fc372c0 + ------------------------------------------------------------------- Wed Sep 25 16:25:49 CEST 2013 - agraf@suse.de diff --git a/kernel-cubox.spec b/kernel-cubox.spec index 2ba8eea6..cf43c6e7 100644 --- a/kernel-cubox.spec +++ b/kernel-cubox.spec @@ -60,7 +60,7 @@ Name: kernel-cubox Summary: Kernel for SolidRun Cubox Version: 3.12.rc2 -Release: .g957e65c +Release: .g954d4c1 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-debug.changes b/kernel-debug.changes index 8a97b42d..b98f0ea1 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 16:27:42 CEST 2013 - jeffm@suse.com + +- config.conf: Re-enable s390x and ia64 configs +- commit 954d4c1 + +------------------------------------------------------------------- +Thu Sep 26 11:53:35 CEST 2013 - jdelvare@suse.de + +- Build gpio-ucb1400 as a module +- commit fc372c0 + ------------------------------------------------------------------- Wed Sep 25 16:25:49 CEST 2013 - agraf@suse.de diff --git a/kernel-debug.spec b/kernel-debug.spec index c756d546..aeedf103 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -60,7 +60,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 3.12.rc2 -Release: .g957e65c +Release: .g954d4c1 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -214,7 +214,7 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 ppc64 x86_64 +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 diff --git a/kernel-default.changes b/kernel-default.changes index 8a97b42d..b98f0ea1 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 16:27:42 CEST 2013 - jeffm@suse.com + +- config.conf: Re-enable s390x and ia64 configs +- commit 954d4c1 + +------------------------------------------------------------------- +Thu Sep 26 11:53:35 CEST 2013 - jdelvare@suse.de + +- Build gpio-ucb1400 as a module +- commit fc372c0 + ------------------------------------------------------------------- Wed Sep 25 16:25:49 CEST 2013 - agraf@suse.de diff --git a/kernel-default.spec b/kernel-default.spec index a184138c..eacc0a22 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -60,7 +60,7 @@ Name: kernel-default Summary: The Standard Kernel Version: 3.12.rc2 -Release: .g957e65c +Release: .g954d4c1 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -152,10 +152,18 @@ Provides: kernel = %version-%source_rel Provides: smp kernel-smp Obsoletes: smp kernel-smp %endif +%ifarch ia64 +Provides: kernel-sn2 +Obsoletes: kernel-sn2 +%endif %ifarch ppc64 Provides: kernel-kdump Obsoletes: kernel-kdump %endif +%ifarch s390x +Provides: kernel-64bit +Obsoletes: kernel-64bit +%endif %ifarch x86_64 Provides: smp kernel-smp Obsoletes: smp kernel-smp @@ -222,7 +230,7 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc ppc64 x86_64 +ExclusiveArch: aarch64 armv6hl armv7hl %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 diff --git a/kernel-desktop.changes b/kernel-desktop.changes index 8a97b42d..b98f0ea1 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 16:27:42 CEST 2013 - jeffm@suse.com + +- config.conf: Re-enable s390x and ia64 configs +- commit 954d4c1 + +------------------------------------------------------------------- +Thu Sep 26 11:53:35 CEST 2013 - jdelvare@suse.de + +- Build gpio-ucb1400 as a module +- commit fc372c0 + ------------------------------------------------------------------- Wed Sep 25 16:25:49 CEST 2013 - agraf@suse.de diff --git a/kernel-desktop.spec b/kernel-desktop.spec index bbb6e396..e55a13a8 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -60,7 +60,7 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop Version: 3.12.rc2 -Release: .g957e65c +Release: .g954d4c1 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-docs.changes b/kernel-docs.changes index 8a97b42d..b98f0ea1 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 16:27:42 CEST 2013 - jeffm@suse.com + +- config.conf: Re-enable s390x and ia64 configs +- commit 954d4c1 + +------------------------------------------------------------------- +Thu Sep 26 11:53:35 CEST 2013 - jdelvare@suse.de + +- Build gpio-ucb1400 as a module +- commit fc372c0 + ------------------------------------------------------------------- Wed Sep 25 16:25:49 CEST 2013 - agraf@suse.de diff --git a/kernel-docs.spec b/kernel-docs.spec index 5bebc52d..eaa20c00 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -25,7 +25,7 @@ Name: kernel-docs Summary: Kernel Documentation Version: 3.12.rc2 -Release: .g957e65c +Release: .g954d4c1 BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant Url: http://www.kernel.org/ diff --git a/kernel-exynos.changes b/kernel-exynos.changes index 8a97b42d..b98f0ea1 100644 --- a/kernel-exynos.changes +++ b/kernel-exynos.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 16:27:42 CEST 2013 - jeffm@suse.com + +- config.conf: Re-enable s390x and ia64 configs +- commit 954d4c1 + +------------------------------------------------------------------- +Thu Sep 26 11:53:35 CEST 2013 - jdelvare@suse.de + +- Build gpio-ucb1400 as a module +- commit fc372c0 + ------------------------------------------------------------------- Wed Sep 25 16:25:49 CEST 2013 - agraf@suse.de diff --git a/kernel-exynos.spec b/kernel-exynos.spec index 7ac84d80..45b7dc2e 100644 --- a/kernel-exynos.spec +++ b/kernel-exynos.spec @@ -60,7 +60,7 @@ Name: kernel-exynos Summary: Kernel for Samsung's Exynos SoC Version: 3.12.rc2 -Release: .g957e65c +Release: .g954d4c1 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 8a97b42d..b98f0ea1 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 16:27:42 CEST 2013 - jeffm@suse.com + +- config.conf: Re-enable s390x and ia64 configs +- commit 954d4c1 + +------------------------------------------------------------------- +Thu Sep 26 11:53:35 CEST 2013 - jdelvare@suse.de + +- Build gpio-ucb1400 as a module +- commit fc372c0 + ------------------------------------------------------------------- Wed Sep 25 16:25:49 CEST 2013 - agraf@suse.de diff --git a/kernel-lpae.spec b/kernel-lpae.spec index 2c71ac47..96013e4c 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -60,7 +60,7 @@ Name: kernel-lpae Summary: Kernel for LPAE enabled systems Version: 3.12.rc2 -Release: .g957e65c +Release: .g954d4c1 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-pae.changes b/kernel-pae.changes index 8a97b42d..b98f0ea1 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 16:27:42 CEST 2013 - jeffm@suse.com + +- config.conf: Re-enable s390x and ia64 configs +- commit 954d4c1 + +------------------------------------------------------------------- +Thu Sep 26 11:53:35 CEST 2013 - jdelvare@suse.de + +- Build gpio-ucb1400 as a module +- commit fc372c0 + ------------------------------------------------------------------- Wed Sep 25 16:25:49 CEST 2013 - agraf@suse.de diff --git a/kernel-pae.spec b/kernel-pae.spec index 063bb3ba..1451311b 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -60,7 +60,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 3.12.rc2 -Release: .g957e65c +Release: .g954d4c1 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ diff --git a/kernel-source.changes b/kernel-source.changes index 8a97b42d..b98f0ea1 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 16:27:42 CEST 2013 - jeffm@suse.com + +- config.conf: Re-enable s390x and ia64 configs +- commit 954d4c1 + +------------------------------------------------------------------- +Thu Sep 26 11:53:35 CEST 2013 - jdelvare@suse.de + +- Build gpio-ucb1400 as a module +- commit fc372c0 + ------------------------------------------------------------------- Wed Sep 25 16:25:49 CEST 2013 - agraf@suse.de diff --git a/kernel-source.spec b/kernel-source.spec index 985790a9..d0e3ef9f 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -30,7 +30,7 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 3.12.rc2 -Release: .g957e65c +Release: .g954d4c1 License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ diff --git a/kernel-syms.changes b/kernel-syms.changes index 8a97b42d..b98f0ea1 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 16:27:42 CEST 2013 - jeffm@suse.com + +- config.conf: Re-enable s390x and ia64 configs +- commit 954d4c1 + +------------------------------------------------------------------- +Thu Sep 26 11:53:35 CEST 2013 - jdelvare@suse.de + +- Build gpio-ucb1400 as a module +- commit fc372c0 + ------------------------------------------------------------------- Wed Sep 25 16:25:49 CEST 2013 - agraf@suse.de diff --git a/kernel-syms.spec b/kernel-syms.spec index fe50efe0..c5efdf1c 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -25,7 +25,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 3.12.rc2 %if %using_buildservice -Release: .g957e65c +Release: .g954d4c1 %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 @@ -38,7 +38,7 @@ BuildRequires: coreutils %ifarch armv7hl Requires: kernel-cubox-devel = %version-%source_rel %endif -%ifarch aarch64 armv6hl armv7hl %ix86 ppc ppc64 x86_64 +%ifarch aarch64 armv6hl armv7hl %ix86 ia64 ppc ppc64 s390x x86_64 Requires: kernel-default-devel = %version-%source_rel %endif %ifarch %ix86 x86_64 @@ -58,7 +58,7 @@ Provides: %name = %version-%source_rel Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 aarch64 armv6hl armv7hl ppc ppc64 x86_64 +ExclusiveArch: %ix86 aarch64 armv6hl armv7hl ia64 ppc ppc64 s390x x86_64 Prefix: /usr/src %description diff --git a/kernel-trace.changes b/kernel-trace.changes index 8a97b42d..b98f0ea1 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 16:27:42 CEST 2013 - jeffm@suse.com + +- config.conf: Re-enable s390x and ia64 configs +- commit 954d4c1 + +------------------------------------------------------------------- +Thu Sep 26 11:53:35 CEST 2013 - jdelvare@suse.de + +- Build gpio-ucb1400 as a module +- commit fc372c0 + ------------------------------------------------------------------- Wed Sep 25 16:25:49 CEST 2013 - agraf@suse.de diff --git a/kernel-trace.spec b/kernel-trace.spec index f27924ab..45e8fde6 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -60,7 +60,7 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features Version: 3.12.rc2 -Release: .g957e65c +Release: .g954d4c1 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -152,6 +152,10 @@ Provides: kernel = %version-%source_rel Provides: kernel-kdump Obsoletes: kernel-kdump %endif +%ifarch s390x +Provides: kernel-64bit +Obsoletes: kernel-64bit +%endif Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh @@ -214,7 +218,7 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 ppc64 x86_64 +ExclusiveArch: %ix86 ia64 ppc64 s390x x86_64 %define kmp_target_cpu %_target_cpu %ifarch %ix86 # Only i386/default supports i586, mark other flavors' packages as i686 diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 8a97b42d..b98f0ea1 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 26 16:27:42 CEST 2013 - jeffm@suse.com + +- config.conf: Re-enable s390x and ia64 configs +- commit 954d4c1 + +------------------------------------------------------------------- +Thu Sep 26 11:53:35 CEST 2013 - jdelvare@suse.de + +- Build gpio-ucb1400 as a module +- commit fc372c0 + ------------------------------------------------------------------- Wed Sep 25 16:25:49 CEST 2013 - agraf@suse.de diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index f568d81f..f0db77f9 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -60,7 +60,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches Version: 3.12.rc2 -Release: .g957e65c +Release: .g954d4c1 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -148,7 +148,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel - +%ifarch s390x +Provides: kernel-64bit +Obsoletes: kernel-64bit +%endif Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh @@ -211,7 +214,7 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 ppc ppc64 x86_64 +ExclusiveArch: %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 diff --git a/patches.drivers.tar.bz2 b/patches.drivers.tar.bz2 index f9c621d1..b8a4c33d 100644 --- a/patches.drivers.tar.bz2 +++ b/patches.drivers.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e4879f3b1103b28f9e6f247d01b8313c6b53ef33d6ee9ef574be5381c5b1569 -size 3435 +oid sha256:586ad7ac24a6642d5d93d16629d5a8f4992ef990186a52f550e79f721ab7aadf +size 3956 diff --git a/series.conf b/series.conf index 700831ca..91a9ff0d 100644 --- a/series.conf +++ b/series.conf @@ -429,6 +429,7 @@ # Needs updating WRT d27769ec (block: add GENHD_FL_NO_PART_SCAN) +hare patches.suse/no-partition-scan + patches.drivers/gpio-ucb1400-can-be-built-as-a-module.patch ######################################################## # Other drivers we have added to the tree diff --git a/series.confe b/series.confe index 19f2850c..5ad6d5d4 100644 --- a/series.confe +++ b/series.confe @@ -429,6 +429,7 @@ # Needs updating WRT d27769ec (block: add GENHD_FL_NO_PART_SCAN) +hare patches.suse/no-partition-scan + patches.drivers/gpio-ucb1400-can-be-built-as-a-module.patch ######################################################## # Other drivers we have added to the tree diff --git a/source-timestamp b/source-timestamp index 8d70ac40..51763f8f 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2013-09-25 16:25:49 +0200 -GIT Revision: 957e65cd70e5666dfef341505d4115f29a7f56d0 +2013-09-26 16:27:42 +0200 +GIT Revision: 954d4c151bb67f7fe37c3370d00ba803c38947ae GIT Branch: master