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 0AFE0138359 for ; Fri, 23 Oct 2020 04:50:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53C23E0920; Fri, 23 Oct 2020 04:50:30 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 4E783E0920 for ; Fri, 23 Oct 2020 04:50:30 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id b23so263928pgb.3 for ; Thu, 22 Oct 2020 21:50:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mdjB5dC3r53fDSkFjnH95DJEhB2lf28YKOEvPHfsMBs=; b=UKdeMq2JeHF9uH4ifPX2G5kA8HlY0DaavdbzglfzqhrDwKgVjVAcwQ1PG8dU8sfs5N N4mF0AGh6x7dfwwjMBqQEqRaf0MzgD1vYsxdernF1JaG4X8ukN/gV9ZMlg5vDkqs4HQb kw/ZJCgnJB5MGoPMcjMiVFdFeTcablCf84p0pl39F1tw+DEQrx36OVr3rdHEnq6ioUQy aJs/coI59ZhoIkeo4OvQLzksXUUyRo8t4n5xYN9Vh59tCiSEbxn8yfTxTF8NbNLGdN0Q NkN2btzbBfupgGJ5VCdqx991JVplBn1Sb04T27UYRnSfUv6/xqPBVzbF9W2q0kA4xR+L Kb+g== X-Gm-Message-State: AOAM533I53371RlIokqSX9oWw8cTwjY1+j1llVUjwczj410Ig421hSEX hMbse9x9Z7SQ00i4BRovYKKWPHIU3lb8SA== X-Google-Smtp-Source: ABdhPJwaCAMjQUeoMSJSske8tpkTT5vy3CX/Lc2PiT/K2uVIqLYDw/cdvnNgjqdcWBx4J0VEs/qvSQ== X-Received: by 2002:a05:6a00:230d:b029:15b:51c6:7401 with SMTP id h13-20020a056a00230db029015b51c67401mr461907pfh.61.1603428629029; Thu, 22 Oct 2020 21:50:29 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id k127sm346854pgk.10.2020.10.22.21.50.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2020 21:50:28 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 5/5] catalyst: Don't delete /usr/share/zoneinfo from stage1 Date: Thu, 22 Oct 2020 21:50:18 -0700 Message-Id: <20201023045018.567245-5-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201023045018.567245-1-mattst88@gentoo.org> References: <20201023045018.567245-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: ff96cc80-60c8-40c8-a567-ae8d248cdd34 X-Archives-Hash: 60f3d4fb9519f6f84441f6d201b4093b 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 --- 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