X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-modules%2Fparam-build.sh;h=81389bd3b278421c178a068b769f0d7220753315;hb=1490b049e5e289235463b2eb3968abf3fc88d651;hp=ab604a99832df813381bf052424e0356b4c6e724;hpb=447eaf93d4d6fbb76c0dc5703929969e4a7fef59;p=lttng-ci.git

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index ab604a9..81389bd 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -199,11 +199,6 @@ build_linux_kernel() {
             export ARCH="i386"
         fi
 
-        # allyesconfig is mostly broken for kernels of the 2.6 series
-        if verlt "$kversion" "3.0"; then
-            vanilla_config="defconfig"
-        fi
-
         make "${vanilla_config}"
         ;;
     esac
@@ -310,14 +305,6 @@ build_linux_kernel() {
     scripts/config --enable CONFIG_EVENT_TRACING
     scripts/config --enable CONFIG_KRETPROBES
 
-    # FIXME: disable objtool on vmlinux, it OOMs on allyesconfig
-    sed -i 's/objtool_link vmlinux.o//' scripts/link-vmlinux.sh || true
-    # Starting with v6.1-rc6
-    sed -i 's/^objtool-enabled := .*/objtool-enabled := /' scripts/Makefile.vmlinux_o || true
-
-    # Disable SORTTAB
-    sed -i 's/is_enabled CONFIG_BUILDTIME_TABLE_SORT/is_enabled CONFIG_NONEXISTANT/' scripts/link-vmlinux.sh || true
-
     # Debug
     #cat .config
 
@@ -591,37 +578,37 @@ elif [ "x${arch}" != "x" ]; then
     case "$arch" in
         "i386")
             karch="x86"
-            vanilla_config="allyesconfig"
+            vanilla_config="allmodconfig"
             ubuntu_config="i386-config.flavour.generic"
             ;;
 
         "amd64")
             karch="x86"
-            vanilla_config="allyesconfig"
+            vanilla_config="allmodconfig"
             ubuntu_config="amd64-config.flavour.generic"
             ;;
 
         "armhf")
             karch="arm"
-            vanilla_config="allyesconfig"
+            vanilla_config="allmodconfig"
             ubuntu_config="armhf-config.flavour.generic"
             ;;
 
         "arm64")
             karch="arm64"
-            vanilla_config="allyesconfig"
+            vanilla_config="allmodconfig"
             ubuntu_config="arm64-config.flavour.generic"
             ;;
 
         "powerpc")
             karch="powerpc"
-            vanilla_config="allyesconfig"
+            vanilla_config="allmodconfig"
             ubuntu_config="powerpc-config.flavour.powerpc-smp"
             ;;
 
         "ppc64el")
             karch="powerpc"
-            vanilla_config="allyesconfig"
+            vanilla_config="allmodconfig"
             ubuntu_config="ppc64el-config.flavour.generic"
             ;;
 
@@ -657,9 +644,9 @@ url_hash="$(echo -n "$kgitrepo" | md5sum | awk '{ print $1 }')"
 obj_name="linux.tar.bz2"
 
 if [ "x${cross_arch}" = "x" ]; then
-	obj_url_prefix="$OBJ_STORE_URL/linux-build/$url_hash/$ktag/platform-${platform}/$arch/native"
+	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-${platform}/${cross_arch}"
+	obj_url_prefix="$OBJ_STORE_URL/linux-build/$url_hash/$ktag/platform-${platforms}/${cross_arch}"
 fi
 
 obj_url="$obj_url_prefix/$obj_name"