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 33A01139694 for ; Thu, 16 Mar 2017 22:57:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E43221C18E; Thu, 16 Mar 2017 22:57:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDA9D21C18E for ; Thu, 16 Mar 2017 22:57:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2D452340FDA for ; Thu, 16 Mar 2017 22:57:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 323B16AB4 for ; Thu, 16 Mar 2017 22:57:02 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1489704971.e2293d1c1dd2c30c9479b74ed243722bca36846f.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/defaults.py X-VCS-Directories: catalyst/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: e2293d1c1dd2c30c9479b74ed243722bca36846f X-VCS-Branch: pending Date: Thu, 16 Mar 2017 22:57:02 +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-Archives-Salt: 760734c5-2aaf-45a8-894b-1c9ec9567072 X-Archives-Hash: 51573d6741861652c3f76afc3cf471dd commit: e2293d1c1dd2c30c9479b74ed243722bca36846f Author: Brian Dolbec gentoo org> AuthorDate: Thu Mar 9 09:24:22 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Mar 16 22:56:11 2017 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e2293d1c defaults.py: Update all repository, DISTDIR, PKGDIR settings to new /var paths All settings are still configurable in catalyst.conf. These are new reasonable settings for a relocated tree system. A user can still set their own locations during install, or at a later time. Default catalyst.conf settings will be changed at a later time after additional testing and the automatic stage building scripts have been updated. catalyst/defaults.py | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 84ed282..ed5766d 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -31,6 +31,15 @@ valid_config_file_values.extend([ "distcc", "envscript", "compression_mode", "compressor_options", "decompressor_search_order", ]) +# set our base defaults here to keep +# them in one location. +BASE_GENTOO_DIR = "/var/gentoo" +REPODIR = BASE_GENTOO_DIR + "/repos" +DISTDIR = BASE_GENTOO_DIR + "/distfiles" +PKGDIR = BASE_GENTOO_DIR + "/packages" +MAINREPO = "gentoo" +PORTDIR = REPODIR + "/" + MAINREPO + confdefaults={ "archdir": "%(PythonDir)s/arch", "comp_prog": COMPRESSOR_PROGRAM_OPTIONS[TAR], @@ -39,28 +48,28 @@ confdefaults={ "compressor_options": XATTRS_OPTIONS[TAR], "decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS[TAR], "decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER, - "distdir": "/usr/portage/distfiles", + "distdir": DISTDIR[:], "hash_function": "crc32", "icecream": "/var/cache/icecream", 'list_xattrs_opt': LIST_XATTRS_OPTIONS[TAR], - "local_overlay": "/usr/local/portage", + "local_overlay": REPODIR[:] + "/local", "port_conf": "/etc/portage", "make_conf": "%(port_conf)s/make.conf", "options": set(), - "packagedir": "/usr/portage/packages", - "portdir": "/usr/portage", + "packagedir": PKGDIR[:], + "portdir": PORTDIR[:], "port_tmpdir": "/var/tmp/portage", "PythonDir": "./catalyst", - "repo_basedir": "/usr", - "repo_name": "portage", + "repo_basedir": REPODIR[:], + "repo_name": MAINREPO[:], "sharedir": "/usr/share/catalyst", "shdir": "/usr/share/catalyst/targets/", "snapshot_cache": "/var/tmp/catalyst/snapshot_cache", - "snapshot_name": "portage-", + "snapshot_name": "%(repo_name)s-", "source_matching": "strict", "storedir": "/var/tmp/catalyst", - "target_distdir": "/var/portage/distfiles", - "target_pkgdir":"/var/portage/packages", + "target_distdir": DISTDIR[:], + "target_pkgdir": PKGDIR[:], } DEFAULT_CONFIG_FILE = '/etc/catalyst/catalyst.conf' @@ -72,11 +81,11 @@ TARGET_MOUNT_DEFAULTS = { "ccache": "/var/tmp/ccache", "dev": "/dev", "devpts": "/dev/pts", - "distdir": "/usr/portage/distfiles", + "distdir": DISTDIR[:], "icecream": "/usr/lib/icecc/bin", "kerncache": "/tmp/kerncache", - "packagedir": "/usr/portage/packages", - "portdir": "/usr/portage", + "packagedir": PKGDIR[:], + "portdir": PORTDIR[:], "port_tmpdir": "/var/tmp/portage", "port_logdir": "/var/log/portage", "proc": "/proc", @@ -86,8 +95,8 @@ TARGET_MOUNT_DEFAULTS = { SOURCE_MOUNT_DEFAULTS = { "dev": "/dev", "devpts": "/dev/pts", - "distdir": "/usr/portage/distfiles", - "portdir": "/usr/portage", + "distdir": DISTDIR[:], + "portdir": PORTDIR[:], "port_tmpdir": "tmpfs", "proc": "/proc", "shm": "shmfs",