From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 20 Mar 2010 15:43:41 +0000 (+0100)
Subject: naoki: Fix toolchain build.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebb540ea95064456f29c5c2930000219c5f9d5ea;p=ipfire-3.x.git

naoki: Fix toolchain build.
---

diff --git a/naoki/backend.py b/naoki/backend.py
index 0ee1a467c..e4b20220f 100644
--- a/naoki/backend.py
+++ b/naoki/backend.py
@@ -41,7 +41,8 @@ def parse_package_info(names, toolchain=False):
 def parse_package(names, toolchain=False, naoki=None):
 	packages = parse_package_info(names, toolchain)
 
-	return [Package(package.name, naoki=naoki) for package in packages]
+	return [Package(package.name, naoki=naoki, toolchain=toolchain) \
+		for package in packages]
 
 def get_package_names(toolchain=False):
 	if not __cache["package_names"]:
@@ -341,8 +342,8 @@ class PackageInfo(object):
 
 
 class Package(object):
-	def __init__(self, name, naoki):
-		self.info = find_package_info(name)
+	def __init__(self, name, naoki, toolchain=False):
+		self.info = find_package_info(name, toolchain)
 		self.naoki = naoki
 
 		#self.log.debug("Initialized package object %s" % name)
@@ -379,7 +380,7 @@ class Package(object):
 
 def get_repositories(toolchain=False):
 	if toolchain:
-		return Repository("toolchain")
+		return [Repository("toolchain")]
 
 	repos = []
 	for repo in os.listdir(PKGSDIR):
diff --git a/naoki/chroot.py b/naoki/chroot.py
index 2a108842d..f63013d47 100644
--- a/naoki/chroot.py
+++ b/naoki/chroot.py
@@ -6,6 +6,7 @@ import os
 import random
 import stat
 
+import backend
 import util
 from constants import *
 from exception import *
@@ -121,9 +122,11 @@ class Environment(object):
 				"PKG_ARCH"       : self.arch["name"],
 			})
 
-			if os.path.exists(self.chrootPath("usr", "ccache")):
+			ccache_path = os.path.join("tools_%s" % self.arch["name"],
+				"usr", "ccache", "bin")
+			if os.path.exists(self.chrootPath(ccache_path)):
 				env.update({
-					"PATH" : "/usr/ccache/bin:%s" % env["PATH"],
+					"PATH" : "/%s:%s" % (ccache_path, env["PATH"]),
 					"CCACHE_DIR" : "/usr/src/ccache",
 				})
 
@@ -331,9 +334,11 @@ class Toolchain(object):
 	def build(self):
 		self.log.info("Building toolchain...")
 
-		packages = package.depsort(package.list(toolchain=True))
+		packages = backend.get_package_names(toolchain=True)
+		packages = backend.parse_package(packages, toolchain=True)
+		packages = backend.depsort(packages)
 		for pkg in packages:
-			if pkg.isBuilt:
+			if os.path.exists(os.path.join(self.path, pkg.name)):
 				continue
 			self.build_package(pkg)
 		self.compress()