From 1c9026729bd4e9aa8f1cb41f57490285654c48d8 Mon Sep 17 00:00:00 2001
From: Nicolas Viéville <nicolas.vieville@uphf.fr>
Date: Nov 03 2018 17:13:37 +0000
Subject: Fix wrong architecture (armv7l instead of armv7hl) - rhbz#1644430


Signed-off-by: Nicolas Viéville <nicolas.vieville@uphf.fr>

---

diff --git a/akmods b/akmods
index 7cd3c11..1ac5c29 100644
--- a/akmods
+++ b/akmods
@@ -255,8 +255,8 @@ buildinstall_kmod()
 	unset TMPDIR
 
 	# build module using akmod
-	akmods_echo 1 4 "Building RPM using the command '$(which akmodsbuild) --target $(uname -m) --kernels ${this_kernelver} ${this_kmodsrpm}'"
-	/sbin/runuser -s /bin/bash -c "$(which akmodsbuild) --quiet --quiet --target $(uname -m) --kernels ${this_kernelver} --outputdir ${tmpdir}results --logfile ${tmpdir}/akmodsbuild.log ${this_kmodsrpm}" akmods >> "${kmodlogfile}" 2>&1
+	akmods_echo 1 4 "Building RPM using the command '$(which akmodsbuild) --target $(rpm -E '%{_target_cpu}') --kernels ${this_kernelver} ${this_kmodsrpm}'"
+	/sbin/runuser -s /bin/bash -c "$(which akmodsbuild) --quiet --quiet --target $(rpm -E '%{_target_cpu}') --kernels ${this_kernelver} --outputdir ${tmpdir}results --logfile ${tmpdir}/akmodsbuild.log ${this_kmodsrpm}" akmods >> "${kmodlogfile}" 2>&1
 	local returncode=$?
 
 	# copy rpmbuild log to kmod specific logfile
diff --git a/akmodsbuild b/akmodsbuild
index 2170f7c..78d25ac 100644
--- a/akmodsbuild
+++ b/akmodsbuild
@@ -27,10 +27,7 @@ myver="0.5.6"
 
 # defaults that might get overwritten by user:
 kernels="$(uname -r)"
-target="$(uname -m)"
-if [[ "${target}" == "armv7l" ]]; then
-  target="armv7hl"
-fi
+target="$(rpm -E '%{_target_cpu}')"
 numberofjobs=$(grep -c processor /proc/cpuinfo 2> /dev/null)
 verboselevel=2
 outputdir="${PWD}"