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 5/5] catalyst: Don't delete /usr/share/zoneinfo from stage1
Date: Thu, 22 Oct 2020 21:50:18 -0700	[thread overview]
Message-ID: <20201023045018.567245-5-mattst88@gentoo.org> (raw)
In-Reply-To: <20201023045018.567245-1-mattst88@gentoo.org>

I have no clue why we would want to (or even bother) delete the
timezone data out of stage1. It's been this way since the initial
catalyst 2.0 import.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 catalyst/targets/stage1.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
index 93c62877..2c09a41f 100644
--- a/catalyst/targets/stage1.py
+++ b/catalyst/targets/stage1.py
@@ -36,7 +36,8 @@ class stage1(StageBase):
     def set_cleanables(self):
         StageBase.set_cleanables(self)
         self.settings["cleanables"].extend([
-            "/usr/share/zoneinfo", self.settings["port_conf"] + "/package*"])
+            self.settings["port_conf"] + "/package*",
+        ])
 
     # XXX: How do these override_foo() functions differ from the ones in StageBase and why aren't they in stage3_target?
     # XXY: It appears the difference is that these functions are actually doing something and the ones in stagebase don't :-(
-- 
2.26.2



      parent reply	other threads:[~2020-10-23  4:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-23  4:50 [gentoo-catalyst] [PATCH 1/5] catalyst: Fix indentation Matt Turner
2020-10-23  4:50 ` [gentoo-catalyst] [PATCH 2/5] catalyst: Drop stray vim modeline Matt Turner
2020-10-23  4:50 ` [gentoo-catalyst] [PATCH 3/5] catalyst: Drop useless stage3 set_cleanables() Matt Turner
2020-10-23  4:50 ` [gentoo-catalyst] [PATCH 4/5] catalyst: Explicitly keep /etc/resolv.conf in stage4 Matt Turner
2020-10-23  4:50 ` Matt Turner [this message]

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=20201023045018.567245-5-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