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

Finish merged-usr process for generic images, move SDK over to it too #2068

Merged
merged 8 commits into from
Sep 5, 2024
Merged

Finish merged-usr process for generic images, move SDK over to it too #2068

merged 8 commits into from
Sep 5, 2024
+84 −203

Commits on Sep 5, 2024

  1. overlay sys-apps/baselayout: Refactor and complete merged-usr process 

    The initial goals of this commit were:

- drop symlink-usr USE flag and keep the code paths where symlink-usr
was evaluated to true,

- make sbin a symlink to its bin counterpart, effectively doing the
merged-sbin process too

- unify filesystem layouts of the SDK and generic images.

But over the course, more changes have accumulated:

- use EAPI 8,

- drop the check_sym function - it never worked due to typos
  (real_path and real_value versus read_path and read_value),

- do the SDK-specific or generic-image-specific customizations in the
  src_prepare phase,

- follow the changes made in the baselayout repository:

  - remove unnecessary tmpfiles.d conf files instead of fiddling with
    sed to edit them:

    - in the baselayout repo, the conf files were split to make it
      possible,

  - use tmpfiles.d to create core home directory:

    - used to be done differently for generic images and for SDKs,

  - use dumb-tmpfiles-proc.sh instead of systemd's tmpfile processor:

    - this removes the need to install valid passwd and group files
      into /etc before,

    - also it seems to be fixing some issues with installing files for
      users and groups that weren't there anyway,

  - drop generating of baselayout-usr in src_compile, and creating
    debug directories in pkg_preinst, these are handled by the
    Makefile now

    - this made inheriting systemd and tmpfiles eclasses unnecessary

- install files in the src_install phase and install the directory
  structure in the pkg_preinst phase:

  - empty directories created in src_install are not guaranteed to be
    preserved, and indeed at some point /usr/local/bin was not
    installed on the final rootfs,

- currently installed /etc/passwd and /etc/group are now empty

- drop DEPEND variable entirely - systemd isn't really needed, I don't
  know what was the point of depending on libidn2, and the rest were
  conflicts with some old versions of packages.
    @krnowak
    krnowak committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    35325ae View commit details
    Browse the repository at this point in the history

  2. overlay coreos-base/update_engine: Drop symlink-usr USE flag 

    It's gone, assuming its enabled.
    @krnowak
    krnowak committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    83341df View commit details
    Browse the repository at this point in the history

  3. overlay sys-kernel/coreos-modules: Drop a mention of symlink-usr

    @krnowak
    krnowak committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    b0ab201 View commit details
    Browse the repository at this point in the history

  4. coreos profiles: Drop unused symlink-usr USE flag

    @krnowak
    krnowak committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    c1c162e View commit details
    Browse the repository at this point in the history

  5. overlay profiles: Some cleanups 

    Mask split-usr globally, not only for generic images. Move some SDK
only USE flags to SDK target profile (cros_host, expat). Drop
duplicated disabling of cups USE flag.
    @krnowak
    krnowak committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    c850079 View commit details
    Browse the repository at this point in the history

  6. overlay app-admin/sudo: Keep /etc/sudoers.d directory 

    It seems to be randomly kept or removed during installation, and we
need the directory when creating the SDK container.
    @krnowak
    krnowak committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    c134bac View commit details
    Browse the repository at this point in the history

  7. overlay coreos/config: Drop split-usr workarounds for sys-apps/kmod

    @krnowak
    krnowak committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    e893cc8 View commit details
    Browse the repository at this point in the history

  8. changelog: Add an entry

    @krnowak
    krnowak committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    f3f51ed View commit details
    Browse the repository at this point in the history