From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A6A5815800D for ; Sat, 1 Jul 2023 19:27:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1C69E0885; Sat, 1 Jul 2023 19:27:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDECEE0885 for ; Sat, 1 Jul 2023 19:27:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA34E33BF05 for ; Sat, 1 Jul 2023 19:27:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41457A9B for ; Sat, 1 Jul 2023 19:27:43 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1688239574.9d6e495ca2ee55c21befc183a9a56fc5062a63c7.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/defaults.py X-VCS-Directories: catalyst/ catalyst/base/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 9d6e495ca2ee55c21befc183a9a56fc5062a63c7 X-VCS-Branch: master Date: Sat, 1 Jul 2023 19:27:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 40f01c50-6aa4-4374-bb3a-5efe9a400079 X-Archives-Hash: e4a09624779289938af0ee2b8ec8bb6b commit: 9d6e495ca2ee55c21befc183a9a56fc5062a63c7 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Jul 1 17:44:41 2023 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Jul 1 19:26:14 2023 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9d6e495c stagebase: Fix and improve port_logdir config option NOTE: The cleaning of log files does not work yet (and probably never did). Signed-off-by: Andreas K. Hüttel gentoo.org> catalyst/base/stagebase.py | 7 +++---- catalyst/defaults.py | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 65f4306e..74d197b5 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -271,9 +271,8 @@ class StageBase(TargetBase, ClearBase, GenBase): if "port_logdir" in self.settings: self.mount['port_logdir']['enable'] = True - self.mount['port_logdir']['source'] = self.settings['port_logdir'] - self.env["PORT_LOGDIR"] = self.settings["port_logdir"] - self.env["PORT_LOGDIR_CLEAN"] = PORT_LOGDIR_CLEAN + self.mount['port_logdir']['source'] = normpath(self.settings['port_logdir'] + "/" + self.settings["target_subpath"] + "/") + self.env["PORTAGE_LOGDIR"] = self.settings["target_logdir"] def override_cbuild(self): if "CBUILD" in self.makeconf: @@ -1002,7 +1001,7 @@ class StageBase(TargetBase, ClearBase, GenBase): # We may need to create the source of the bind mount. E.g., in the # case of an empty package cache we must create the directory that # the binary packages will be stored into. - source_path.mkdir(mode=0o755, exist_ok=True) + source_path.mkdir(mode=0o755, parents=True, exist_ok=True) Path(target).mkdir(mode=0o755, parents=True, exist_ok=True) diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 2cede562..39b71c34 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -25,6 +25,7 @@ valid_config_file_values = frozenset([ "sharedir", "storedir", "target_distdir", + "target_logdir", "target_pkgdir", "var_tmpfs_portage", ]) @@ -53,6 +54,7 @@ confdefaults = { "shdir": "%(sharedir)s/targets", "storedir": "/var/tmp/catalyst", "target_distdir": "/var/cache/distfiles", + "target_logdir": "/var/log/portage", "target_pkgdir": "/var/cache/binpkgs", }