Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Fix containerd build, use libbtrfs-dev when available.#1319

Merged
mikebrow merged 1 commit intocontainerd:masterfrom
Random-Liu:fix-containerd-build
Oct 22, 2019
Merged

Fix containerd build, use libbtrfs-dev when available.#1319
mikebrow merged 1 commit intocontainerd:masterfrom
Random-Liu:fix-containerd-build

Conversation

@Random-Liu
Copy link
Copy Markdown
Member

@Random-Liu Random-Liu commented Oct 22, 2019 •
edited
Loading

The test image was updated recently, and the btrfs-tools version was updated to 4.20.1-2 which doesn't contain btrfs/ioctl.h any more.

Here is the error message without this fix:

W1017 18:52:29.516] vendor/github.com/containerd/btrfs/btrfs.go:38:10: fatal error: btrfs/ioctl.h: No such file or directory
W1017 18:52:29.516]  #include <btrfs/ioctl.h>
W1017 18:52:29.516]           ^~~~~~~~~~~~~~~
W1017 18:52:29.517] compilation terminated.

Signed-off-by: Lantao Liu lantaol@google.com

@Random-Liu
Fix containerd build, use libbtrfs-dev when available.
8bfff7d 
Signed-off-by: Lantao Liu <lantaol@google.com>
@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Oct 22, 2019

/test pull-cri-containerd-node-e2e

@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Oct 22, 2019

/test pull-cri-containerd-windows-cri

mikebrow
mikebrow approved these changes Oct 22, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mikebrow mikebrow merged commit fe75794 into containerd:master Oct 22, 2019
This was referenced Oct 22, 2019
Merged
Merged
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@mikebrow mikebrow mikebrow approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@mikebrow mikebrow

Labels

cherrypick-needed cherrypicked size/XS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Random-Liu @mikebrow @k8s-ci-robot