Use modern builder for all 5.4+ kernels (#383)

stackrox · Jan 25, 2021 · e6c68b4 · e6c68b4
1 parent c7f0296
commit e6c68b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -547,12 +547,12 @@ jobs:
             tar -xzf "${bundle_file}" -C ~/kobuild-tmp/meta-inspect ./BUNDLE_DISTRO ./BUNDLE_VERSION
             distro="$(< ~/kobuild-tmp/meta-inspect/BUNDLE_DISTRO)"
             kernel_version="$(< ~/kobuild-tmp/meta-inspect/BUNDLE_VERSION)"
-            if grep -q "$distro" <~/kobuild-tmp/custom-flavors/all; then
-              echo "$version" >>~/kobuild-tmp/custom-flavors/versions."$distro"
-              echo "Building kernel version $version with custom builder flavor $distro"
-            elif (( kernel_version >= 5 )); then
+            if (( kernel_version >= 5 )); then
               echo "$version" >>~/kobuild-tmp/custom-flavors/versions.modern
               echo "Building kernel version $version with modern builder"
+            elif grep -q "$distro" <~/kobuild-tmp/custom-flavors/all; then
+              echo "$version" >>~/kobuild-tmp/custom-flavors/versions."$distro"
+              echo "Building kernel version $version with custom builder flavor $distro"
             fi
           done
 

diff --git a/kernel-modules/BLOCKLIST b/kernel-modules/BLOCKLIST
@@ -6,7 +6,7 @@
 # If <module-version> or <object type> is omitted, "*" is assumed
 ~3\.10\.0-1062(?:\.\d+)*\.el7.x86_64 * bpf
 *.el6.*
-# TODO(ROX-5396) - Fix collector probe compilation for 5.7.* and 5.8.* kernels
-~5\.[7,8,9]\..*
-# TOOD(ROX-5809) - Fix collector probe compilation for 4.19. cloud Debian kernels
+# TODO(ROX-5396) - Fix collector probe compilation for 5.7-5.10 kernels
+~5\.([7-9]|10)\..*
+# TODO(ROX-5809) - Fix collector probe compilation for 4.19. cloud Debian kernels
 ~4\.19.*cloud.*