From: Paymon MARANDI <Paymon MARANDI darwinskernel@gmail.com>
Date: Thu, 22 Jun 2023 12:10:57 +0000 (-0400)
Subject: gentoo: drop .cache_isclean
X-Git-Tag: v15~103^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81cc772feac4e107d8a47b2d80765fd48240961c;p=thirdparty%2Fmkosi.git

gentoo: drop .cache_isclean

Signed-off-by: Paymon MARANDI <darwinskernel@gmail.com>
---

diff --git a/.github/mkosi.conf.d/20-gentoo.conf b/.github/mkosi.conf.d/20-gentoo.conf
index e204ac2ed..aface14f3 100644
--- a/.github/mkosi.conf.d/20-gentoo.conf
+++ b/.github/mkosi.conf.d/20-gentoo.conf
@@ -6,5 +6,6 @@ Repositories=https://raw.githubusercontent.com/257/binpkgs/master
 
 [Content]
 Packages=sys-kernel/gentoo-kernel-bin
-         systemd
+         sys-apps/systemd
+         sys-apps/gentoo-systemd-integration
 
diff --git a/mkosi/distributions/gentoo.py b/mkosi/distributions/gentoo.py
index ec2df6bd1..9133b8fb7 100644
--- a/mkosi/distributions/gentoo.py
+++ b/mkosi/distributions/gentoo.py
@@ -88,11 +88,6 @@ class GentooInstaller(DistributionInstaller):
             f"releases/{arch}/autobuilds/latest-stage3.txt",
         )
 
-        ###########################################################
-        # GENTOO_UPSTREAM: wait for fix upstream:
-        # https://bugs.gentoo.org/690294
-        # and more... so we can gladly escape all this hideousness!
-        ###########################################################
         with urllib.request.urlopen(stage3tsf_path_url) as r:
             # e.g.: 20230108T161708Z/stage3-amd64-nomultilib-systemd-mergedusr-20230108T161708Z.tar.xz
             regexp = rf"^[0-9]+T[0-9]+Z/stage3-{arch}-nomultilib-systemd-mergedusr-[0-9]+T[0-9]+Z\.tar\.xz"
@@ -121,7 +116,7 @@ class GentooInstaller(DistributionInstaller):
                 urllib.request.urlretrieve(stage3_url_path, stage3_tar_path)
         stage3_cache.mkdir(parents=True, exist_ok=True)
 
-        if not stage3_cache.joinpath(".cache_isclean").exists():
+        if next(stage3_cache.iterdir(), None) is None:
             with complete_step(f"Extracting {stage3_tar.name} to {stage3_cache}"):
                 run([
                     "tar",
@@ -133,8 +128,6 @@ class GentooInstaller(DistributionInstaller):
                     "--exclude", "./proc",
                 ])
 
-            stage3_cache.joinpath(".cache_isclean").touch()
-
         for d in ("binpkgs", "distfiles", "repos"):
             state.cache_dir.joinpath(d).mkdir(exist_ok=True)