diff options
Diffstat (limited to 'meta/classes/package_ipk.bbclass')
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index a3dfc73342..43170280c9 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
| @@ -241,7 +241,7 @@ python do_package_ipk () { | |||
| 241 | except ValueError: | 241 | except ValueError: |
| 242 | pass | 242 | pass |
| 243 | if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1": | 243 | if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1": |
| 244 | bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1))) | 244 | bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PKGV', localdata, 1), bb.data.getVar('PKGR', localdata, 1))) |
| 245 | bb.utils.unlockfile(lf) | 245 | bb.utils.unlockfile(lf) |
| 246 | continue | 246 | continue |
| 247 | 247 | ||
| @@ -254,11 +254,11 @@ python do_package_ipk () { | |||
| 254 | raise bb.build.FuncFailed("unable to open control file for writing.") | 254 | raise bb.build.FuncFailed("unable to open control file for writing.") |
| 255 | 255 | ||
| 256 | fields = [] | 256 | fields = [] |
| 257 | pe = bb.data.getVar('PE', d, 1) | 257 | pe = bb.data.getVar('PKGE', d, 1) |
| 258 | if pe and int(pe) > 0: | 258 | if pe and int(pe) > 0: |
| 259 | fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']]) | 259 | fields.append(["Version: %s:%s-%s\n", ['PKGE', 'PKGV', 'PKGR']]) |
| 260 | else: | 260 | else: |
| 261 | fields.append(["Version: %s-%s\n", ['PV', 'PR']]) | 261 | fields.append(["Version: %s-%s\n", ['PKGV', 'PKGR']]) |
| 262 | fields.append(["Description: %s\n", ['DESCRIPTION']]) | 262 | fields.append(["Description: %s\n", ['DESCRIPTION']]) |
| 263 | fields.append(["Section: %s\n", ['SECTION']]) | 263 | fields.append(["Section: %s\n", ['SECTION']]) |
| 264 | fields.append(["Priority: %s\n", ['PRIORITY']]) | 264 | fields.append(["Priority: %s\n", ['PRIORITY']]) |
