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

overlay sys-apps/systemd: Sync with Gentoo, bump to v255.4 and add patches for mutable overlays functionality #1753

Merged
merged 3 commits into from
Apr 24, 2024

Conversation

krnowak
Copy link
Member

@krnowak krnowak commented Mar 15, 2024

Synced with Gentoo, with unnecessary stuff being dropped. This also bumps systemd version to v255.4.

Added the patch implementing the mutable overlays in systemd-sysext - the patch is a merged patch of all the changes I have made and are already in upstream systemd. Not merging the patch would result in having 20 or so extra patches, so it'd be a hindrance. The merged patch implements the minimal mutability and a command-line flag, env var support, ephemeral mutability and some fixes. Changes with documentation and tests are not backported.

CI: #1753

  • image diff
  • changelog

@ader1990
Copy link
Contributor

I think we can also update to the gentoo upstream of 255.4 without any files content changes other than a mv on the ebuild file and syncing the upstream gentoo sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/Manifest.

Copy link

github-actions bot commented Mar 26, 2024

Build action triggered: https://github.com/flatcar/scripts/actions/runs/8803723772

@krnowak krnowak force-pushed the krnowak/systemd-sysext branch from 2c39a09 to fe7604d Compare March 26, 2024 14:58
@krnowak krnowak changed the title overlay sys-apps/systemd: Remove unnecessary stuff, regenerate patches and add patches for mutable overlays functionality overlay sys-apps/systemd: Sync with Gentoo, bump to v255.4 and add patches for mutable overlays functionality Mar 26, 2024
@krnowak krnowak force-pushed the krnowak/systemd-sysext branch from fe7604d to 41a85aa Compare March 26, 2024 15:02
@krnowak krnowak force-pushed the krnowak/systemd-sysext branch from 41a85aa to e92bf0e Compare March 26, 2024 15:15
@krnowak krnowak force-pushed the krnowak/systemd-sysext branch from e92bf0e to f73d680 Compare March 26, 2024 15:18
@@ -105,6 +107,8 @@ PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
# flag). The image stage fails with "Failed to resolve
# typeattributeset statement at
# /var/lib/selinux/mcs/tmp/modules/400/ntp/cil:120"
#
# Flatcar: Added a dep on sys-apps/kbd. TODO: Why?
Copy link
Member Author

Choose a reason for hiding this comment

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

@ader1990: Could you give me a pointer about reasons for adding sys-apps/kbd to dependencies? I'll update this comment then.

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

More info here: fcfbf18

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor

@ader1990 ader1990 left a comment

Choose a reason for hiding this comment

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

Without this commit, fcfbf18, the initrd size will grow by 3MB.

@krnowak krnowak force-pushed the krnowak/systemd-sysext branch from 62e478c to 413c66f Compare April 22, 2024 14:48
@krnowak krnowak marked this pull request as ready for review April 23, 2024 16:13
@krnowak krnowak requested a review from a team April 23, 2024 16:13
@krnowak
Copy link
Member Author

krnowak commented Apr 23, 2024

CI passed.

@krnowak krnowak merged commit 3fc61ba into main Apr 24, 2024
6 of 7 checks passed
@krnowak krnowak deleted the krnowak/systemd-sysext branch April 24, 2024 12:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants