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 61614159C96 for ; Tue, 30 Jul 2024 11:06:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F39FE29F0; Tue, 30 Jul 2024 11:06:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 73180E29F0 for ; Tue, 30 Jul 2024 11:06:22 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E2DE335D75 for ; Tue, 30 Jul 2024 11:06:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B5331E81 for ; Tue, 30 Jul 2024 11:06:19 +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: <1722337556.cde8a57f8c7b40e66cc6fda6f923bd8b2f21297c.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: cde8a57f8c7b40e66cc6fda6f923bd8b2f21297c X-VCS-Branch: master Date: Tue, 30 Jul 2024 11:06:19 +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: 38525819-ad01-49ce-9f3f-2e2c9fa8e4a3 X-Archives-Hash: e62b39bbbdde93815df02987f87bfbfd commit: cde8a57f8c7b40e66cc6fda6f923bd8b2f21297c Author: Doug Freed mtu edu> AuthorDate: Tue Jul 30 00:00:40 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Jul 30 11:05:56 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cde8a57f stagebase: clean up config_profile_link Signed-off-by: Andreas K. Hüttel gentoo.org> catalyst/base/stagebase.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 2dcf6d71..df2da7ef 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -864,18 +864,23 @@ class StageBase(TargetBase, ClearBase, GenBase): def config_profile_link(self): log.info('Configuring profile link...') - make_profile = Path(self.settings['chroot_path'] + self.settings['port_conf'], - 'make.profile') + + chroot_port_conf = Path(self.settings['chroot_path'] + self.settings['port_conf']) + make_profile = chroot_port_conf / 'make.profile' make_profile.unlink(missing_ok=True) + try: repo_name, target_profile = self.settings['target_profile'].split(":", 1) except ValueError: repo_name = self.settings['repo_name'] target_profile = self.settings['target_profile'] - make_profile.symlink_to(Path('../..' + self.settings['repo_basedir'], - repo_name, - 'profiles', - target_profile), + + chroot_profile_path = Path(self.settings['chroot_path'] + self.settings['repo_basedir'], + repo_name, + 'profiles', + target_profile) + + make_profile.symlink_to(os.path.relpath(chroot_profile_path, chroot_port_conf), target_is_directory=True) def setup_confdir(self): 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 4057A159C9B for ; Fri, 9 Aug 2024 19:34:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D2B4E2B8B; Fri, 9 Aug 2024 19:34:11 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 4516DE2B8C for ; Fri, 9 Aug 2024 19:34:11 +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 33AC03430F7 for ; Fri, 9 Aug 2024 19:34:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 96C991ED6 for ; Fri, 9 Aug 2024 19:34:07 +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: <1722337556.cde8a57f8c7b40e66cc6fda6f923bd8b2f21297c.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: cde8a57f8c7b40e66cc6fda6f923bd8b2f21297c X-VCS-Branch: dilfridge/qcow2 Date: Fri, 9 Aug 2024 19:34:07 +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: dbca526f-1964-4412-a895-6e38310465dc X-Archives-Hash: 59a75792de0d8a4733e6ce811f1dfe70 Message-ID: <20240809193407.e3PtZsCd5M00Pybv3LY-HJ5Me17wEvmLQsl3hb90KXA@z> commit: cde8a57f8c7b40e66cc6fda6f923bd8b2f21297c Author: Doug Freed mtu edu> AuthorDate: Tue Jul 30 00:00:40 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Jul 30 11:05:56 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cde8a57f stagebase: clean up config_profile_link Signed-off-by: Andreas K. Hüttel gentoo.org> catalyst/base/stagebase.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 2dcf6d71..df2da7ef 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -864,18 +864,23 @@ class StageBase(TargetBase, ClearBase, GenBase): def config_profile_link(self): log.info('Configuring profile link...') - make_profile = Path(self.settings['chroot_path'] + self.settings['port_conf'], - 'make.profile') + + chroot_port_conf = Path(self.settings['chroot_path'] + self.settings['port_conf']) + make_profile = chroot_port_conf / 'make.profile' make_profile.unlink(missing_ok=True) + try: repo_name, target_profile = self.settings['target_profile'].split(":", 1) except ValueError: repo_name = self.settings['repo_name'] target_profile = self.settings['target_profile'] - make_profile.symlink_to(Path('../..' + self.settings['repo_basedir'], - repo_name, - 'profiles', - target_profile), + + chroot_profile_path = Path(self.settings['chroot_path'] + self.settings['repo_basedir'], + repo_name, + 'profiles', + target_profile) + + make_profile.symlink_to(os.path.relpath(chroot_profile_path, chroot_port_conf), target_is_directory=True) def setup_confdir(self):