From e6c68b48d433a36e8fd093d8dfc5f0d33ee1743f Mon Sep 17 00:00:00 2001 From: Robby Cochran Date: Sun, 24 Jan 2021 20:26:00 -0800 Subject: [PATCH] Use modern builder for all 5.4+ kernels (#383) --- .circleci/config.yml | 8 ++++---- kernel-modules/BLOCKLIST | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 23ea23705d..4d9f0e7ad0 100644 --- 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 index 9aea854e87..3fcf653bd7 100644 --- a/kernel-modules/BLOCKLIST +++ b/kernel-modules/BLOCKLIST @@ -6,7 +6,7 @@ # If or 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.*