diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-25 15:40:34 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-31 12:02:24 +0100 |
| commit | e6566322bd2856e14fbabd78a6307f6575ba3d8c (patch) | |
| tree | 027ed4b509ac7ba0a4a7f7b58ea9747455d78815 /meta/classes/package_deb.bbclass | |
| parent | e300aa048531a5a11c4c87848551e5541b5b3022 (diff) | |
| download | poky-e6566322bd2856e14fbabd78a6307f6575ba3d8c.tar.gz | |
meta/classes: Fix whitespace mismatch and broken functions
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes/package_deb.bbclass')
| -rw-r--r-- | meta/classes/package_deb.bbclass | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 478f2ed1ab..1bb2ebd766 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
| @@ -160,8 +160,8 @@ python do_package_deb () { | |||
| 160 | fields.append(["OE: %s\n", ['PN']]) | 160 | fields.append(["OE: %s\n", ['PN']]) |
| 161 | fields.append(["Homepage: %s\n", ['HOMEPAGE']]) | 161 | fields.append(["Homepage: %s\n", ['HOMEPAGE']]) |
| 162 | 162 | ||
| 163 | # Package, Version, Maintainer, Description - mandatory | 163 | # Package, Version, Maintainer, Description - mandatory |
| 164 | # Section, Priority, Essential, Architecture, Source, Depends, Pre-Depends, Recommends, Suggests, Conflicts, Replaces, Provides - Optional | 164 | # Section, Priority, Essential, Architecture, Source, Depends, Pre-Depends, Recommends, Suggests, Conflicts, Replaces, Provides - Optional |
| 165 | 165 | ||
| 166 | 166 | ||
| 167 | def pullData(l, d): | 167 | def pullData(l, d): |
| @@ -170,7 +170,7 @@ python do_package_deb () { | |||
| 170 | data = bb.data.getVar(i, d, True) | 170 | data = bb.data.getVar(i, d, True) |
| 171 | if data is None: | 171 | if data is None: |
| 172 | raise KeyError(f) | 172 | raise KeyError(f) |
| 173 | if i == 'DPKG_ARCH' and bb.data.getVar('PACKAGE_ARCH', d, True) == 'all': | 173 | if i == 'DPKG_ARCH' and bb.data.getVar('PACKAGE_ARCH', d, True) == 'all': |
| 174 | data = 'all' | 174 | data = 'all' |
| 175 | l2.append(data) | 175 | l2.append(data) |
| 176 | return l2 | 176 | return l2 |
| @@ -191,13 +191,13 @@ python do_package_deb () { | |||
| 191 | bb.build.exec_func("mapping_rename_hook", localdata) | 191 | bb.build.exec_func("mapping_rename_hook", localdata) |
| 192 | 192 | ||
| 193 | rdepends = bb.utils.explode_dep_versions(bb.data.getVar("RDEPENDS", localdata, True) or "") | 193 | rdepends = bb.utils.explode_dep_versions(bb.data.getVar("RDEPENDS", localdata, True) or "") |
| 194 | for dep in rdepends: | 194 | for dep in rdepends: |
| 195 | if '*' in dep: | 195 | if '*' in dep: |
| 196 | del rdepends[dep] | 196 | del rdepends[dep] |
| 197 | rrecommends = bb.utils.explode_dep_versions(bb.data.getVar("RRECOMMENDS", localdata, True) or "") | 197 | rrecommends = bb.utils.explode_dep_versions(bb.data.getVar("RRECOMMENDS", localdata, True) or "") |
| 198 | for dep in rrecommends: | 198 | for dep in rrecommends: |
| 199 | if '*' in dep: | 199 | if '*' in dep: |
| 200 | del rrecommends[dep] | 200 | del rrecommends[dep] |
| 201 | rsuggests = bb.utils.explode_dep_versions(bb.data.getVar("RSUGGESTS", localdata, True) or "") | 201 | rsuggests = bb.utils.explode_dep_versions(bb.data.getVar("RSUGGESTS", localdata, True) or "") |
| 202 | rprovides = bb.utils.explode_dep_versions(bb.data.getVar("RPROVIDES", localdata, True) or "") | 202 | rprovides = bb.utils.explode_dep_versions(bb.data.getVar("RPROVIDES", localdata, True) or "") |
| 203 | rreplaces = bb.utils.explode_dep_versions(bb.data.getVar("RREPLACES", localdata, True) or "") | 203 | rreplaces = bb.utils.explode_dep_versions(bb.data.getVar("RREPLACES", localdata, True) or "") |
