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 1F80A159C96 for ; Tue, 30 Jul 2024 11:06:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57499E29F4; Tue, 30 Jul 2024 11:06:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 2EBF8E29F4 for ; Tue, 30 Jul 2024 11:06:23 +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 4EAFA335D6B 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 9F88A1E82 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: <1722337565.35e6088eda0c2c8197c16382f3ba29a69eea60ec.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: 35e6088eda0c2c8197c16382f3ba29a69eea60ec 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: 7e06d5f5-ba21-4660-9ee8-3ed06e195ff6 X-Archives-Hash: 3cc2310c7b351cb7abc75d4107d50786 commit: 35e6088eda0c2c8197c16382f3ba29a69eea60ec Author: Doug Freed mtu edu> AuthorDate: Tue Jul 30 01:08:02 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Jul 30 11:06:05 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=35e6088e stagebase: create profile link for ROOT too Signed-off-by: Andreas K. Hüttel gentoo.org> catalyst/base/stagebase.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index df2da7ef..ad7cd12e 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -883,6 +883,17 @@ class StageBase(TargetBase, ClearBase, GenBase): make_profile.symlink_to(os.path.relpath(chroot_profile_path, chroot_port_conf), target_is_directory=True) + if self.settings['root_path'] != '/': + log.info('Configuring ROOT profile link...') + + # stage_path is chroot_path + root_path + root_port_conf = Path(self.settings['stage_path'] + self.settings['port_conf']) + root_make_profile = root_port_conf / 'make.profile' + root_make_profile.unlink(missing_ok=True) + + root_make_profile.symlink_to(os.path.relpath(chroot_profile_path, root_port_conf), + target_is_directory=True) + def setup_confdir(self): if "autoresume" in self.settings["options"] \ and self.resume.is_enabled("setup_confdir"): 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 02D30159C9B for ; Fri, 9 Aug 2024 19:34:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 933D42BC01F; 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 5DA122BC01F 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 44B743430F9 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 AA54E1ED7 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: <1722337565.35e6088eda0c2c8197c16382f3ba29a69eea60ec.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: 35e6088eda0c2c8197c16382f3ba29a69eea60ec 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: 7d39b642-7fee-4871-b646-1e67c3b81a23 X-Archives-Hash: 1d5deb6dd2f4043087dce7e0edf4c94d Message-ID: <20240809193407.8-VUU1ENOdisqJjc5Ijkjq1cUHO4NNeEjN0H1raP_Qo@z> commit: 35e6088eda0c2c8197c16382f3ba29a69eea60ec Author: Doug Freed mtu edu> AuthorDate: Tue Jul 30 01:08:02 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Jul 30 11:06:05 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=35e6088e stagebase: create profile link for ROOT too Signed-off-by: Andreas K. Hüttel gentoo.org> catalyst/base/stagebase.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index df2da7ef..ad7cd12e 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -883,6 +883,17 @@ class StageBase(TargetBase, ClearBase, GenBase): make_profile.symlink_to(os.path.relpath(chroot_profile_path, chroot_port_conf), target_is_directory=True) + if self.settings['root_path'] != '/': + log.info('Configuring ROOT profile link...') + + # stage_path is chroot_path + root_path + root_port_conf = Path(self.settings['stage_path'] + self.settings['port_conf']) + root_make_profile = root_port_conf / 'make.profile' + root_make_profile.unlink(missing_ok=True) + + root_make_profile.symlink_to(os.path.relpath(chroot_profile_path, root_port_conf), + target_is_directory=True) + def setup_confdir(self): if "autoresume" in self.settings["options"] \ and self.resume.is_enabled("setup_confdir"):