mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

classes/package_ipk|_deb|_rpm.bbclass: Fix setting of OVERRIDES when packaging

Browse Source 
The OVERRIDES variable was being incorrectly set with the end result of the
runtime dependencies of the package not being encoded in it's package metadata.

This broke opkg-native in meta-toolchain.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
This commit is contained in:
Joshua Lock
2010-07-01 16:14:21 +01:00
parent f5003084d5
commit d42f0b9153
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/package_deb.bbclass
View File

@@ -116,7 +116,7 @@ python do_package_deb () {
if not overrides:
raise bb.build.FuncFailed('OVERRIDES not defined')
overrides = bb.data.expand(overrides, localdata)
bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
bb.data.setVar('OVERRIDES', pkg + ':' + overrides, localdata)
bb.data.update_data(localdata)
basedir = os.path.join(os.path.dirname(root))

2
meta/classes/package_ipk.bbclass
View File

@@ -182,7 +182,7 @@ python do_package_ipk () {
overrides = bb.data.getVar('OVERRIDES', localdata, True)
if not overrides:
raise bb.build.FuncFailed('OVERRIDES not defined')
bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
bb.data.setVar('OVERRIDES', pkg + ':' + overrides, localdata)
bb.data.update_data(localdata)
basedir = os.path.join(os.path.dirname(root))

2
meta/classes/package_rpm.bbclass
View File

@@ -192,7 +192,7 @@ python do_package_rpm () {
if not overrides:
raise bb.build.FuncFailed('OVERRIDES not defined')
overrides = bb.data.expand(overrides, localdata)
bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
bb.data.setVar('OVERRIDES', pkg + ':' + overrides, localdata)
bb.data.update_data(localdata)
basedir = os.path.join(os.path.dirname(root))