X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-modules%2Fparam-build.sh;h=51a7ae1a6393b795734e1fd97f490ffdcabdb280;hb=c9c7c76ba0c1b5325dce6ea4b4e97993a7c297be;hp=6220bf558249ac17c50439e1c5fe0a4b321115aa;hpb=fca23c5a4c88357fbf409c161c3ef3ade1350ec8;p=lttng-ci.git

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index 6220bf5..51a7ae1 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -15,6 +15,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# Parameters
+arch=${arch:-}
+cross_arch=${cross_arch:-}
+ktag=${ktag:-}
+
+
 ## FUNCTIONS ##
 
 # Kernel version compare functions
@@ -42,12 +48,18 @@ prepare_lnx_sources() {
     if [ "$outdir" = "." ]; then
       koutput=""
     else
-      koutput="O=\"${outdir}\""
+      koutput="O=${outdir}"
     fi
 
     # Generate kernel configuration
-    case "$kversion" in
+    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
+        fi
         fakeroot debian/rules clean
         fakeroot debian/rules genconfigs
         cp CONFIGS/"${ubuntu_config}" "${outdir}"/.config
@@ -83,19 +95,26 @@ prepare_lnx_sources() {
     # Debug
     #cat "${outdir}"/.config
 
+    # On powerpc this object is required to link modules
+    if [ "${karch}" = "powerpc" ]; then
+        make arch/powerpc/lib/crtsavres.o CC="$CC" ${koutput}
+    fi
+
+    # On arm64 this object is required to build with ftrace support
+    if [ "${karch}" = "arm64" ]; then
+        if vergte "$KVERSION" "4.13-rc1"; then
+            make arch/arm64/kernel/ftrace-mod.o CC="$CC" ${koutput}
+        fi
+    fi
+
     # Version specific tasks
-    case "$kversion" in
+    case "$ktag" in
       Ubuntu*)
         # Add Ubuntu ABI number to kernel headers, this is normally done by the packaging code
-        ABINUM="$(echo "$kversion" | grep -P -o 'Ubuntu-(lts-)?.*-\K\d+(?=\..*)')"
+        ABINUM="$(echo "$ktag" | grep -P -o 'Ubuntu-(lts-)?.*-\K\d+(?=\..*)')"
         echo "#define UTS_UBUNTU_RELEASE_ABI $ABINUM" >> "${outdir}"/include/generated/utsrelease.h
         ;;
     esac
-
-    # On powerpc this object is required to link modules
-    if [ "${karch}" = "powerpc" ]; then
-        make arch/powerpc/lib/crtsavres.o CC="$CC" ${koutput}
-    fi
 }
 
 
@@ -105,17 +124,13 @@ build_modules() {
     kdir="$1"
     bdir="$2"
 
-    # Get kernel version from source tree
-    cd "${kdir}"
-    kversion=$(make kernelversion)
-
     # Enter lttng-modules source dir
     cd "${LTTSRCDIR}"
 
     # kernels 3.10 to 3.10.13 and 3.11 to 3.11.2 introduce a deadlock in the
     # timekeeping subsystem. We want those build to fail.
-    if { vergte "$kversion" "3.10" && verlte "$kversion" "3.10.13"; } || \
-       { vergte "$kversion" "3.11" && verlte "$kversion" "3.11.2"; }; then
+    if { vergte "$KVERSION" "3.10" && verlte "$KVERSION" "3.10.13"; } || \
+       { vergte "$KVERSION" "3.11" && verlte "$KVERSION" "3.11.2"; }; then
 
         set +e
 
@@ -165,7 +180,7 @@ LTTBUILDKHDRDIR="${WORKSPACE}/build/lttng-modules-khdr"
 
 
 # Setup cross compile env if available
-if [ "x${cross_arch:-}" != "x" ]; then
+if [ "x${cross_arch}" != "x" ]; then
 
     case "$cross_arch" in
         "armhf")
@@ -212,7 +227,7 @@ if [ "x${cross_arch:-}" != "x" ]; then
     oldconf_target="olddefconfig"
 
 # Set arch specific values if we are not cross compiling
-elif [ "x${arch:-}" != "x" ]; then
+elif [ "x${arch}" != "x" ]; then
 
     case "$arch" in
         "x86-32")
@@ -280,6 +295,9 @@ mkdir -p "${LNXBUILDDIR}" "${LNXHDRDIR}" "${LTTBUILDKSRCDIR}" "${LTTBUILDKHDRDIR
 # Enter linux source dir
 cd "${LNXSRCDIR}"
 
+# Get kernel version from source tree
+KVERSION=$(make kernelversion)
+
 prepare_lnx_sources "."
 
 # For RT kernels, copy version file
@@ -316,6 +334,13 @@ if [ "${karch}" = "powerpc" ]; then
     cp -a --parents arch/powerpc/lib/crtsavres.[So] "${LNXHDRDIR}/"
 fi
 
+# On arm64 this object is required to build with ftrace support
+if [ "${karch}" = "arm64" ]; then
+    if vergte "$KVERSION" "4.13-rc1"; then
+        cp -a --parents arch/arm64/kernel/ftrace-mod.[So] "${LNXHDRDIR}/"
+    fi
+fi
+
 # Copy modules related stuff, if available
 if [ -s Module.symvers ]; then
     cp Module.symvers "${LNXHDRDIR}"