public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Matt Turner <mattst88@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Matt Turner <mattst88@gentoo.org>
Subject: [gentoo-catalyst] [PATCH 3/7] catalyst: Remove some redundant set_stage_path()s
Date: Sat, 19 Dec 2020 21:28:44 -0500	[thread overview]
Message-ID: <20201220022848.249207-3-mattst88@gentoo.org> (raw)
In-Reply-To: <20201220022848.249207-1-mattst88@gentoo.org>

We only need to override root_path, and stage_path will be configured
properly.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 catalyst/targets/embedded.py | 5 -----
 catalyst/targets/stage1.py   | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index e9138437..918b36bf 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -65,11 +65,6 @@ class embedded(StageBase):
             "clear_autoresume",
         ])
 
-    def set_stage_path(self):
-        self.settings["stage_path"] = normpath(
-            self.settings["chroot_path"]+"/tmp/mergeroot")
-        log.info('embedded stage path is %s', self.settings['stage_path'])
-
     def set_root_path(self):
         self.settings["root_path"] = normpath("/tmp/mergeroot")
         log.info('embedded root path is %s', self.settings['root_path'])
diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
index be3eae93..5aa27bb9 100644
--- a/catalyst/targets/stage1.py
+++ b/catalyst/targets/stage1.py
@@ -23,11 +23,6 @@ class stage1(StageBase):
     def __init__(self, spec, addlargs):
         StageBase.__init__(self, spec, addlargs)
 
-    def set_stage_path(self):
-        self.settings["stage_path"] = normpath(
-            self.settings["chroot_path"]+self.settings["root_path"])
-        log.notice('stage1 stage path is %s', self.settings['stage_path'])
-
     def set_root_path(self):
         # sets the root path, relative to 'chroot_path', of the stage1 root
         self.settings["root_path"] = normpath("/tmp/stage1root")
-- 
2.26.2



  parent reply	other threads:[~2020-12-20  2:28 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-20  2:28 [gentoo-catalyst] [PATCH 1/7] catalyst: Set stage_path = chroot_path + root_path Matt Turner
2020-12-20  2:28 ` [gentoo-catalyst] [PATCH 2/7] catalyst: Remove set_dest_path() Matt Turner
2020-12-20  2:28 ` Matt Turner [this message]
2020-12-20  2:28 ` [gentoo-catalyst] [PATCH 4/7] targets: Remove EBEEP_IGNORE / EPAUSE_IGNORE Matt Turner
2020-12-20  2:28 ` [gentoo-catalyst] [PATCH 5/7] targets: Pass separate arguments to run_merge() Matt Turner
2020-12-20  2:28 ` [gentoo-catalyst] [PATCH 6/7] targets: Remove make_destpath() function Matt Turner
2020-12-20  2:28 ` [gentoo-catalyst] [PATCH 7/7] targets: Emerge stage1 with --implicit-system-deps=n Matt Turner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201220022848.249207-3-mattst88@gentoo.org \
    --to=mattst88@gentoo.org \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox