classes/package_ipk|_deb|_rpm.bbclass: Fix setting of OVERRIDES when packaging
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:
parent
934bb71c9d
commit
3abe7a0624
|
@ -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))
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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))
|
||||
|
|
Loading…
Reference in New Issue