X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-modules%2Fparam-build.sh;h=5ffffd2d79233bba504f090f60521ee61fac241d;hb=593cd35e7499321c2c882cf779c82d698563f8e9;hp=b3d5abc68b5c2605053e9042ab3a88e168f15673;hpb=7b15f9fa48cf3ca03cd9b2286a2100dad966ee34;p=lttng-ci.git

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index b3d5abc..5ffffd2 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -149,7 +149,7 @@ select_compiler() {
         selected_cc='gcc-4.8'
     fi
 
-    if [ "x$selected_cc" = "x" ]; then
+    if [ -z "$selected_cc" ]; then
       echo "Found no suitable compiler."
       exit 1
     fi
@@ -256,9 +256,6 @@ build_linux_kernel() {
           fi
         fi
 
-        # Disable riscv64 config generation, we don't have a toolchain on bionic
-        sed -i 's/riscv64 //' debian.master/etc/kernelconfig
-
         fakeroot debian/rules clean KW_DEFCONFIG_DIR=.
 
         # Hack for kernel Ubuntu-hwe-5.8
@@ -346,17 +343,40 @@ build_linux_kernel() {
             patch_linux_kernel 854e55ad289ef8888e7991f0ada85d5846f5afb9
         fi
 
-        # More recent compiler optimizations expose build errors with netronome.
-        # It seems easier to disable the driver than to attempt patching.
-        scripts/config --disable CONFIG_NET_VENDOR_NETRONOME
-        scripts/config --disable CONFIG_MICREL_PHY
+    fi
 
+    if { vergt "${selected_cc_version}" "9"; } && { verlt "${kversion}" "5.6"; } ; then
         # Duplicate decalarations of __force_order
         # @see https://gitlab.com/linux-kernel/stable/-/commit/df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc
         # However, kaslr_64.c doesn't exit in 4.15, 4.16, it's named pagetable.c
         if [ -f arch/x86/boot/compressed/pagetable.c ] ; then
             sed -i '/^unsigned long __force_order;$/d' arch/x86/boot/compressed/pagetable.c
         fi
+        if [ -f arch/x86/boot/compressed/kaslr_64.c ] ; then
+            patch_linux_kernel df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc
+        fi
+    fi
+
+    if { vergte "${kversion}" "4.18"; } && { verlt "${kversion}" "4.19"; } ; then
+        # In some cases, compiling net/bpfilter can fail with the following error:
+        #   net/bpfilter/main.c:9:10: fatal error: include/uapi/linux/bpf.h: No such file or directory
+        #   make[2]: *** [scripts/Makefile.host:107: net/bpfilter/main.o] Error 1
+        #
+        # While the issue is potentially in a number of old versions, it has only
+        # been observed in v4.18-rt
+        #
+        patch_linux_kernel 303a339f30a9441c4695d3d2cc78f1b33cd959ff
+    fi
+
+    if { vergte "${kversion}" "4.18"; } && { verlt "${kversion}" "4.19"; } ; then
+        # In some cases, compiling net/bpfilter can fail with the following error:
+        #   net/bpfilter/main.c:9:10: fatal error: include/uapi/linux/bpf.h: No such file or directory
+        #   make[2]: *** [scripts/Makefile.host:107: net/bpfilter/main.o] Error 1
+        #
+        # While the issue is potentially in a number of old versions, it has only
+        # been observed in v4.18-rt
+        #
+        patch_linux_kernel 303a339f30a9441c4695d3d2cc78f1b33cd959ff
     fi
 
     if { vergte "${kversion}" "4.15"; } && { verlt "${kversion}" "4.18"; } ; then
@@ -367,7 +387,8 @@ build_linux_kernel() {
         patch_linux_kernel 9feeb638cde083c737e295c0547f1b4f28e99583
     fi
 
-    if { vergte "${kversion}" "4.12"; } && { verlt "${kversion}" "4.19"; } ; then
+    if ( { vergte "${kversion}" "4.12"; } && { verlt "${kversion}" "4.20.17"; } ) || \
+       ( { vergte "${kversion}" "5.0"; } && { verlt "${kversion}" "5.0.12"; } ) ; then
         # Old kernels can fail to build while on newer host kernels with errors
         # such as:
         #   In file included from scripts/selinux/genheaders/genheaders.c:19:
@@ -377,7 +398,7 @@ build_linux_kernel() {
         patch_linux_kernel dfbd199a7cfe3e3cd8531e1353cdbd7175bfbc5e
     fi
 
-    if { vergte "${kversion}" "3.18"; } && { verlt "${kversion}" "4.4"; } ; then
+    if { vergte "${kversion}" "3.18"; } && { verlt "${kversion}" "4.16"; } ; then
         # Compatibility with binutils >= ~ 2.31
         patch_linux_kernel b21ebf2fb4cde1618915a97cc773e287ff49173e
     fi
@@ -425,11 +446,12 @@ index bbb1d225..8deeacbc 100644
 EOF
     fi
 
-    if ( { vergte "${kversion}" "3.15"; } && { verlt "${kversion}" "4.4"; } ) ||
-       ( { vergte "${kversion}" "4.15"; } && { verlt "${kversion}" "4.17"; } ); then
+    if ( { vergte "${kversion}" "3.14"; } && { verlt "${kversion}" "4.4"; } ) ||
+       ( { vergte "${kversion}" "4.8"; } && { verlt "${kversion}" "4.18"; } ); then
         # While the original motivation of this patch is for fixing builds using
-        # clang, the same error occurs between linux >= 3.15 and < 4.4, and in
+        # clang, the same error occurs between linux >= 3.14 and < 4.4, and in
         # 4.15, 4.16.
+        # For rt-linux, the error has been observed in 4.8, 4.11, and 4.13.
         #
         # This patch only partially applies due to changes in kernel/Makefile,
         # so a supplementary patch is needed
@@ -446,6 +468,57 @@ EOF
             sed -i '/^.* += elfcore.o$/d' kernel/Makefile
         fi
     fi
+    # Same as above for the v4.4 branch
+    if ( { vergte "${kversion}" "4.4"; } && { verlt "${kversion}" "4.4.257"; } ); then
+        patch_linux_kernel 3140b0740b31cc63cf2ee08bc3f746b423eb068d
+        if grep -q elfcore.o kernel/Makefile ; then
+            sed -i '/^.* += elfcore.o$/d' kernel/Makefile
+        fi
+    fi
+
+    if { vergte "${kversion}" "4.5"; } && { verlt "${kversion}" "4.8"; } ; then
+	# Kernels between v4.5 and v4.8 built with gcc >= 8 on arm will hit an
+	# assembler error :
+        #
+        #  kernel/.tmp_fork.s: Assembler messages:
+        #  kernel/.tmp_fork.s:1790: Error: .err encountered
+	#
+	# @see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745
+        #
+        patch_linux_kernel 9f73bd8bb445e0cbe4bcef6d4cfc788f1e184007
+    fi
+
+    if ( { vergte "${kversion}" "4.4"; } && { verlt "${kversion}" "4.4.136"; } ) ||
+       ( { vergte "${kversion}" "4.5"; } && { verlt "${kversion}" "4.8"; } ); then
+        # Hacky patch to deal with the following build error:
+        #   Cannot find symbol for section 7: .text.unlikely.
+        #   kernel/kexec_file.o: failed
+        #   make[1]: *** [scripts/Makefile.build:291: kernel/kexec_file.o] Error 1
+        #
+        # This error happens with binutils 2.36 and 2.37, but should probably not
+        # be an issue with binutils 2.38.
+        # @see https://github.com/linuxppc/issues/issues/388
+        # @see https://github.com/bminor/binutils-gdb/commit/c09c8b42021180eee9495bd50d8b35e683d3901b
+        #
+        # There is some sort of config (unspecified in past discussions) which
+        # provokes the error, and there was never a potential fix merged in
+        # this discussion, in part because the build systems of the kernel
+        # switched to objtool instead.
+        #
+        # @see https://lore.kernel.org/all/20210215162209.5e2a475b@gandalf.local.home/
+        #
+        sed -i 's/return txtname;/return shdr0->sh_size ? txtname : NULL;/' scripts/recordmcount.h
+
+        # After applying the above patch, the build continues but fails with
+        # head64.c:(.text.exit+0x5): undefined reference to `__gcov_exit'
+        #
+        scripts/config --disable CONFIG_GCOV_KERNEL
+    fi
+
+    if { vergte "${kversion}" "4.5"; } && { verlt "${kversion}" "4.5.5"; } ; then
+        # drivers/staging/wilc1000/wilc_spi.c:123:34: error: storage size of ‘wilc1000_spi_ops’ isn’t known
+        patch_linux_kernel ce7b516f3f9e11fe4ee06fad0d7e853bb6e8f160
+    fi
 
     # Newer binutils don't accept 3 operand 'cmp' instructions on ppc64
     # Convert them to 'cmpw' which was previously done silently
@@ -455,6 +528,21 @@ EOF
 	    sed -i "s/\$pie \-o \"\$ofile\"/\$pie --no-dynamic-linker -o \"\$ofile\"/" arch/powerpc/boot/wrapper
     fi
 
+    if [ "$(scripts/config --state CONFIG_EXTCON_ADC_JACK)" != "n" ] &&
+           ( { vergte "${kversion}" "4.2"; } && { verlt "${kversion}" "4.12"; } ); then
+        # 73b6ecdb93e8e77752cae9077c424fcdc6f23c39 introduced a change where
+        # extcon-adc-jack.h has an incompatible pointer type.
+        # In GCC >= 5 this will provoke a warning and build failure.
+        # Eg.
+        #   drivers/extcon/extcon-adc-jack.c: In function ‘adc_jack_probe’:
+        #   drivers/extcon/extcon-adc-jack.c:111:64: error: passing argument 2 of ‘devm_extcon_dev_allocate’ from incompatible pointer type [-Werror=incompatible-pointer-types]
+        #   make[2]: *** [scripts/Makefile.build:295: drivers/extcon/extcon-adc-jack.o] Error 1
+        #
+        # 8a522bf2d4f788306443d36b26b54f0aedcdfdbe (in 4.11) has a fix for this warning
+        #
+        patch_linux_kernel 8a522bf2d4f788306443d36b26b54f0aedcdfdbe
+    fi
+
     # Fix a typo in v2.6.36.x
     if [ -f "arch/x86/kernel/entry_64.S" ]; then
       sed -i 's/END(do_hypervisor_callback)/END(xen_do_hypervisor_callback)/' arch/x86/kernel/entry_64.S
@@ -538,6 +626,27 @@ EOF
     scripts/config --disable CONFIG_MFD_WM8994
     scripts/config --disable CONFIG_DRM_RADEON
     scripts/config --disable CONFIG_SND_SOC_WM5100
+    # More recent compiler optimizations (from gcc 8 onwards )expose build errors
+    # with netronome on older kernels.
+    # Observed in 4.11-rt, 4.15-4.17, 5.0-rt - 5.16-rt
+    # It seems easier to disable the driver than to attempt patching.
+    # Eg.
+    #   In function ‘ur_load_imm_any’,
+    #   inlined from ‘jeq_imm’ at drivers/net/ethernet/netronome/nfp/bpf/jit.c:3146:13:
+    #   ./include/linux/compiler.h:350:45: error: call to ‘__compiletime_assert_1062’ declared with attribute error: FIELD_FIT: value too large for the field
+    #   350 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
+    #
+    scripts/config --disable CONFIG_NET_VENDOR_NETRONOME
+    # Eg.
+    #  In function ‘memcpy’,
+    #  inlined from ‘kszphy_get_strings’ at drivers/net/phy/micrel.c:664:3:
+    #  ./include/linux/string.h:305:25: error: call to ‘__read_overflow2’ declared with attribute error: detected read beyond size of object passed as 2nd parameter
+    #  305 |                         __read_overflow2();
+    #      |                         ^~~~~~~~~~~~~~~~~~
+    #  make[3]: *** [scripts/Makefile.build:308: drivers/net/phy/micrel.o] Error 1
+    #
+    scripts/config --disable CONFIG_MICREL_PHY
+
 
     # IGBVF won't build with recent gcc on 2.6.38.x
     if { vergte "$kversion" "2.6.37" && verlt "$kversion" "2.6.38"; }; then
@@ -603,12 +712,12 @@ extract_distro_headers() {
 
     # Copy arch includes
     (find arch -name include -type d -print0 | \
-        xargs -0 -n1 -i: find : -type f) | \
+        xargs -0 -n1 -I '{}' find '{}' -type f) | \
         cpio -pd --preserve-modification-time "${LINUX_HDROBJ_DIR}"
 
     # Copy arch scripts
     (find arch -name scripts -type d -print0 | \
-        xargs -0 -n1 -i: find : -type f) | \
+        xargs -0 -n1 -I '{}' find '{}' -type f) | \
         cpio -pd --preserve-modification-time "${LINUX_HDROBJ_DIR}"
 
     # Cleanup scripts
@@ -617,7 +726,7 @@ extract_distro_headers() {
 
     # On powerpc 32bits this object is required to link modules
     if [ "${karch}" = "powerpc" ]; then
-        if [ "x$(scripts/config -s CONFIG_PPC64)" = "xy" ] && vergte "${kversion}" "5.4"; then
+        if [ "$(scripts/config -s CONFIG_PPC64)" = "y" ] && vergte "${kversion}" "5.4"; then
             :
         else
             cp -a --parents arch/powerpc/lib/crtsavres.[So] "${LINUX_HDROBJ_DIR}/"
@@ -681,7 +790,7 @@ extract_distro_headers() {
 
     # On powerpc 32bits this object is required to link modules
     if [ "${karch}" = "powerpc" ]; then
-        if [ "x$(scripts/config -s CONFIG_PPC64)" = "xy" ] && vergte "${kversion}" "5.4"; then
+        if [ "$(scripts/config -s CONFIG_PPC64)" = "y" ] && vergte "${kversion}" "5.4"; then
             :
         else
             make arch/powerpc/lib/crtsavres.o "${make_args[@]}"
@@ -900,7 +1009,7 @@ signature_v2 = False" > "$WORKSPACE/.s3cfg"
 url_hash="$(echo -n "$kgitrepo" | md5sum | awk '{ print $1 }')"
 obj_name="linux.tar.bz2"
 
-if [ "x${cross_arch}" = "x" ]; then
+if [ -z "${cross_arch}" ]; then
 	obj_url_prefix="$OBJ_STORE_URL/linux-build/$url_hash/$ktag/platform-${platforms}/$arch/native"
 else
 	obj_url_prefix="$OBJ_STORE_URL/linux-build/$url_hash/$ktag/platform-${platforms}/${cross_arch}"