From 7b6fa7697e49bf9af21dbbeae4c725dad4f07650 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 13 Sep 2012 08:39:07 +0200 Subject: [PATCH] - bump rpm macros req to 1.652 - use _host_base_arch as a means to detect crosscompilation --- kernel.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel.spec b/kernel.spec index c837e019..9e3de1be 100644 --- a/kernel.spec +++ b/kernel.spec @@ -282,7 +282,7 @@ BuildRequires: hostname BuildRequires: virtual(module-tools) BuildRequires: perl-base BuildRequires: rpm-build >= 4.5-24 -BuildRequires: rpmbuild(macros) >= 1.217 +BuildRequires: rpmbuild(macros) >= 1.652 Requires(post): coreutils Requires(post): geninitrd >= 10000-3 Requires(post): virtual(module-tools) @@ -372,21 +372,21 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _kernelsrcdir /usr/src/linux%{_alt_kernel}-%{version} -%if "%{_target_base_arch}" != "%{_arch}" +%if "%{_target_base_arch}" != "%{_host_base_arch}" %define CrossOpts ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux- %define DepMod /bin/true - %if "%{_arch}" == "sparc" && "%{_target_base_arch}" == "sparc64" + %if "%{_host_base_arch}" == "sparc" && "%{_target_base_arch}" == "sparc64" %define CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}" %define DepMod /sbin/depmod %endif - %if "%{_arch}" == "sparc64" && "%{_target_base_arch}" == "sparc" + %if "%{_host_base_arch}" == "sparc64" && "%{_target_base_arch}" == "sparc" %define CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}" %define DepMod /sbin/depmod %endif - %if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386" + %if "%{_host_base_arch}" == "x86_64" && "%{_target_base_arch}" == "i386" %define CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}" %define DepMod /sbin/depmod %endif @@ -564,7 +564,7 @@ Summary(de.UTF-8): Development Dateien die beim Kernel Modul kompilationen gebra Summary(pl.UTF-8): Pliki służące do budowania modułów jądra Group: Development/Building Requires: %{name}-headers = %{epoch}:%{version}-%{release} -Conflicts: rpmbuild(macros) < 1.642 +Conflicts: rpmbuild(macros) < 1.652 AutoReqProv: no %description module-build @@ -1048,7 +1048,7 @@ cp -a %{objdir}/System.map $RPM_BUILD_ROOT/boot/System.map-%{kernel_release} # ghosted initrd touch $RPM_BUILD_ROOT%{initrd_dir}/initrd-%{kernel_release}.gz -%if "%{_target_base_arch}" != "%{_arch}" +%if "%{_target_base_arch}" != "%{_host_base_arch}" touch $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/modules.dep %endif -- 2.44.0