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

Revert "Resolve symlink path for qemu directory if possible" #18322

Merged
merged 1 commit into from
Apr 24, 2023

Conversation

n8henrie
Copy link
Contributor

This reverts commit 6b64589 (Resolve
symlink path for qemu directory if possible).

Fully resolving the symlink to qemu solves some issues for
aarch64-darwin nix with regards to finding edk2-aarch64-code.fd, but
unfortunately the fully resolved path includes the version number,
making it so that even patch updates break the path to
homebrew-installed qemu files.

Fixes #18111

Does this PR introduce a user-facing change?

Do not fully resolve symlinks in the path to `edk2-aarch64-code.fd` to prevent
breakage with qemu updates.

@Luap99
Copy link
Member

Luap99 commented Apr 24, 2023

Thanks, you need to add your sign off to the commit. And I assume you also need to add [NO NEW TESTS NEEDED] in the commit message to bypass that CI check for tests as this stuff is untested at the moment.

@n8henrie
Copy link
Contributor Author

Thanks, you need to add your sign off to the commit.

Huh, I reviewed the PR guidelines and remembered a signature was required. It prompted for my GPG signature (which I entered), so I thought I got that part right. Will try again.

And I assume you also need to add [NO NEW TESTS NEEDED] in the commit message

Done

This reverts commit 6b64589 (Resolve
symlink path for qemu directory if possible).

Fully resolving the symlink to qemu solves some issues for
aarch64-darwin nix with regards to finding `edk2-aarch64-code.fd`, but
unfortunately the fully resolved path includes the version number,
making it so that even patch updates break the path to
homebrew-installed qemu files.

Fixes containers#18111

[NO NEW TESTS NEEDED]

Signed-off-by: Nathan Henrie <[email protected]>
@n8henrie
Copy link
Contributor Author

Ah, got it.

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM
@baude @ashley-cui PTAL

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 24, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99, n8henrie

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 24, 2023
@ashley-cui
Copy link
Member

/lgtm
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 24, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 24, 2023
@rhatdan
Copy link
Member

rhatdan commented Apr 24, 2023

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 24, 2023
@openshift-ci openshift-ci bot merged commit 5b45546 into containers:main Apr 24, 2023
@devrimbaris
Copy link

Is this deployed to 1.0.1? I still get the same error on M1 .

@Luap99
Copy link
Member

Luap99 commented May 24, 2023

I don't think so, lets get this into 4.5.1

/cherry-pick v4.5

@openshift-cherrypick-robot
Copy link
Collaborator

@Luap99: new pull request created: #18677

In response to this:

I don't think so, lets get this into 4.5.1

/cherry-pick v4.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Aug 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Podman relies in config on specific qemu version to start a machine
6 participants