kernelbugs/kernel-source
SHA256
1
0
Fork 0
forked from pool/kernel-source
Code Activity

GIT Revision: 607101db1bcd777530c610daa81bbc716c183f20

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7203
This commit is contained in:
Michal Marek
2012-02-11 06:02:48 +00:00
committed by Git OBS Bridge
parent 608c17b472
commit 04edbc6532
29 changed files with 341 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kernel-binary.spec.in
View File

@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
%define build_flavor @FLAVOR@ %define build_flavor @FLAVOR@
%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
@@ -134,6 +135,17 @@ Provides: kernel = %version-%source_rel
@SOURCES@ @SOURCES@
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: @ARCHS@ ExclusiveArch: @ARCHS@
%define kmp_target_cpu %_target_cpu
%ifarch %ix86
# Only i386/default supports i586, mark other flavors' packages as i686
%if ! %build_default
BuildArch: i686
# KMPs are always built as i586, because rpm does not allow to build
# subpackages for different architectures. Therefore, we change the
# /usr/src/linux-obj/<arch> symlink to i586.
%define kmp_target_cpu i586
%endif
%endif
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
@NOSOURCE@ @NOSOURCE@
@@ -548,9 +560,9 @@ if [ %CONFIG_MODULES = y ]; then
# Some architecture's $(uname -m) output is different from the ARCH # Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi fi
# We were building in %my_builddir/linux-%srcversion, but the sources will # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -825,9 +837,9 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch %if %kmp_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%_target_cpu /usr/src/linux-obj/%kmp_target_cpu
%endif %endif
%endif %endif

7
kernel-debug.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

24
kernel-debug.spec
View File

@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
%define build_flavor debug %define build_flavor debug
%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
@@ -196,6 +197,17 @@ Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2 Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 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
%if ! %build_default
BuildArch: i686
# KMPs are always built as i586, because rpm does not allow to build
# subpackages for different architectures. Therefore, we change the
# /usr/src/linux-obj/<arch> symlink to i586.
%define kmp_target_cpu i586
%endif
%endif
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
NoSource: 0 NoSource: 0
@@ -627,9 +639,9 @@ if [ %CONFIG_MODULES = y ]; then
# Some architecture's $(uname -m) output is different from the ARCH # Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi fi
# We were building in %my_builddir/linux-%srcversion, but the sources will # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -906,9 +918,9 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch %if %kmp_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%_target_cpu /usr/src/linux-obj/%kmp_target_cpu
%endif %endif
%endif %endif

7
kernel-default.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

24
kernel-default.spec
View File

@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
%define build_flavor default %define build_flavor default
%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
@@ -212,6 +213,17 @@ Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2 Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: armv7l %ix86 ia64 ppc ppc64 s390x x86_64 ExclusiveArch: armv7l %ix86 ia64 ppc ppc64 s390x x86_64
%define kmp_target_cpu %_target_cpu
%ifarch %ix86
# Only i386/default supports i586, mark other flavors' packages as i686
%if ! %build_default
BuildArch: i686
# KMPs are always built as i586, because rpm does not allow to build
# subpackages for different architectures. Therefore, we change the
# /usr/src/linux-obj/<arch> symlink to i586.
%define kmp_target_cpu i586
%endif
%endif
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
NoSource: 0 NoSource: 0
@@ -642,9 +654,9 @@ if [ %CONFIG_MODULES = y ]; then
# Some architecture's $(uname -m) output is different from the ARCH # Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi fi
# We were building in %my_builddir/linux-%srcversion, but the sources will # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -919,9 +931,9 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch %if %kmp_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%_target_cpu /usr/src/linux-obj/%kmp_target_cpu
%endif %endif
%endif %endif

7
kernel-desktop.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

24
kernel-desktop.spec
View File

@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
%define build_flavor desktop %define build_flavor desktop
%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
@@ -193,6 +194,17 @@ Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2 Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
%define kmp_target_cpu %_target_cpu
%ifarch %ix86
# Only i386/default supports i586, mark other flavors' packages as i686
%if ! %build_default
BuildArch: i686
# KMPs are always built as i586, because rpm does not allow to build
# subpackages for different architectures. Therefore, we change the
# /usr/src/linux-obj/<arch> symlink to i586.
%define kmp_target_cpu i586
%endif
%endif
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
NoSource: 0 NoSource: 0
@@ -636,9 +648,9 @@ if [ %CONFIG_MODULES = y ]; then
# Some architecture's $(uname -m) output is different from the ARCH # Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi fi
# We were building in %my_builddir/linux-%srcversion, but the sources will # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -939,9 +951,9 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch %if %kmp_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%_target_cpu /usr/src/linux-obj/%kmp_target_cpu
%endif %endif
%endif %endif

7
kernel-docs.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

7
kernel-imx51.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

24
kernel-imx51.spec
View File

