summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-10-05 12:14:22 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-06 15:15:52 +0100
commit533a852eddb9a5e77a15001756f03b929a1d0a0b (patch)
tree2fc3c1fc224ac16ec0c24d1aa64d235b2359d494 /meta/classes/package.bbclass
parent5c0b727903df25b701e6dc0444262ad047b5f045 (diff)
downloadpoky-533a852eddb9a5e77a15001756f03b929a1d0a0b.tar.gz
package.bbclass: Reverse runtime symlinks should be tied to package generation
In case a package is not generated (is empty and does not has allow empty flag set) the package data regarding reverse runtime dependency shouldn't be done. This were causing a false-positive in the meta-fsl-arm layer, when building mesa, as: ,----[ Error during build of MX53 in meta-fsl-arm ] | ERROR: The recipe mesa is trying to install files into a shared area | when those files already exist. Those files and their manifest | location are: | /.../build/build/tmp/sysroots/imx53qsb/pkgdata/runtime-reverse/libopenvg-dev | Matched in manifest-imx53qsb-amd-gpu-x11-bin-mx51.packagedata | Please verify which recipe should provide the above files. `---- Fixes [YOCTO: #6795] (From OE-Core rev: 9ef8728514b02dd2e18e87645298d9ec2e8a785a) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index a877d28293..f17c8d584a 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1241,10 +1241,6 @@ python emit_pkgdata() {
1241 sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size)) 1241 sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size))
1242 sf.close() 1242 sf.close()
1243 1243
1244 # Symlinks needed for reverse lookups (from the final package name)
1245 subdata_sym = pkgdatadir + "/runtime-reverse/%s" % pkgval
1246 oe.path.symlink("../runtime/%s" % pkg, subdata_sym, True)
1247
1248 # Symlinks needed for rprovides lookup 1244 # Symlinks needed for rprovides lookup
1249 if rprov: 1245 if rprov:
1250 for p in rprov.strip().split(): 1246 for p in rprov.strip().split():
@@ -1259,6 +1255,10 @@ python emit_pkgdata() {
1259 os.chdir(root) 1255 os.chdir(root)
1260 g = glob('*') 1256 g = glob('*')
1261 if g or allow_empty == "1": 1257 if g or allow_empty == "1":
1258 # Symlinks needed for reverse lookups (from the final package name)
1259 subdata_sym = pkgdatadir + "/runtime-reverse/%s" % pkgval
1260 oe.path.symlink("../runtime/%s" % pkg, subdata_sym, True)
1261
1262 packagedfile = pkgdatadir + '/runtime/%s.packaged' % pkg 1262 packagedfile = pkgdatadir + '/runtime/%s.packaged' % pkg
1263 open(packagedfile, 'w').close() 1263 open(packagedfile, 'w').close()
1264 1264