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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 100D4138359 for ; Sat, 24 Oct 2020 22:07:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D83AE0919; Sat, 24 Oct 2020 22:07:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24E81E090F for ; Sat, 24 Oct 2020 22:07:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DAEDD340D72 for ; Sat, 24 Oct 2020 22:07:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5408E3BA for ; Sat, 24 Oct 2020 22:07:49 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1603427602.3c50f0f689d5970a4803f3e4b745993c4de180f0.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/stage1.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 3c50f0f689d5970a4803f3e4b745993c4de180f0 X-VCS-Branch: master Date: Sat, 24 Oct 2020 22:07:49 +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: 23589bda-db0a-41e2-9088-2d610b66c21b X-Archives-Hash: ec10d50a214a33c2772c12abb12dd249 Message-ID: <20201024220749.EyT_ZHzsxek51_4AmcDK3Olg8khNiobdfj9jakfPv_o@z> commit: 3c50f0f689d5970a4803f3e4b745993c4de180f0 Author: Matt Turner gentoo org> AuthorDate: Fri Oct 23 04:33:22 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Oct 23 04:33:22 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3c50f0f6 catalyst: Don't delete /usr/share/zoneinfo from stage1 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 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 :-(