summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-07-07 12:13:29 +0100
committerJoshua Lock <josh@linux.intel.com>2010-07-07 12:24:49 +0100
commitd538d8e17197f5dda39abbff3b4bd171f8248af9 (patch)
tree05c4b20b04446b51902f2eb79a06420614ef2a63
parentd42f0b915306baebdf505702b693e953e3b54e5e (diff)
downloadpoky-d538d8e17197f5dda39abbff3b4bd171f8248af9.tar.gz
Revert "classes/package_ipk|_deb|_rpm.bbclass: Fix setting of OVERRIDES when packaging"
This reverts commit 3abe7a0624e1215124799f97c872682a98659760 which was incorrect in some assumptions about OVERRIDE handling order.
-rw-r--r--meta/classes/package_deb.bbclass2
-rw-r--r--meta/classes/package_ipk.bbclass2
-rw-r--r--meta/classes/package_rpm.bbclass2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index d53224430a..94a07b3481 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -116,7 +116,7 @@ python do_package_deb () {
116 if not overrides: 116 if not overrides:
117 raise bb.build.FuncFailed('OVERRIDES not defined') 117 raise bb.build.FuncFailed('OVERRIDES not defined')
118 overrides = bb.data.expand(overrides, localdata) 118 overrides = bb.data.expand(overrides, localdata)
119 bb.data.setVar('OVERRIDES', pkg + ':' + overrides, localdata) 119 bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
120 120
121 bb.data.update_data(localdata) 121 bb.data.update_data(localdata)
122 basedir = os.path.join(os.path.dirname(root)) 122 basedir = os.path.join(os.path.dirname(root))
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 6db0ee8a32..04b117b75d 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -182,7 +182,7 @@ python do_package_ipk () {
182 overrides = bb.data.getVar('OVERRIDES', localdata, True) 182 overrides = bb.data.getVar('OVERRIDES', localdata, True)
183 if not overrides: 183 if not overrides:
184 raise bb.build.FuncFailed('OVERRIDES not defined') 184 raise bb.build.FuncFailed('OVERRIDES not defined')
185 bb.data.setVar('OVERRIDES', pkg + ':' + overrides, localdata) 185 bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
186 186
187 bb.data.update_data(localdata) 187 bb.data.update_data(localdata)
188 basedir = os.path.join(os.path.dirname(root)) 188 basedir = os.path.join(os.path.dirname(root))
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index b08d478479..0e7bfa0f44 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -192,7 +192,7 @@ python do_package_rpm () {
192 if not overrides: 192 if not overrides:
193 raise bb.build.FuncFailed('OVERRIDES not defined') 193 raise bb.build.FuncFailed('OVERRIDES not defined')
194 overrides = bb.data.expand(overrides, localdata) 194 overrides = bb.data.expand(overrides, localdata)
195 bb.data.setVar('OVERRIDES', pkg + ':' + overrides, localdata) 195 bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
196 196
197 bb.data.update_data(localdata) 197 bb.data.update_data(localdata)
198 basedir = os.path.join(os.path.dirname(root)) 198 basedir = os.path.join(os.path.dirname(root))