diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-07-01 16:14:21 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-07-03 13:35:22 +0100 |
commit | d42f0b915306baebdf505702b693e953e3b54e5e (patch) | |
tree | bacd4169cd472a76a79f668e1c8f1951d4411f82 /meta | |
parent | f5003084d54cefb7e4f991e195db82f94faf6ea2 (diff) | |
download | poky-d42f0b915306baebdf505702b693e953e3b54e5e.tar.gz |
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package_deb.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/package_ipk.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/package_rpm.bbclass | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 94a07b3481..d53224430a 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', overrides + ':' + pkg, localdata) | 119 | bb.data.setVar('OVERRIDES', pkg + ':' + overrides, 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 04b117b75d..6db0ee8a32 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', overrides + ':' + pkg, localdata) | 185 | bb.data.setVar('OVERRIDES', pkg + ':' + overrides, 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 0e7bfa0f44..b08d478479 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', overrides + ':' + pkg, localdata) | 195 | bb.data.setVar('OVERRIDES', pkg + ':' + overrides, 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)) |