@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
%define build_flavor imx51 %define build_flavor imx51
%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
@@ -193,6 +194,17 @@ Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2 Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: armv7l ExclusiveArch: armv7l
%define kmp_target_cpu %_target_cpu
%ifarch %ix86
# Only i386/default supports i586, mark other flavors' packages as i686
%if ! %build_default
BuildArch: i686
# KMPs are always built as i586, because rpm does not allow to build
# subpackages for different architectures. Therefore, we change the
# /usr/src/linux-obj/<arch> symlink to i586.
%define kmp_target_cpu i586
%endif
%endif
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
NoSource: 0 NoSource: 0
@@ -624,9 +636,9 @@ if [ %CONFIG_MODULES = y ]; then
# Some architecture's $(uname -m) output is different from the ARCH # Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi fi
# We were building in %my_builddir/linux-%srcversion, but the sources will # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch %if %kmp_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%_target_cpu /usr/src/linux-obj/%kmp_target_cpu
%endif %endif
%endif %endif

7
kernel-omap2plus.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

24
kernel-omap2plus.spec
View File

@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
%define build_flavor omap2plus %define build_flavor omap2plus
%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
@@ -193,6 +194,17 @@ Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2 Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: armv7l ExclusiveArch: armv7l
%define kmp_target_cpu %_target_cpu
%ifarch %ix86
# Only i386/default supports i586, mark other flavors' packages as i686
%if ! %build_default
BuildArch: i686
# KMPs are always built as i586, because rpm does not allow to build
# subpackages for different architectures. Therefore, we change the
# /usr/src/linux-obj/<arch> symlink to i586.
%define kmp_target_cpu i586
%endif
%endif
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
NoSource: 0 NoSource: 0
@@ -624,9 +636,9 @@ if [ %CONFIG_MODULES = y ]; then
# Some architecture's $(uname -m) output is different from the ARCH # Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi fi
# We were building in %my_builddir/linux-%srcversion, but the sources will # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch %if %kmp_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%_target_cpu /usr/src/linux-obj/%kmp_target_cpu
%endif %endif
%endif %endif

7
kernel-pae.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

24
kernel-pae.spec
View File

@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
%define build_flavor pae %define build_flavor pae
%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
@@ -196,6 +197,17 @@ Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2 Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ExclusiveArch: %ix86
%define kmp_target_cpu %_target_cpu
%ifarch %ix86
# Only i386/default supports i586, mark other flavors' packages as i686
%if ! %build_default
BuildArch: i686
# KMPs are always built as i586, because rpm does not allow to build
# subpackages for different architectures. Therefore, we change the
# /usr/src/linux-obj/<arch> symlink to i586.
%define kmp_target_cpu i586
%endif
%endif
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
NoSource: 0 NoSource: 0
@@ -633,9 +645,9 @@ if [ %CONFIG_MODULES = y ]; then
# Some architecture's $(uname -m) output is different from the ARCH # Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi fi
# We were building in %my_builddir/linux-%srcversion, but the sources will # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -924,9 +936,9 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch %if %kmp_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%_target_cpu /usr/src/linux-obj/%kmp_target_cpu
%endif %endif
%endif %endif

7
kernel-ppc64.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

24
kernel-ppc64.spec
View File

@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
%define build_flavor ppc64 %define build_flavor ppc64
%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
@@ -200,6 +201,17 @@ Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2 Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc ppc64 ExclusiveArch: ppc ppc64
%define kmp_target_cpu %_target_cpu
%ifarch %ix86
# Only i386/default supports i586, mark other flavors' packages as i686
%if ! %build_default
BuildArch: i686
# KMPs are always built as i586, because rpm does not allow to build
# subpackages for different architectures. Therefore, we change the
# /usr/src/linux-obj/<arch> symlink to i586.
%define kmp_target_cpu i586
%endif
%endif
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
NoSource: 0 NoSource: 0
@@ -637,9 +649,9 @@ if [ %CONFIG_MODULES = y ]; then
# Some architecture's $(uname -m) output is different from the ARCH # Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi fi
# We were building in %my_builddir/linux-%srcversion, but the sources will # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -928,9 +940,9 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch %if %kmp_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%_target_cpu /usr/src/linux-obj/%kmp_target_cpu
%endif %endif
%endif %endif

7
kernel-s390.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

24
kernel-s390.spec
View File

@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
%define build_flavor s390 %define build_flavor s390
%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
@@ -196,6 +197,17 @@ Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2 Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: s390 ExclusiveArch: s390
%define kmp_target_cpu %_target_cpu
%ifarch %ix86
# Only i386/default supports i586, mark other flavors' packages as i686
%if ! %build_default
BuildArch: i686
# KMPs are always built as i586, because rpm does not allow to build
# subpackages for different architectures. Therefore, we change the
# /usr/src/linux-obj/<arch> symlink to i586.
%define kmp_target_cpu i586
%endif
%endif
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
NoSource: 0 NoSource: 0
@@ -626,9 +638,9 @@ if [ %CONFIG_MODULES = y ]; then
# Some architecture's $(uname -m) output is different from the ARCH # Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi fi
# We were building in %my_builddir/linux-%srcversion, but the sources will # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch %if %kmp_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%_target_cpu /usr/src/linux-obj/%kmp_target_cpu
%endif %endif
%endif %endif

7
kernel-source.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

7
kernel-syms.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

7
kernel-tegra.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

24
kernel-tegra.spec
View File

