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 B6A5A138350 for ; Wed, 15 Apr 2020 18:29:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9508E082F; Wed, 15 Apr 2020 18:29:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 AF4B6E082F for ; Wed, 15 Apr 2020 18:29:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 1A90D34F131 for ; Wed, 15 Apr 2020 18:29:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF3AC71 for ; Wed, 15 Apr 2020 18:29:45 +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: <1586973843.92af7453a386fb5bd1b03ba5afae6d0165fe4364.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/targets/stage1.py X-VCS-Directories: catalyst/targets/ catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 92af7453a386fb5bd1b03ba5afae6d0165fe4364 X-VCS-Branch: master Date: Wed, 15 Apr 2020 18:29:45 +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: 5edecf74-c5d8-4a02-b020-e51bb9ae2f42 X-Archives-Hash: 64040068e4ccd90b2ce7760501e8df2d commit: 92af7453a386fb5bd1b03ba5afae6d0165fe4364 Author: Matt Turner gentoo org> AuthorDate: Wed Apr 15 18:00:15 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Apr 15 18:04:03 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=92af7453 catalyst: Remove dead base_dirs() function Prior to commit 8ef6e85a57ec (catalyst: Drop BSD remnants) this was used for some FreeBSD-specific logic. Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 5 +---- catalyst/targets/stage1.py | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index b01e4825..d993641f 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -528,7 +528,7 @@ class StageBase(TargetBase, ClearBase, GenBase): """Set basic stage1, 2, 3 action sequences""" self.settings["action_sequence"] = ["unpack", "unpack_snapshot", "setup_confdir", "portage_overlay", - "base_dirs", "bind", "chroot_setup", "setup_environment", + "bind", "chroot_setup", "setup_environment", "run_local", "preclean", "unbind", "clean"] self.set_completion_action_sequences() @@ -940,9 +940,6 @@ class StageBase(TargetBase, ClearBase, GenBase): cmd(['rsync', '-a', x + '/', self.settings['chroot_path']], env=self.env) - def base_dirs(self): - pass - def bind(self): for x in self.mounts: log.debug('bind(); x = %s', x) diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py index 4ce0d0b4..a1a29cff 100644 --- a/catalyst/targets/stage1.py +++ b/catalyst/targets/stage1.py @@ -77,9 +77,6 @@ class stage1(StageBase): "If you break it, you buy it. Don't complain to us about it.\n" "Don't say we did not warn you.") - def base_dirs(self): - pass - def set_mounts(self): # stage_path/proc probably doesn't exist yet, so create it ensure_dirs(self.settings["stage_path"]+"/proc")