From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 2 Oct 2023 20:59:50 +0000 (-0400)
Subject: jjb: lttng-modules: add floor for ubuntu riscv builds
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=f16755cf2ac849f313428bd5a39ab6f77bc42887;p=lttng-ci.git

jjb: lttng-modules: add floor for ubuntu riscv builds

Change-Id: I1bcb92e8a4f727364d6fc887167b436f2481066b
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index 5d12ca5..67ed460 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -288,11 +288,14 @@ build_linux_kernel() {
     # Generate kernel configuration
     case "$ktag" in
       Ubuntu*)
-        if [ "${cross_arch}" = "powerpc" ]; then
-          if vergte "${kversion}" "4.10"; then
-            echo "Ubuntu removed big endian powerpc configuration from kernel >= 4.10. Don't try to build it."
-            exit 0
-          fi
+        if [ "${cross_arch}" = "powerpc" ] && vergte "${kversion}" "4.10"; then
+          echo "Ubuntu removed big endian powerpc configuration from kernel >= 4.10. Don't try to build it."
+          exit 0
+        fi
+
+        if [ "${cross_arch}" = "riscv64" ] && verlt "${kversion}" "6.2"; then
+          echo "Ubuntu added RISC-V config to their 'regular' kernels in v6.2. Don't try to build it."
+          exit 0
         fi
 
         fakeroot debian/rules clean KW_DEFCONFIG_DIR=.