mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

package_*.bbclass: Only set pkg in overrides. These are the only values we're interested in expanding and this makes sure we obtain the expected data

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2010-07-07 12:53:46 +01:00
parent 1497af07fa
commit 4d4b7922b1
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/package_deb.bbclass
+1 -5
View File
@@ -112,11 +112,7 @@ python do_package_deb () {
pkgname = pkg pkgname = pkg
bb.data.setVar('PKG', pkgname, localdata) bb.data.setVar('PKG', pkgname, localdata)
overrides = bb.data.getVar('OVERRIDES', localdata) bb.data.setVar('OVERRIDES', pkg, localdata)
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.update_data(localdata) bb.data.update_data(localdata)
basedir = os.path.join(os.path.dirname(root)) basedir = os.path.join(os.path.dirname(root))
meta/classes/package_ipk.bbclass
+1 -4
View File
@@ -179,10 +179,7 @@ python do_package_ipk () {
pkgname = pkg pkgname = pkg
bb.data.setVar('PKG', pkgname, localdata) bb.data.setVar('PKG', pkgname, localdata)
overrides = bb.data.getVar('OVERRIDES', localdata, True) bb.data.setVar('OVERRIDES', pkg, localdata)
if not overrides:
raise bb.build.FuncFailed('OVERRIDES not defined')
bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
bb.data.update_data(localdata) bb.data.update_data(localdata)
basedir = os.path.join(os.path.dirname(root)) basedir = os.path.join(os.path.dirname(root))
meta/classes/package_rpm.bbclass
+1 -5
View File
@@ -188,11 +188,7 @@ python do_package_rpm () {
pkgname = pkg pkgname = pkg
bb.data.setVar('PKG', pkgname, localdata) bb.data.setVar('PKG', pkgname, localdata)
overrides = bb.data.getVar('OVERRIDES', localdata) bb.data.setVar('OVERRIDES', pkg, localdata)
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.update_data(localdata) bb.data.update_data(localdata)
basedir = os.path.join(os.path.dirname(root)) basedir = os.path.join(os.path.dirname(root))