Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: PROBE_VERSION must use the driver version #1080

Merged
merged 2 commits into from
Mar 10, 2020
Merged

Conversation

fntlnz
Copy link
Contributor

@fntlnz fntlnz commented Mar 9, 2020

The driver version was also setup in the wrong cmake file.

Co-Authored-By: Leonardo Di Donato leodidonato@gmail.com
Signed-off-by: Lorenzo Fontana lo@linux.com

What type of PR is this?

/kind bug

Any specific area of the project related to this PR?
/area build

What this PR does / why we need it:

Which issue(s) this PR fixes:
Passing -DSYSDIG_VERSION to cmake was not loading the variable in the inner makefile that we use to download the sinsp, scap and the driver.
This was leading to broken builds when such variable was passed.

Moreover, PROBE_VERSION must be set to the same version as the driver, because they are two separate projects with different release lifecycles now that Sysdig and Falco are 100% decoupled from an infrastructure and code point of view.

Also we bumped the driver version to benefit from draios/sysdig#1595
Fixes #1073

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

fix: the Falco driver now compiles on >= 5.4 kernels

fntlnz and others added 2 commits March 9, 2020 19:50
The driver version was also setup in the wrong cmake file.

Co-Authored-By: Leonardo Di Donato <leodidonato@gmail.com>
Signed-off-by: Lorenzo Fontana <lo@linux.com>
Co-Authored-By: Leonardo Di Donato <leodidonato@gmail.com>
Signed-off-by: Lorenzo Fontana <lo@linux.com>
@poiana
Copy link
Contributor

poiana commented Mar 9, 2020

LGTM label has been added.

Git tree hash: 8a67ba53c4153f5ed18c0906cb951f2f245a7486

@poiana poiana added the approved label Mar 9, 2020
@fntlnz
Copy link
Contributor Author

fntlnz commented Mar 9, 2020

/milestone 0.21.0

@poiana poiana added this to the 0.21.0 milestone Mar 9, 2020
@fntlnz
Copy link
Contributor Author

fntlnz commented Mar 9, 2020

/assign @kris-nova

@leodido
Copy link
Member

leodido commented Mar 9, 2020

/cc @kris-nova

@poiana poiana requested a review from krisnova March 9, 2020 19:08
@mstemm mstemm self-requested a review March 10, 2020 16:58
@poiana
Copy link
Contributor

poiana commented Mar 10, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: leodido, mstemm

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@poiana poiana merged commit 123a750 into master Mar 10, 2020
@poiana poiana deleted the fix/sysdig-version branch March 10, 2020 17:00
@leodido
Copy link
Member

leodido commented Mar 10, 2020

/milestone 0.21.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to build the eBPF driver
5 participants