On Fri, Nov 05, 2010 at 12:16:54AM +0000, Richard Purdie wrote: > Hi, > > The TSC met yesterday and discussed various topics. We're trying a > slightly different approach to recording the outcome of the discussions: > > http://wiki.openembedded.org/index.php/TSCDecisions > > and the output from 5 such discussions yesterday is recorded there. > These were all things that had discussion by the TSC pending after > OEDEM.
Just idea for last point about FILESPATH: It isn't tested and bitbake's Local fetcher localpath still needs FILESPATH or similar change. Just to show what I meant in: http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-October/025673.html Regards, -- Martin 'JaMa' Jansa jabber: [email protected]
>From a3c0a5af9640a6c9395e3747fbcff288020b2355 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Fri, 5 Nov 2010 15:47:25 +0100 Subject: [PATCH] base.bbclass: test for FILESPATHPKG existence first, then try FILESPATHOVERRIDES --- classes/base.bbclass | 15 +++++++++------ conf/bitbake.conf | 3 ++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index fd507d3..a1f65a9 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -203,18 +203,21 @@ python base_do_unpack() { if not src_uri: return srcurldata = bb.fetch.init(src_uri.split(), d, True) - filespath = d.getVar("FILESPATH", True).split(":") + filespathlist = d.getVar("FILESPATHLIST", True).split(":") + filespathoverrides = d.getVar("FILESPATHOVERRIDES", True).split(":") for url in src_uri.split(): urldata = srcurldata[url] if urldata.type == "file" and "*" in urldata.path: # The fetch code doesn't know how to handle globs, so # we need to handle the local bits ourselves - for path in filespath: - srcdir = oe.path.join(path, urldata.host, - os.path.dirname(urldata.path)) - if os.path.exists(srcdir): - break + for path in filespathlist: + if os.path.exists(path): + for override in filespathoverrides: + srcdir = oe.path.join(path, override, urldata.host, + os.path.dirname(urldata.path)) + if os.path.exists(srcdir): + break else: bb.fatal("Unable to locate files for %s" % url) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 177e0b3..e623281 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -271,7 +271,8 @@ FILES_${PN}-locale = "${datadir}/locale" FILE_DIRNAME = "[email protected](bb.data.getVar('FILE', d))}" FILESPATHBASE = "${FILE_DIRNAME}" FILESPATHPKG = "${PF}:${P}:${PN}:${BP}:${BPN}:files:." -FILESPATH = "${@':'.join(uniq(os.path.normpath(os.path.join(fp, p, o)) for fp in '${FILESPATHBASE}'.split(':') for p in '${FILESPATHPKG}'.split(':') for o in reversed([''] + filter(None, '${OVERRIDES}'.split(':')))))}" +FILESPATHOVERRIDES = "${MACHINE}:${DISTRO}:${TARGET_ARCH}:{BASE_PACKAGE_ARCH}:." +FILESPATHLIST = "${@':'.join(uniq(os.path.normpath(os.path.join(fp, p)) for fp in '${FILESPATHBASE}'.split(':') for p in '${FILESPATHPKG}'.split(':')))}" FILESDIR = "[email protected](d.getVar('FILESPATH', 1), '.')}" ################################################################## -- 1.7.3.2
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