@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
%define build_flavor tegra %define build_flavor tegra
%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
@@ -193,6 +194,17 @@ Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2 Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: armv7l ExclusiveArch: armv7l
%define kmp_target_cpu %_target_cpu
%ifarch %ix86
# Only i386/default supports i586, mark other flavors' packages as i686
%if ! %build_default
BuildArch: i686
# KMPs are always built as i586, because rpm does not allow to build
# subpackages for different architectures. Therefore, we change the
# /usr/src/linux-obj/<arch> symlink to i586.
%define kmp_target_cpu i586
%endif
%endif
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
NoSource: 0 NoSource: 0
@@ -624,9 +636,9 @@ if [ %CONFIG_MODULES = y ]; then
# Some architecture's $(uname -m) output is different from the ARCH # Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi fi
# We were building in %my_builddir/linux-%srcversion, but the sources will # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch %if %kmp_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%_target_cpu /usr/src/linux-obj/%kmp_target_cpu
%endif %endif
%endif %endif

7
kernel-trace.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

24
kernel-trace.spec
View File

@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
%define build_flavor trace %define build_flavor trace
%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
@@ -204,6 +205,17 @@ Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2 Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc64 s390 s390x x86_64 ExclusiveArch: %ix86 ia64 ppc64 s390 s390x x86_64
%define kmp_target_cpu %_target_cpu
%ifarch %ix86
# Only i386/default supports i586, mark other flavors' packages as i686
%if ! %build_default
BuildArch: i686
# KMPs are always built as i586, because rpm does not allow to build
# subpackages for different architectures. Therefore, we change the
# /usr/src/linux-obj/<arch> symlink to i586.
%define kmp_target_cpu i586
%endif
%endif
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
NoSource: 0 NoSource: 0
@@ -634,9 +646,9 @@ if [ %CONFIG_MODULES = y ]; then
# Some architecture's $(uname -m) output is different from the ARCH # Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi fi
# We were building in %my_builddir/linux-%srcversion, but the sources will # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -911,9 +923,9 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch %if %kmp_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%_target_cpu /usr/src/linux-obj/%kmp_target_cpu
%endif %endif
%endif %endif

7
kernel-u8500.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

24
kernel-u8500.spec
View File

@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
%define build_flavor u8500 %define build_flavor u8500
%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
@@ -193,6 +194,17 @@ Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2 Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: armv7l ExclusiveArch: armv7l
%define kmp_target_cpu %_target_cpu
%ifarch %ix86
# Only i386/default supports i586, mark other flavors' packages as i686
%if ! %build_default
BuildArch: i686
# KMPs are always built as i586, because rpm does not allow to build
# subpackages for different architectures. Therefore, we change the
# /usr/src/linux-obj/<arch> symlink to i586.
%define kmp_target_cpu i586
%endif
%endif
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
NoSource: 0 NoSource: 0
@@ -624,9 +636,9 @@ if [ %CONFIG_MODULES = y ]; then
# Some architecture's $(uname -m) output is different from the ARCH # Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi fi
# We were building in %my_builddir/linux-%srcversion, but the sources will # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch %if %kmp_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%_target_cpu /usr/src/linux-obj/%kmp_target_cpu
%endif %endif
%endif %endif

7
kernel-vanilla.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 10 12:03:36 CET 2012 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
-default (bnc#745632). KMPs are still built as i586.
- commit 88a632b
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com Thu Feb 9 15:57:54 CET 2012 - jeffm@suse.com

24
kernel-vanilla.spec
View File

@@ -25,6 +25,7 @@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
%define build_flavor vanilla %define build_flavor vanilla
%define build_default (%build_flavor == "default")
%define build_kdump (%build_flavor == "kdump") %define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla") %define build_vanilla (%build_flavor == "vanilla")
@@ -200,6 +201,17 @@ Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2 Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x x86_64 ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x x86_64
%define kmp_target_cpu %_target_cpu
%ifarch %ix86
# Only i386/default supports i586, mark other flavors' packages as i686
%if ! %build_default
BuildArch: i686
# KMPs are always built as i586, because rpm does not allow to build
# subpackages for different architectures. Therefore, we change the
# /usr/src/linux-obj/<arch> symlink to i586.
%define kmp_target_cpu i586
%endif
%endif
# These files are found in the kernel-source package: # These files are found in the kernel-source package:
NoSource: 0 NoSource: 0
@@ -630,9 +642,9 @@ if [ %CONFIG_MODULES = y ]; then
# Some architecture's $(uname -m) output is different from the ARCH # Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from # parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
fi fi
# We were building in %my_builddir/linux-%srcversion, but the sources will # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -907,9 +919,9 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch %if %kmp_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%_target_cpu /usr/src/linux-obj/%kmp_target_cpu
%endif %endif
%endif %endif

4
source-timestamp
View File

@@ -1,3 +1,3 @@
2012-02-09 15:58:53 +0100 2012-02-10 15:25:32 +0100
GIT Revision: 43ce624c44b2090b72f51b96503ae026ea018074 GIT Revision: 607101db1bcd777530c610daa81bbc716c183f20
GIT Branch: master GIT Branch: master