X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-modules%2Fparam-build.sh;h=13f4aaf91878255a70970f937224b569a9042794;hb=1af1b41431702839f3eb71f45a7e077180014284;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..13f4aaf 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 @@ -346,13 +346,12 @@ 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 + patch_linux_kernel 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 @@ -425,10 +424,10 @@ index bbb1d225..8deeacbc 100644 EOF fi - if ( { vergte "${kversion}" "3.15"; } && { verlt "${kversion}" "4.4"; } ) || + if ( { vergte "${kversion}" "3.14"; } && { verlt "${kversion}" "4.4"; } ) || ( { vergte "${kversion}" "4.15"; } && { verlt "${kversion}" "4.17"; } ); 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. # # This patch only partially applies due to changes in kernel/Makefile, @@ -446,6 +445,25 @@ 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 # Newer binutils don't accept 3 operand 'cmp' instructions on ppc64 # Convert them to 'cmpw' which was previously done silently @@ -538,6 +556,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 +642,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 +656,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 +720,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 +939,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}"