File project.diff of Package kernel-desktop
--- kernel-cubox.spec.orig
+++ kernel-cubox.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-cubox
Summary: Kernel for SolidRun Cubox
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -139,7 +141,6 @@ Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
@@ -197,6 +198,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -229,32 +231,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -286,7 +289,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -803,8 +806,8 @@ rm %my_builddir/tmp
Summary: Kernel for SolidRun Cubox - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -840,9 +843,9 @@ This package contains only the base modu
Summary: Kernel for SolidRun Cubox - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -895,8 +898,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-debug.spec.orig
+++ kernel-debug.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -200,6 +202,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -232,32 +235,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -289,7 +293,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -806,8 +810,8 @@ rm %my_builddir/tmp
Summary: A Debug Version of the Kernel - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -843,9 +847,9 @@ This package contains only the base modu
Summary: A Debug Version of the Kernel - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -898,8 +902,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-default.spec.orig
+++ kernel-default.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-default
Summary: The Standard Kernel
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -139,8 +141,10 @@ Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
%ifarch %ix86
-Provides: smp kernel-smp
-Obsoletes: smp kernel-smp
+Provides: kernel-smp
+Provides: smp
+Obsoletes: kernel-smp
+Obsoletes: smp
%endif
%ifarch ia64
Provides: kernel-sn2
@@ -155,8 +159,10 @@ Provides: kernel-64bit
Obsoletes: kernel-64bit
%endif
%ifarch x86_64
-Provides: smp kernel-smp
-Obsoletes: smp kernel-smp
+Provides: kernel-smp
+Provides: smp
+Obsoletes: kernel-smp
+Obsoletes: smp
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
@@ -216,6 +222,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -248,32 +255,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -304,7 +312,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -821,8 +829,8 @@ rm %my_builddir/tmp
Summary: The Standard Kernel - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -857,9 +865,9 @@ This package contains only the base modu
Summary: The Standard Kernel - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -911,8 +919,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-desktop.spec.orig
+++ kernel-desktop.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -139,7 +141,6 @@ Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
@@ -197,6 +198,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -229,32 +231,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -282,7 +285,6 @@ non-executable. Therefore, the PAE kerne
that support it, regardless of the amount of main memory.
%endif
-
%source_timestamp
%prep
if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
@@ -298,7 +300,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -815,8 +817,8 @@ rm %my_builddir/tmp
Summary: Kernel optimized for the desktop - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -844,7 +846,6 @@ that support it, regardless of the amoun
This package contains only the base modules, required in all installs.
-
%source_timestamp
%preun base -f preun-base.sh
@@ -864,9 +865,9 @@ This package contains only the base modu
Summary: Kernel optimized for the desktop - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -895,7 +896,6 @@ that support it, regardless of the amoun
This package contains additional modules not supported by Novell.
-
%source_timestamp
%preun extra -f preun-extra.sh
@@ -931,8 +931,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-docs.spec.orig
+++ kernel-docs.spec
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
%define patchversion 3.7.10
%define variant %{nil}
@@ -24,13 +23,20 @@
Name: kernel-docs
Summary: Kernel Documentation
+License: GPL-2.0
+Group: Documentation/Man
Version: 3.7.10
Release: 0
-BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
+BuildRequires: docbook-toys
+BuildRequires: docbook-utils
+BuildRequires: ghostscript_any
BuildRequires: kernel-source%variant
+BuildRequires: libjpeg-devel
+BuildRequires: texlive
+BuildRequires: transfig
+BuildRequires: xmlto
+BuildRequires: xorg-x11-devel
Url: http://www.kernel.org/
-License: GPL-2.0
-Group: Documentation/Man
Provides: %name = %version-%source_rel
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--- kernel-ec2.spec.orig
+++ kernel-ec2.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -139,7 +141,6 @@ Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
@@ -197,6 +198,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -229,32 +231,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -288,7 +291,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -805,8 +808,8 @@ rm %my_builddir/tmp
Summary: The Amazon EC2 Xen Kernel - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -844,9 +847,9 @@ This package contains only the base modu
Summary: The Amazon EC2 Xen Kernel - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -901,8 +904,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-exynos.spec.orig
+++ kernel-exynos.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-exynos
Summary: Kernel for Samsung's Exynos SoC
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -139,7 +141,6 @@ Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
@@ -197,6 +198,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -229,32 +231,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -285,7 +288,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -802,8 +805,8 @@ rm %my_builddir/tmp
Summary: Kernel for Samsung's Exynos SoC - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -838,9 +841,9 @@ This package contains only the base modu
Summary: Kernel for Samsung's Exynos SoC - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -892,8 +895,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-highbank.spec.orig
+++ kernel-highbank.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-highbank
Summary: Kernel for Calxeda Highbank SoC
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -139,7 +141,6 @@ Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
@@ -197,6 +198,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -229,32 +231,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -285,7 +288,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -802,8 +805,8 @@ rm %my_builddir/tmp
Summary: Kernel for Calxeda Highbank SoC - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -838,9 +841,9 @@ This package contains only the base modu
Summary: Kernel for Calxeda Highbank SoC - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -892,8 +895,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-imx51.spec.orig
+++ kernel-imx51.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-imx51
Summary: Kernel for Freescale's iMX SoC
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -139,7 +141,6 @@ Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
@@ -197,6 +198,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -229,32 +231,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -286,7 +289,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -803,8 +806,8 @@ rm %my_builddir/tmp
Summary: Kernel for Freescale's iMX SoC - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -840,9 +843,9 @@ This package contains only the base modu
Summary: Kernel for Freescale's iMX SoC - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -895,8 +898,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-omap2plus.spec.orig
+++ kernel-omap2plus.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-omap2plus
Summary: Kernel for Texas instrument's OMAP SoC
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -139,7 +141,6 @@ Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
@@ -197,6 +198,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -229,32 +231,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -286,7 +289,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -803,8 +806,8 @@ rm %my_builddir/tmp
Summary: Kernel for Texas instrument's OMAP SoC - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -840,9 +843,9 @@ This package contains only the base modu
Summary: Kernel for Texas instrument's OMAP SoC - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -895,8 +898,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-pae.spec.orig
+++ kernel-pae.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-pae
Summary: Kernel with PAE Support
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -200,6 +202,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -232,32 +235,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -295,7 +299,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -812,8 +816,8 @@ rm %my_builddir/tmp
Summary: Kernel with PAE Support - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -855,9 +859,9 @@ This package contains only the base modu
Summary: Kernel with PAE Support - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -916,8 +920,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-s390.spec.orig
+++ kernel-s390.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-s390
Summary: The Standard Kernel
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -200,6 +202,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -232,32 +235,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -288,7 +292,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -805,8 +809,8 @@ rm %my_builddir/tmp
Summary: The Standard Kernel - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -841,9 +845,9 @@ This package contains only the base modu
Summary: The Standard Kernel - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -895,8 +899,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-source.spec.orig
+++ kernel-source.spec
@@ -14,10 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-# norootforbuild
# icecream 0
+
%define srcversion 3.7
%define patchversion 3.7.10
%define variant %{nil}
@@ -29,18 +28,19 @@
Name: kernel-source
Summary: The Linux Kernel Sources
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: Development/Sources
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
AutoReqProv: off
-BuildRequires: coreutils sed
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: sed
Requires(post): coreutils sed
-Provides: multiversion(kernel)
-Provides: linux
Provides: %name = %version-%source_rel
+Provides: linux
+Provides: multiversion(kernel)
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
@@ -98,6 +98,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -122,8 +123,8 @@ Linux kernel sources with many fixes and
Summary: Development files needed for building kernel modules
Group: Development/Sources
AutoReqProv: off
-Provides: multiversion(kernel)
Provides: kernel-devel%variant = %version-%source_rel
+Provides: multiversion(kernel)
%description -n kernel-devel%variant
Kernel-level headers and Makefiles required for development of
@@ -135,8 +136,8 @@ external kernel modules.
Summary: Vanilla Linux kernel sources with minor build fixes.
Group: Development/Sources
AutoReqProv: off
-Provides: multiversion(kernel)
Provides: %name-vanilla = %version-%source_rel
+Provides: multiversion(kernel)
%description vanilla
Vanilla Linux kernel sources with minor build fixes.
@@ -152,7 +153,7 @@ fi
echo "Symbol(s): %symbols"
# Unpack all sources and patches
-%setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
%build
mkdir -p $RPM_BUILD_ROOT/usr/src
--- kernel-source.spec.in.orig
+++ kernel-source.spec.in
@@ -98,6 +98,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--- kernel-syms.spec.orig
+++ kernel-syms.spec
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
%define variant %{nil}
@@ -23,15 +22,14 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
+License: GPL-2.0
+Group: Development/Sources
Version: 3.7.10
-%if %using_buildservice
Release: 0
+%if %using_buildservice
%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-2.0
-Group: Development/Sources
Url: http://www.kernel.org/
AutoReqProv: off
BuildRequires: coreutils
@@ -71,8 +69,8 @@ Requires: kernel-versatile-devel =
%ifarch %ix86 x86_64
Requires: kernel-xen-devel = %version-%source_rel
%endif
-Provides: multiversion(kernel)
Provides: %name = %version-%source_rel
+Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--- kernel-trace.spec.orig
+++ kernel-trace.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-trace
Summary: The Standard Kernel with Tracing Features
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -208,6 +210,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -240,32 +243,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -296,7 +300,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -813,8 +817,8 @@ rm %my_builddir/tmp
Summary: The Standard Kernel with Tracing Features - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -849,9 +853,9 @@ This package contains only the base modu
Summary: The Standard Kernel with Tracing Features - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -903,8 +907,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-u8500.spec.orig
+++ kernel-u8500.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-u8500
Summary: Kernel for ST-Ericsson's Nova SoC
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -139,7 +141,6 @@ Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
@@ -197,6 +198,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -229,32 +231,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -286,7 +289,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -803,8 +806,8 @@ rm %my_builddir/tmp
Summary: Kernel for ST-Ericsson's Nova SoC - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -840,9 +843,9 @@ This package contains only the base modu
Summary: Kernel for ST-Ericsson's Nova SoC - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -895,8 +898,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-vanilla.spec.orig
+++ kernel-vanilla.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -204,6 +206,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -236,32 +239,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -292,7 +296,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -809,8 +813,8 @@ rm %my_builddir/tmp
Summary: The Standard Kernel - without any SUSE patches - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -845,9 +849,9 @@ This package contains only the base modu
Summary: The Standard Kernel - without any SUSE patches - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -899,8 +903,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-versatile.spec.orig
+++ kernel-versatile.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-versatile
Summary: Kernel for Versatile SoC
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -139,7 +141,6 @@ Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
@@ -197,6 +198,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -229,32 +231,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -285,7 +288,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -802,8 +805,8 @@ rm %my_builddir/tmp
Summary: Kernel for Versatile SoC - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -838,9 +841,9 @@ This package contains only the base modu
Summary: Kernel for Versatile SoC - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -892,8 +895,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- kernel-xen.spec.orig
+++ kernel-xen.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
@@ -59,18 +59,20 @@
Name: kernel-xen
Summary: The Xen Kernel
-Version: 3.7.10
-Release: 0
License: GPL-2.0
Group: System/Kernel
+Version: 3.7.10
+Release: 0
Url: http://www.kernel.org/
-BuildRequires: coreutils module-init-tools sparse
+BuildRequires: coreutils
BuildRequires: fdupes
+BuildRequires: module-init-tools
+BuildRequires: sparse
# Used to sign the kernel in the buildservice
BuildRequires: pesign-obs-integration
-Provides: multiversion(kernel)
-Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
+Provides: %{name}_%_target_cpu = %version-%release
+Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
@@ -139,7 +141,6 @@ Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
@@ -197,6 +198,7 @@ Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
+Source114: patches.aufs.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -229,32 +231,33 @@ NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
+NoSource: 114
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
-Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
+Obsoletes: iwlwifi-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
+Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: atl2-kmp-%build_flavor
-Obsoletes: wlan-ng-kmp-%build_flavor
+Obsoletes: btusb-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
-Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
-Obsoletes: btusb-kmp-%build_flavor
+Obsoletes: wlan-ng-kmp-%build_flavor
# sle11-ga
+Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
-Obsoletes: brocade-bfa-kmp-%build_flavor
-Obsoletes: kvm-kmp-%build_flavor
-Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: kvm-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
+Obsoletes: perfmon-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
@@ -288,7 +291,7 @@ if test -e %_sourcedir/extra-symbols; th
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -805,8 +808,8 @@ rm %my_builddir/tmp
Summary: The Xen Kernel - base modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
+Provides: multiversion(kernel)
Conflicts: %name = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -844,9 +847,9 @@ This package contains only the base modu
Summary: The Xen Kernel - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
-Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
+Provides: multiversion(kernel)
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
@@ -901,8 +904,8 @@ kmsg message documentation comments.
%package devel
Summary: Development files necessary for building kernel modules
Group: Development/Sources
-Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
+Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
PreReq: coreutils
--- series.conf.orig
+++ series.conf
@@ -591,6 +591,12 @@
# Staging tree patches
# new drivers that are going upstream
########################################################
+
+ ########################################################
+ # aufs
+ ########################################################
+ patches.aufs/aufs3-base.patch
+ patches.aufs/aufs3-standalone.patch
########################################################
# You'd better have a good reason for adding a patch
