run_qemu.sh: make ndctl compilation compatible with mkosi v15+ #80
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Regroup all ndctl stuff in the same place. Zero-functional change yet; bug-for-bug compatible. This including the bad error handling when $ndctl is not a directory. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Obvious typos and misconfiguration should not be reported after minutes. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
marc-hb
force-pushed
the
ndctl-v15
branch
2 times, most recently
from
365bb7a to
44a6651
Compare
|
Both 22.04 and 24.04 building ndctl now |
marc-hb
force-pushed
the
ndctl-v15
branch
2 times, most recently
from
bc6aa47 to
02bd882
Compare
|
Really weird error in https://github.com/pmem/run_qemu/actions/runs/12306483889/job/34348289945?pr=80, looks like a glitch... EDIT: passed after hitting "re-run" https://github.com/pmem/run_qemu/actions/runs/12306483889/job/34350101049?pr=80 |
Yeah we've seen this infrequently in the past, must have to do with certain versions of mkosi and/or filesystem tooling - hasn't appeared in a while (over a year I'd say), and yeah the solution was to just rebuild the image. |
This was referenced Dec 13, 2024
stellarhopper
requested changes
Dec 13, 2024
|
Otherwise, tested on Fedora 40 with both mkosi14, and mkosi 22, and both look good! |
Abort when trying to compile a missing ndctl/ This unhides the current mkosi.postinst incompatibility with mkosi v15 (see systemd/mkosi@9b626c647037bc8a) Simplify the ndctl logic: 1. either we really try to copy, compile and install ndctl - and abort when anything goes wrong; 2. or we don't try any of that at all. Remove intermediate, very confusing and very time-consuming states like this "opportunistic" compilation logic. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
mkosi v15 moved .postinst and others outside the container, see systemd/mkosi@9b626c647037bc8a Extract new, re-usable "reinstall.sh" script. This is left in the image for either interactive testing, use or possibly by update_existing_rootfs() in the future. Prefix reinstall.sh invocation with 'mkosi-chroot' when needed. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
pkg-config is gone in 24.04. Ubuntu 22.04 can install either. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
As --ndctl-build is on by default, the "real" way to enable ndctl is to define $ndctl. Add --ndctl-build anyway in case the default ever changes. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Should be good now. (Zero code change) |
stellarhopper
approved these changes
Dec 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
6 commits. Some finer-grained testing in #78