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.

Sign up for GitHub

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

Jump to bottom

mkosi-initrd: build using a temporary directory #3096

Merged
merged 1 commit into from
Oct 3, 2024
Merged

mkosi-initrd: build using a temporary directory #3096

merged 1 commit into from
Oct 3, 2024

Conversation

aafeijoo-suse
Copy link
Contributor

Fixes #3083

@aafeijoo-suse
Copy link
Contributor Author

wow github went crazy with the diff

@aafeijoo-suse aafeijoo-suse force-pushed the initrd-tmp-output-feat branch from f8d309f to a843223 Compare October 2, 2024 15:01
@behrmann
Copy link
Contributor

behrmann commented Oct 2, 2024

It's fine when one hides the whitespace or looks at it locally --color-moved=blocks and --color-moved-ws=allow-indentation-change ;)

DaanDeMeyer
DaanDeMeyer reviewed Oct 2, 2024
View reviewed changes
mkosi/initrd.py Outdated Show resolved Hide resolved
DaanDeMeyer
DaanDeMeyer requested changes Oct 2, 2024
View reviewed changes
Copy link
Contributor

@DaanDeMeyer DaanDeMeyer left a comment

Choose a reason for hiding this comment

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

We should ignore the symlink mkosi creates in the temporary output directory. It'll be named identically to args.output in this case

@aafeijoo-suse aafeijoo-suse force-pushed the initrd-tmp-output-feat branch from a843223 to 8f3b570 Compare October 3, 2024 07:41
@aafeijoo-suse
Copy link
Contributor Author

It's fine when one hides the whitespace or looks at it locally --color-moved=blocks and --color-moved-ws=allow-indentation-change ;)

TIL, thanks! Although I expected github to be smarter by default ;)

@aafeijoo-suse
Copy link
Contributor Author

We should ignore the symlink mkosi creates in the temporary output directory. It'll be named identically to args.output in this case

I agree with this. PTAL.

DaanDeMeyer
DaanDeMeyer reviewed Oct 3, 2024
View reviewed changes
mkosi/initrd.py Outdated Show resolved Hide resolved
@aafeijoo-suse aafeijoo-suse force-pushed the initrd-tmp-output-feat branch 5 times, most recently from 9a81932 to 5bc33b3 Compare October 3, 2024 09:12
DaanDeMeyer
DaanDeMeyer reviewed Oct 3, 2024
View reviewed changes
mkosi/initrd.py Outdated Show resolved Hide resolved
DaanDeMeyer
DaanDeMeyer reviewed Oct 3, 2024
View reviewed changes
mkosi/initrd.py Outdated Show resolved Hide resolved
@aafeijoo-suse aafeijoo-suse force-pushed the initrd-tmp-output-feat branch from 5bc33b3 to e4c118c Compare October 3, 2024 12:29
DaanDeMeyer
DaanDeMeyer requested changes Oct 3, 2024
View reviewed changes
mkosi/initrd.py Outdated Show resolved Hide resolved
@aafeijoo-suse aafeijoo-suse force-pushed the initrd-tmp-output-feat branch from e4c118c to 0c22f57 Compare October 3, 2024 13:31
@DaanDeMeyer DaanDeMeyer merged commit 6b0dfe5 into systemd:main Oct 3, 2024
36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DaanDeMeyer DaanDeMeyer DaanDeMeyer approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

--force should not remove the output when it fails
3 participants
@aafeijoo-suse @behrmann @DaanDeMeyer