From a0293732486afcae74889f827c37ad0a217b8497 Mon Sep 17 00:00:00 2001
From: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>
Date: Thu, 31 May 2018 09:29:35 +0200
Subject: [PATCH] kernel architecture rewrite

Signed-off-by: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>
---
 SPECS/kernel.spec | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index c3dd658f..4d2021db 100755
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -27,13 +27,12 @@
 # These architectures install vdso/ directories.
 %define vdso_arches i686 x86_64 ppc64 ppc64le
 
-# Architecture defaults.
-%define asmarch ppc64
-%define buildarch %{_target_cpu}
-%define hdrarch %{_target_cpu}
 
 # Per-architecture tweaks.
 
+# Architecture defaults.
+%define buildarch %{_target_cpu}
+%define hdrarch %{_target_cpu}
 %ifarch noarch
 # Documentation only.
 %define with_default 0
@@ -53,41 +52,48 @@
 
 %ifarch x86_64
 # 64-bit kernel-ml, headers, perf & tools.
+%define asmarch x86_64
+%define buildarch x86_64
+%define hdrarch x86_64
+%define configarch x86_64
 %define with_doc 0
 %define with_bootwrapper 0
 %define make_target bzImage
-%define configarch x86_64
 %endif
 
 %ifarch ppc64
 # 64-bit kernel-ml, headers, perf & tools.
-%define with_doc 0
+%define asmarch ppc64
 %define buildarch powerpc
 %define hdrarch powerpc
+%define configarch ppc64
+%define with_doc 0
 %define with_bootwrapper 1
 %define make_target vmlinux
-%define configarch ppc64
 %endif
 
 %ifarch ppc64le
 # 64-bit kernel-ml, headers, perf & tools.
-%define with_doc 0
+%define asmarch ppc64le
 %define buildarch powerpc
 %define hdrarch powerpc
+%define configarch ppc64le
+%define with_doc 0
 %define with_bootwrapper 1
 %define make_target vmlinux
-%define configarch ppc64le
 %endif
 
 %ifarch aarch64
-%define with_doc 0
+%define asmarch aarch64
 %define buildarch arm64
 %define hdrarch arm64
+%define configarch rpi3b64
+%define with_doc 0
 %define with_bootwrapper 0
 %define make_target vmlinux
-%define configarch rpi3b64
 %endif
 
+
 # Determine the sublevel number and set pkg_version.
 %define sublevel %(echo %{LKAver} | %{__awk} -F\. '{ print $3 }')
 %if "%{sublevel}" == ""