summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-07-07 11:53:46 (GMT)
committerJoshua Lock <josh@linux.intel.com>2010-07-07 11:56:25 (GMT)
commit2b9dbe57a4bf072f907f34da15042bc7e3386ac6 (patch)
tree50e21a3e13768ee71514cf7e6a9c8068ecef0fcd
parentd538d8e17197f5dda39abbff3b4bd171f8248af9 (diff)
downloadpoky-2b9dbe57a4bf072f907f34da15042bc7e3386ac6.tar.gz
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
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/classes/package_deb.bbclass6
-rw-r--r--meta/classes/package_ipk.bbclass5
-rw-r--r--meta/classes/package_rpm.bbclass6
3 files changed, 3 insertions, 14 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 94a07b3..622eca8 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -112,11 +112,7 @@ python do_package_deb () {
112 pkgname = pkg 112 pkgname = pkg
113 bb.data.setVar('PKG', pkgname, localdata) 113 bb.data.setVar('PKG', pkgname, localdata)
114 114
115 overrides = bb.data.getVar('OVERRIDES', localdata) 115 bb.data.setVar('OVERRIDES', pkg, localdata)
116 if not overrides:
117 raise bb.build.FuncFailed('OVERRIDES not defined')
118 overrides = bb.data.expand(overrides, localdata)
119 bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
120 116
121 bb.data.update_data(localdata) 117 bb.data.update_data(localdata)
122 basedir = os.path.join(os.path.dirname(root)) 118 basedir = os.path.join(os.path.dirname(root))
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 04b117b..9d4e87d 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -179,10 +179,7 @@ python do_package_ipk () {
179 pkgname = pkg 179 pkgname = pkg
180 bb.data.setVar('PKG', pkgname, localdata) 180 bb.data.setVar('PKG', pkgname, localdata)
181 181
182 overrides = bb.data.getVar('OVERRIDES', localdata, True) 182 bb.data.setVar('OVERRIDES', pkg, localdata)
183 if not overrides:
184 raise bb.build.FuncFailed('OVERRIDES not defined')
185 bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
186 183
187 bb.data.update_data(localdata) 184 bb.data.update_data(localdata)
188 basedir = os.path.join(os.path.dirname(root)) 185 basedir = os.path.join(os.path.dirname(root))
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 0e7bfa0..da4f64c 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -188,11 +188,7 @@ python do_package_rpm () {
188 pkgname = pkg 188 pkgname = pkg
189 bb.data.setVar('PKG', pkgname, localdata) 189 bb.data.setVar('PKG', pkgname, localdata)
190 190
191 overrides = bb.data.getVar('OVERRIDES', localdata) 191 bb.data.setVar('OVERRIDES', pkg, localdata)
192 if not overrides:
193 raise bb.build.FuncFailed('OVERRIDES not defined')
194 overrides = bb.data.expand(overrides, localdata)
195 bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
196 192
197 bb.data.update_data(localdata) 193 bb.data.update_data(localdata)
198 basedir = os.path.join(os.path.dirname(root)) 194 basedir = os.path.join(os.path.dirname(root))