summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/packagedata.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-13 13:35:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-14 08:21:00 +0100
commit8ebe7be3d9494c3467b5533091bf6832030aad99 (patch)
treef7b483590c2dd75cfeed99dd8479068cdbafbadb /meta/lib/oe/packagedata.py
parentaf5b3f3510d3faa0e570be4b4997e9abcad5a805 (diff)
downloadpoky-8ebe7be3d9494c3467b5533091bf6832030aad99.tar.gz
bitbake.conf/package: Collapse PKGDATA_DIR into a single machine specific directory
Currently we have a hierarchy of pkgdata directories and the code has to put together a search path and look through each in turn until it finds the data it needs. This has lead to a number of hardcoded paths and file globing which is unpredictable and undesirable. Worse, certain tricks that should be easy like a GL specific package architecture become problematic with the curretn search paths. With the modern sstate code, we can do better and construct a single pkgdata directory for each machine in just the same way as we do for the sysroot. This is already tried and well tested. With such a single directory, all the code that iterated through multiple pkgdata directories and simply be removed and give a significant simplification of the code. Even existing build directories adapt to the change well since the package contents doesn't change, just the location they're installed to and the stamp for them. The only complication is the we need a different shlibs directory for each multilib. These are only used by package.bbclass and the simple fix is to add MLPREFIX to the shlib directory name. This means the multilib packages will repackage and the sstate checksum will change but an existing build directory will adapt to the changes safely. It is close to release however I believe the benefits this patch give us are worth consideration for inclusion and give us more options for dealing with problems like the GL one. It also sets the ground work well for shlibs improvements in 1.6. (From OE-Core rev: 1b8e4abd2d9c0901d38d89d0f944fe1ffd019379) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/packagedata.py')
-rw-r--r--meta/lib/oe/packagedata.py43
1 files changed, 12 insertions, 31 deletions
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index 14c38bdc0f..cd5f0445f5 100644
--- a/meta/lib/oe/packagedata.py
+++ b/meta/lib/oe/packagedata.py
@@ -23,21 +23,7 @@ def read_pkgdatafile(fn):
23 23
24 return pkgdata 24 return pkgdata
25 25
26def all_pkgdatadirs(d):
27 dirs = []
28 triplets = (d.getVar("PKGMLTRIPLETS") or "").split()
29 for t in triplets:
30 dirs.append(t + "/runtime/")
31 return dirs
32
33def get_subpkgedata_fn(pkg, d): 26def get_subpkgedata_fn(pkg, d):
34 dirs = all_pkgdatadirs(d)
35
36 pkgdata = d.expand('${TMPDIR}/pkgdata/')
37 for dir in dirs:
38 fn = pkgdata + dir + pkg
39 if os.path.exists(fn):
40 return fn
41 return d.expand('${PKGDATA_DIR}/runtime/%s' % pkg) 27 return d.expand('${PKGDATA_DIR}/runtime/%s' % pkg)
42 28
43def has_subpkgdata(pkg, d): 29def has_subpkgdata(pkg, d):
@@ -70,29 +56,24 @@ def read_subpkgdata_dict(pkg, d):
70def _pkgmap(d): 56def _pkgmap(d):
71 """Return a dictionary mapping package to recipe name.""" 57 """Return a dictionary mapping package to recipe name."""
72 58
73 target_os = d.getVar("TARGET_OS", True) 59 pkgdatadir = d.getVar("PKGDATA_DIR", True)
74 target_vendor = d.getVar("TARGET_VENDOR", True)
75 basedir = os.path.dirname(d.getVar("PKGDATA_DIR", True))
76
77 dirs = ("%s%s-%s" % (arch, target_vendor, target_os)
78 for arch in d.getVar("PACKAGE_ARCHS", True).split())
79 60
80 pkgmap = {} 61 pkgmap = {}
81 for pkgdatadir in (os.path.join(basedir, sys) for sys in dirs): 62 try:
63 files = os.listdir(pkgdatadir)
64 except OSError:
65 bb.warn("No files in %s?" % pkgdatadir)
66 files = []
67
68 for pn in filter(lambda f: not os.path.isdir(os.path.join(pkgdatadir, f)), files):
82 try: 69 try:
83 files = os.listdir(pkgdatadir) 70 pkgdata = read_pkgdatafile(os.path.join(pkgdatadir, pn))
84 except OSError: 71 except OSError:
85 continue 72 continue
86 73
87 for pn in filter(lambda f: not os.path.isdir(os.path.join(pkgdatadir, f)), files): 74 packages = pkgdata.get("PACKAGES") or ""
88 try: 75 for pkg in packages.split():
89 pkgdata = read_pkgdatafile(os.path.join(pkgdatadir, pn)) 76 pkgmap[pkg] = pn
90 except OSError:
91 continue
92
93 packages = pkgdata.get("PACKAGES") or ""
94 for pkg in packages.split():
95 pkgmap[pkg] = pn
96 77
97 return pkgmap 78 return pkgmap
98 79