Skip to content

More SDK fixes#3955

Open
chewi wants to merge 6 commits intomainfrom
chewi/more-sdk-fixes
Open

More SDK fixes#3955
chewi wants to merge 6 commits intomainfrom
chewi/more-sdk-fixes

Conversation

@chewi
Copy link
Copy Markdown
Contributor

@chewi chewi commented Apr 21, 2026

  • Stops rm_masked_debug_files Portage hook from complaining when it does nothing.
  • Stops truncating the docker build output in update_sdk_container_image.
  • Stops disabling the Portage sandboxes most of the time.
  • Applies a tentative patch to Bash to try to fix this.
  • Stops build_image from installnig packages to the image with bad USE flags.
  • Fixes baselayout so that it doesn't break update_sdk_container_image.

How to use

Try running update_sdk_container_image with a baselayout bump.

Testing done

A two-phase SDK build in Jenkins has succeeded. I also did the above.

  • Changelog entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update) -- N/A
  • Inspected CI output for image differences: /boot and /usr size, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.

chewi added 6 commits April 21, 2026 14:14
Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
We have long run with the ipc, network, and pid sandboxes disabled in
the belief that these did not work in a container even if it was
privileged. I suspect it really did work back then, but it certainly
does work now regardless.

update_sdk_container_image uses Portage in an unprivileged docker build
environment, so it is still necessary to disable these here. However,
this can be done more easily through the environment, and the regular
sandbox should work fine.

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
This generally shouldn't happen, given that we mostly only keep one
instance of a bin package, but just in case.

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
update_sdk_container_image failed to update baselayout because it
touched /sys, which is not allowed in an unprivileged docker build
environment.

dumb-tmpfiles-proc.sh does not touch existing directories, but it was
modifying the staging directory rather than the live filesystem, causing
Portage to record /sys in the package's CONTENTS and then make changes
to it when merging.

We only need to create the directories in pkg_preinst because the other
file types are already created in src_install.

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant