From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 18 Oct 2019 20:23:15 +0000 (-0400)
Subject: jjb: Fix more ppc64el linux build for modules
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=105282023d5ba6bc9fcdd0d268e9a1a4e0476d5e;p=lttng-ci.git

jjb: Fix more ppc64el linux build for modules
---

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index e016e13..0ce165a 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -314,7 +314,9 @@ extract_distro_headers() {
 
     # On powerpc 32bits this object is required to link modules
     if [ "${karch}" = "powerpc" ]; then
-        if [ "x$(scripts/config -s CONFIG_PPC64)" = "xn" ]; then
+        if [ "x$(scripts/config -s CONFIG_PPC64)" = "xy" ] && vergte "${kversion}" "5.4"; then
+            :
+        else
             cp -a --parents arch/powerpc/lib/crtsavres.[So] "${LINUX_HDROBJ_DIR}/"
         fi
     fi
@@ -374,7 +376,9 @@ extract_distro_headers() {
 
     # On powerpc 32bits this object is required to link modules
     if [ "${karch}" = "powerpc" ]; then
-        if [ "x$(scripts/config -s CONFIG_PPC64)" = "xn" ]; then
+        if [ "x$(scripts/config -s CONFIG_PPC64)" = "xy" ] && vergte "${kversion}" "5.4"; then
+            :
+        else
             make arch/powerpc/lib/crtsavres.o CC="$CC"
         fi
     fi