Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

stage1/kvm: fix qemu memfd build failure #3922

Merged
merged 1 commit into from
Apr 13, 2018

Conversation

lucab
Copy link
Member

@lucab lucab commented Apr 13, 2018

This is a backport of a qemu upstream patch to fix a memfd related
failure. It first adds infrastructure to apply the patch to qemu at
build time.

Ref: https://git.qemu.org/?p=qemu.git;a=commit;h=75e5b70e6b5dcc4f2219992d7cffa462aa406af0
Ref: #3921 (comment)

@lucab
Copy link
Member Author

lucab commented Apr 13, 2018

/cc @iaguis

@lucab lucab mentioned this pull request Apr 13, 2018
Copy link
Member

@iaguis iaguis left a comment

Choose a reason for hiding this comment

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

Taking into account my limited make skills and the fact I couldn't test it, lgtm.

# reset to original checkout and patches reapplied.
$(call generate-glob-deps,$(QEMU_DEPS_STAMP),$(QEMU_SRCDIR)/Makefile,$(QEMU_PATCHES_DEPMK),.patch,$(QEMU_PATCHES_FILELIST),$(QEMU_PATCHESDIR),normal)


Copy link
Member

Choose a reason for hiding this comment

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

superfluous empty line

Copy link
Member Author

Choose a reason for hiding this comment

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

Ack, removed.

This is a backport of a qemu upstream patch to fix a memfd related
failure. It first adds infrastructure to apply the patch to qemu at
build time.

Ref: https://git.qemu.org/?p=qemu.git;a=commit;h=75e5b70e6b5dcc4f2219992d7cffa462aa406af0
Ref: rkt#3921 (comment)
Copy link

@grahamwhaley grahamwhaley left a comment

Choose a reason for hiding this comment

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

lgtm
Ah, I remember that magic patching make magic...

@iaguis iaguis merged commit 79386c2 into rkt:master Apr 13, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants