sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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

This reverts commit 3abe7a0624 which was incorrect
in some assumptions about OVERRIDE handling order.
This commit is contained in:
Richard Purdie 2010-07-07 12:13:29 +01:00
parent a644cd15eb
commit 1497af07fa
3 changed files with 3 additions and 3 deletions
Show Stats 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', pkg + ':' + overrides, localdata)
bb.data.setVar('OVERRIDES', overrides + ':' + pkg, 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', pkg + ':' + overrides, localdata)
bb.data.setVar('OVERRIDES', overrides + ':' + pkg, 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', pkg + ':' + overrides, localdata)
bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
bb.data.update_data(localdata)
basedir = os.path.join(os.path.dirname(root))