From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 51F24138247 for ; Sat, 14 Dec 2013 22:25:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E760BE0B2D; Sat, 14 Dec 2013 22:24:47 +0000 (UTC) Received: from qmta02.westchester.pa.mail.comcast.net (qmta02.westchester.pa.mail.comcast.net [76.96.62.24]) by pigeon.gentoo.org (Postfix) with ESMTP id 3F114E0B10 for ; Sat, 14 Dec 2013 22:24:46 +0000 (UTC) Received: from omta18.westchester.pa.mail.comcast.net ([76.96.62.90]) by qmta02.westchester.pa.mail.comcast.net with comcast id 1a031n0011wpRvQ51aQlFP; Sat, 14 Dec 2013 22:24:45 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta18.westchester.pa.mail.comcast.net with comcast id 1aQk1n00q152l3L3eaQlto; Sat, 14 Dec 2013 22:24:45 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id 75B0FD68B43; Sat, 14 Dec 2013 14:24:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1387059884; bh=01NxojyQmDhik3JEs4OmSb00Pvpy2Vv3l92t2B+1w44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=SpTj3fG+BPLn6eeBe87aQZKj8V8dImv8zCUDcBG+ZViBPVQLIb/8HgOZ/w7v1hh5O cG2NHgqnKPSY3xz07CGpBhNZ/mJKcULfU9kcbPoPCJtJO9yQwn51bs8KJUbOiG1x3O 8TRiSpjenGc95CChbzwCNvcAPXSoUDkARUfPuqKA= From: "W. Trevor King" To: Catalyst Cc: Brian Dolbec , "W. Trevor King" Subject: [gentoo-catalyst] [PATCH v2 09/21] catalyst: Add 'packagedir' default instead of hard-coding '/usr/portage/packages' Date: Sat, 14 Dec 2013 14:24:17 -0800 Message-Id: X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1387059885; bh=nIdcaoGL8P+/AcK1beC67w0VtXL4yiFNrmpdpn82X3E=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=TWeTOnT/ghOE0AMpCNO5IPi6Rl3IYqrXdxLlf0+dmqtj0J+dd3W33PhWIHENDpkvg fSC6jnq4gX6wptmEYtbsNVhtlF0pFZJwTI3AzE7zd++fIzh4Q+3V/x0A8KgM4N3iUn Q44k2xIO56IzAnMd35hSd4bZoTMkz9I/vBmhmafIaM7+W5cxPogzgOtlDdDrCKe6w3 r3BKG2omM8OFWZiffXN2bfc6HOkJ4QZCVt+KjoCIRcFzZqstz98w7TA1nybm+VSaBK Osyp5Dx3PRjwcpHEJws3+iUvizZoW7rGNgjbODilqTygumwles2Gi2IVii0Sn2cWsr mFmXlxgaADkYw== 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-Archives-Salt: bfe48e72-266f-495d-8bc6-bba63d0bc115 X-Archives-Hash: ce448e4f877e6a5702f8fe0b2140051e From: Brian Dolbec W. Trevor King: Refactored Git history for Brian Dolbec's content changes. Signed-off-by: W. Trevor King --- catalyst | 1 + modules/generic_stage_target.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/catalyst b/catalyst index 131529a..c62b745 100755 --- a/catalyst +++ b/catalyst @@ -65,6 +65,7 @@ def parse_config(myconfig): "distdir": "/usr/portage/distfiles", "hash_function": "crc32", "options": "", + "packagedir": "/usr/portage/packages", "portdir": "/usr/portage", "repo_name": "portage", "sharedir": "/usr/share/catalyst", diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 63661fe..c890773 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1068,7 +1068,7 @@ class generic_stage_target(generic_target): myf.write('PORTDIR="%s"\n' % self.settings['portdir']) myf.write('DISTDIR="%s"\n' % self.settings['distdir']) - myf.write('PKGDIR="${PORTDIR}/packages"\n') + myf.write('PKGDIR="%s"\n' % self.settings['packagedir']) """ Setup the portage overlay """ if "portage_overlay" in self.settings: -- 1.8.3.2