]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Merge pull request #1692 from DaanDeMeyer/stuff
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sat, 22 Jul 2023 18:19:02 +0000 (20:19 +0200)
committerGitHub <noreply@github.com>
Sat, 22 Jul 2023 18:19:02 +0000 (20:19 +0200)
More stuff

1  2 
mkosi/distributions/gentoo.py

index e99e031a2753dcb6d5328f6d470f1a4da458cc3f,2cfcd9d0ec3ed6e5066bd35c91a782054b93cb7d..fd99909c2c63adcc18fb0830d884ac4bdfc99e0f
@@@ -124,27 -131,8 +115,27 @@@ class GentooInstaller(DistributionInsta
          for d in ("binpkgs", "distfiles", "repos/gentoo"):
              (state.cache_dir / d).mkdir(parents=True, exist_ok=True)
  
-         copy_path(state.pkgmngr, stage3, preserve_owner=False)
+         copy_tree(state.config, state.pkgmngr, stage3, preserve_owner=False)
  
 +        features = " ".join([
 +            "getbinpkg",
 +            "-candy",
 +            # Disable sandboxing in emerge because we already do it in mkosi.
 +            "-sandbox",
 +            "-userfetch",
 +            "-userpriv",
 +            "-usersandbox",
 +            "-usersync",
 +            "-ebuild-locks",
 +            "parallel-install",
 +            *(["noman", "nodoc", "noinfo"] if state.config.with_docs else []),
 +        ])
 +
 +        # Setting FEATURES via the environment variable does not seem to apply to ebuilds in portage, so we
 +        # append to /etc/portage/make.conf instead.
 +        with (stage3 / "etc/portage/make.conf").open("a") as f:
 +            f.write(f"\nFEATURES=\"${{FEATURES}} {features}\"\n")
 +
          bwrap(
              cmd=["chroot", "emerge-webrsync"],
              apivfs=stage3,