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 21286138247 for ; Sun, 15 Dec 2013 04:01:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C98CE0B23; Sun, 15 Dec 2013 04:00:58 +0000 (UTC) Received: from qmta07.westchester.pa.mail.comcast.net (qmta07.westchester.pa.mail.comcast.net [76.96.62.64]) by pigeon.gentoo.org (Postfix) with ESMTP id 689E5E0B1A for ; Sun, 15 Dec 2013 04:00:57 +0000 (UTC) Received: from omta09.westchester.pa.mail.comcast.net ([76.96.62.20]) by qmta07.westchester.pa.mail.comcast.net with comcast id 1fw31n0030SCNGk57g0xBe; Sun, 15 Dec 2013 04:00:57 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta09.westchester.pa.mail.comcast.net with comcast id 1g0w1n005152l3L3Vg0w3C; Sun, 15 Dec 2013 04:00:57 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id 8BF38D69964; Sat, 14 Dec 2013 20:00:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1387080055; bh=W8ScX7FeV0PKQc43vvia3cntHefpMmwgKTrsELXZnE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=mHP8+CaUIWcZtdkiNjZeehLQiXJ4CLRfIJQsTo/K7AFqmI99SimwSrg/A5wBpJoCB hkndqPE4eObdLgGZyIsX4dcVk1gjW2HQZMB8JT8A6i44j1hF2YyBlSLx2dBaya69AL bTeLywbxbKiJzTG/GpUyrwM+5vqzE/uHrLzB4taw= From: "W. Trevor King" To: Catalyst Cc: Brian Dolbec , "W. Trevor King" Subject: [gentoo-catalyst] [PATCH v3 09/19] catalyst: Add 'packagedir' default instead of hard-coding '/usr/portage/packages' Date: Sat, 14 Dec 2013 20:00:35 -0800 Message-Id: <1c281a78e7ea4c02848a0b77202dfd8aa5edf1fd.1387079534.git.wking@tremily.us> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: <20131215032258.GK25409@odin.tremily.us> In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1387080057; bh=OsZsSQtJn/k4WrUEu/4L2QyTLbBDI5y9FsC9l4K2u68=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=AO7nmeGloovHrkWMvsXfgl10q0hl8C5LC3C4VCVoIJ+8Dw+IqNUhS8aH03ayHIG7z k218aQ5ONCJzLZY9wJJS2W1FIEKFOZhkUkaZ76ZlgXS8a8pjSQcpLJW/MZMsZEHCEv w/8jn0KZsxtqLffai7KRsF9zpPUbNVeBPd6di/vP49K+275Jdm3KeiAqigoSxuj0G3 cJhcecdwBSvHkKNf9wwsAoVTrifEh1Dvn51jgsaozAH+YqEUrqV3/aTN72M8U7vwMA nJScG85ueJOkKaC83dClKsgoIrErLit0srQoTIlMVYaF0XFBhWJIl59ADsYfhHottN dow1/yNbOJL2g== 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: 2218d4ee-fabe-4ae8-a2e8-b9381979d191 X-Archives-Hash: 8617aa63a0308b52613d478fda351ccb From: Brian Dolbec W. Trevor King: Refactored Git history for Brian Dolbec's content changes. Signed-off-by: W. Trevor King Signed-off-by: Brian Dolbec --- 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