diff options
| -rw-r--r-- | meta/classes/license_image.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/package.bbclass | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index 5cec7a07fa2..cc6b79b3536 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass @@ -39,7 +39,7 @@ python license_create_manifest() { pkg_dic[pkg_name] = oe.packagedata.read_pkgdatafile(pkg_info) if not "LICENSE" in pkg_dic[pkg_name].keys(): - pkg_lic_name = "LICENSE:" + pkg_name + pkg_lic_name = "LICENSE_" + pkg_name pkg_dic[pkg_name]["LICENSE"] = pkg_dic[pkg_name][pkg_lic_name] rootfs_license_manifest = os.path.join(d.getVar('LICENSE_DIRECTORY'), diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index fb8e9514be0..5b3bb4a7878 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1552,7 +1552,7 @@ python emit_pkgdata() { import json def process_postinst_on_target(pkg, mlprefix): - pkgval = d.getVar('PKG:%s' % pkg) + pkgval = d.getVar('PKG_%s' % pkg) if pkgval is None: pkgval = pkg @@ -1572,7 +1572,7 @@ fi postinst = '#!/bin/sh\n' postinst += defer_fragment postinst += postinst_ontarget - d.setVar('pkg_postinst:%s' % pkg, postinst) + d.setVar('pkg_postinst_%s' % pkg, postinst) def add_set_e_to_scriptlets(pkg): for scriptlet_name in ('pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm'): @@ -1593,7 +1593,7 @@ fi val = d.getVar('%s:%s' % (var, pkg)) if val: - f.write('%s:%s: %s\n' % (var, pkg, encode(val))) + f.write('%s_%s: %s\n' % (var, pkg, encode(val))) return val val = d.getVar('%s' % (var)) if val: @@ -1612,7 +1612,7 @@ fi ml_pkg = "%s-%s" % (variant, pkg) subdata_file = "%s/runtime/%s" % (pkgdatadir, ml_pkg) with open(subdata_file, 'w') as fd: - fd.write("PKG:%s: %s" % (ml_pkg, pkg)) + fd.write("PKG_%s: %s" % (ml_pkg, pkg)) packages = d.getVar('PACKAGES') pkgdest = d.getVar('PKGDEST') |