[packages/kernel] - added support for x32 (x86_64 kernel)

[baggins]

commit 5c6b663b68e41efbd2855b6e3ffc84e931dce470
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jan 3 17:19:30 2015 +0000

    - added support for x32 (x86_64 kernel)

 kernel.spec | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index daa50c9..fc5bff1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -253,7 +253,7 @@ BuildRequires:	hostname
 BuildRequires:	kmod >= 12-2
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.5-24
-BuildRequires:	rpmbuild(macros) >= 1.652
+BuildRequires:	rpmbuild(macros) >= 1.704
 Requires(post):	coreutils
 Requires(post):	geninitrd >= 10000.32
 Requires(post):	kmod >= 12-2
@@ -308,11 +308,11 @@ Conflicts:	udev < 1:081
 Conflicts:	util-linux < 2.10o
 Conflicts:	util-vserver < 0.30.216
 Conflicts:	xfsprogs < 2.6.0
-ExclusiveArch:	i486 i586 i686 pentium3 pentium4 athlon %{x8664} alpha arm ia64 ppc ppc64 sparc sparc64
+ExclusiveArch:	i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 alpha arm ia64 ppc ppc64 sparc sparc64
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%ifarch %{ix86} %{x8664}
+%ifarch %{ix86} %{x8664} x32
 %define		target_arch_dir		x86
 %endif
 %ifarch ppc ppc64
@@ -321,7 +321,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %ifarch sparc sparc64
 %define		target_arch_dir		sparc
 %endif
-%ifnarch %{ix86} %{x8664} ppc ppc64 sparc sparc64
+%ifnarch %{ix86} %{x8664} x32 ppc ppc64 sparc sparc64
 %define		target_arch_dir		%{_target_base_arch}
 %endif
 
@@ -558,7 +558,7 @@ Summary(pl.UTF-8):	Pliki służące do budowania modułów jądra
 Group:		Development/Building
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
 Requires:	make
-Conflicts:	rpmbuild(macros) < 1.652
+Conflicts:	rpmbuild(macros) < 1.704
 AutoReqProv:	no
 
 %description module-build
@@ -738,12 +738,12 @@ find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs
 install -d %{objdir}
 cat > %{targetobj}.mk <<'EOF'
 # generated by %{name}.spec
-KERNELSRC		:= %{srcdir}
+KERNELSRC	:= %{srcdir}
 KERNELOUTPUT	:= %{objdir}
 
 SRCARCH		:= %{target_arch_dir}
 ARCH		:= %{_target_base_arch}
-Q			:= %{!?with_verbose:@}
+Q		:= %{!?with_verbose:@}
 MAKE_OPTS	:= %{MakeOpts}
 DEFCONFIG	:= %{defconfig}
 EOF
@@ -976,7 +976,7 @@ done
 install -d $RPM_BUILD_ROOT/boot
 cp -a %{objdir}/System.map $RPM_BUILD_ROOT/boot/System.map-%{kernel_release}
 cp -aL %{objdir}/.config $RPM_BUILD_ROOT/boot/config-%{kernel_release}
-%ifarch %{ix86} %{x8664}
+%ifarch %{ix86} %{x8664} x32
 	cp -a %{objdir}/arch/%{target_arch_dir}/boot/bzImage $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
 	install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
 %endif
@@ -1312,7 +1312,7 @@ fi
 %ghost /lib/modules/%{kernel_release}/build
 %ghost /lib/modules/%{kernel_release}/source
 
-%ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
+%ifarch alpha %{ix86} %{x8664} x32 ppc ppc64 sparc sparc64
 %files vmlinux
 %defattr(644,root,root,755)
 /boot/vmlinux-%{kernel_release}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/5c6b663b68e41efbd2855b6e3ffc84e931dce470