X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm-tld-macros.git;a=blobdiff_plain;f=macros.kernel;fp=macros.kernel;h=598ba8833373719250fc1a341983a17a88eae415;hp=8aa96bb4dfe10f290691caa791f79fe704446a06;hb=590f6b93cecf9ba39c47547473c116b1fd0500ff;hpb=cc0c6c3770eedc36e23524a03e1a2cf9828151a2 diff --git a/macros.kernel b/macros.kernel index 8aa96bb..598ba88 100644 --- a/macros.kernel +++ b/macros.kernel @@ -91,6 +91,18 @@ done) %_host_base_arch %{expand:%%global _host_base_arch %(echo %{_host_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/x32/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_host_base_arch %_target_base_arch %{expand:%%global _target_base_arch %(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/x32/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_target_base_arch +%_kernel_arch \\\ +%ifarch aarch64\ +arm64\ +%endif\ +%ifarch ppc ppc64\ +powerpc\\\ +%endif\ +%ifnarch aarch64 ppc ppc64\ +%{_target_base_arch}\\\ +%endif\ +%{nil} + # Compression used for %__spec_install_post_compress_modules # Supported values: # - "gzip -9nf" (module-init-tools and kmod) @@ -164,15 +176,7 @@ done) ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux- \\\ %endif \\\ %else \\\ - %ifarch aarch64 \\\ - ARCH=arm64 \\\ - %endif \\\ - %ifarch ppc ppc64 \\\ - ARCH=powerpc \\\ - %endif \\\ - %ifnarch aarch64 ppc ppc64 \\\ - ARCH=%{_target_base_arch} \\\ - %endif \\\ + ARCH=%_kernel_arch \\\\\\\ CC="%{__cc}" \\\ %endif \ %define MakeOpts HOSTCC="%{__cc}" SYSSRC=%{_kernelsrcdir} SYSOUT=$PWD/o \\\\\\\