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 15A5B139694 for ; Fri, 10 Mar 2017 21:02:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED2C7E0C3A; Fri, 10 Mar 2017 21:02:14 +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 B35B0E0C3A for ; Fri, 10 Mar 2017 21:02:14 +0000 (UTC) Received: from professor-x (d108-172-194-175.bchsia.telus.net [108.172.194.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 7D445340FE2 for ; Fri, 10 Mar 2017 21:02:13 +0000 (UTC) Date: Fri, 10 Mar 2017 13:02:10 -0800 From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] [PATCH 6/7] defaults.py: Update all repository, DISTDIR, PKGDIR settings to new /var paths Message-ID: <20170310130210.5fc9f3d2.dolsen@gentoo.org> In-Reply-To: <20170310123606.5692a8ab.dolsen@gentoo.org> References: <20170310112332.110a36fd.dolsen@gentoo.org> <20170310123606.5692a8ab.dolsen@gentoo.org> Organization: Gentoo 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 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: 0fb47e1e-36b0-4c8e-b9e7-764e9585d22d X-Archives-Hash: a49f5552b8c1ddd57f16af267779cefd On Fri, 10 Mar 2017 12:36:06 -0800 Brian Dolbec wrote: > On Fri, 10 Mar 2017 11:51:07 -0800 > Zac Medico wrote: > > > On Fri, Mar 10, 2017 at 11:23 AM, Brian Dolbec > > wrote: > > > @@ -75,8 +75,8 @@ TARGET_MOUNT_DEFAULTS = { > > > "distdir": "/usr/portage/distfiles", > > > "icecream": "/usr/lib/icecc/bin", > > > "kerncache": "/tmp/kerncache", > > > - "packagedir": "/usr/portage/packages", > > > - "portdir": "/usr/portage", > > > + "packagedir": "/var/portage/packages", > > > + "portdir": "/var/portage/repos", > > > "port_tmpdir": "/var/tmp/portage", > > > "port_logdir": "/var/log/portage", > > > "proc": "/proc", > > > @@ -86,8 +86,8 @@ TARGET_MOUNT_DEFAULTS = { > > > SOURCE_MOUNT_DEFAULTS = { > > > "dev": "/dev", > > > "devpts": "/dev/pts", > > > - "distdir": "/usr/portage/distfiles", > > > - "portdir": "/usr/portage", > > > + "distdir": "/var/portage/distfiles", > > > + "portdir": "/var/portage/repos", > > > "port_tmpdir": "tmpfs", > > > "proc": "/proc", > > > "shm": "shmfs", > > > > Shouldn't those portdir settings be /var/portage/repos/gentoo or > > something like that? > > No, that is the base directory for it to unpack or rsync the repo to. > It is a little confusing because of the way the code was written > before. I'll have to get in there and rename that to 'reposdir' to > better reflect the way it is used. > > Note, those settings were only temporary for testing that the code was > ready for relocation. I think I'll change them to /var/gentoo as the > base for now. Then we can change them when the council has decreed > the final location. > Also, with these code changes, it completely separates the source host system source tree used to generate the snapshot and the target location and name of the snapshot tree and it's new location during stage generation. The new stage will end up with the new settings in its make.conf. This makes it possible for a host with traditional /usr/portage or any other location or name to generate a snapshot with a completely different base repo name. This will make it possible for the infra severs generating the snapshot and stages to not need to be migrated to the new defaults in order to generate the snapshots and stages with the new settings. In fact, using an alternate config, the same servers could generate both old (portage) and new (gentoo) snapshots for an interim if desired. Well, I think the snapshots should be to give time for users to migrate their systems for the new tree directory name. That is if this code is used to generate the daily tree snapshots. One thing to note is that you must first edit the catalyst.conf to add/edit the new config variables, then generate a new snapshot before doing stage runs. repo_basedir="/usr" repo_name="portage" target_distdir="/usr/portage/distfiles" target_pkgdir="/usr/portage/packages" Using these settings, creates a snapshot and make.conf with the traditional locations directory names. And completely overrides the new defaults. Changing the reponame to "gentoo" requires you first generate a snapshot (the repo_name is used as the target dir and in the final tarball name). The stage building process will look for the snapshot with that same name and specified version. So, derivative distros could more easily use catalyst to generate their own stages and snapshots. Not to mention gentoo change locations and repo names to something new without needing code changes to do so. It would be a simple config edit. -- Brian Dolbec