diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-07 12:13:29 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-07 12:15:11 +0100 |
| commit | 1497af07fa4f2fb44568bd60e7979d35ecde7e36 (patch) | |
| tree | 082b23d96fd052bb1405569c86521768db5560ed | |
| parent | a644cd15eb8521e2714871a8fcc38b4e0bb77170 (diff) | |
| download | poky-1497af07fa4f2fb44568bd60e7979d35ecde7e36.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.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 edec2a47f6..d371daaf9b 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 1b40cfebc9..da195a99e1 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)) |