From 0cffcd09a44b2a58452a5bb13714bfc47d6546bf Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sat, 31 Jul 2021 23:31:13 -0400 Subject: global: overrides conversion Signed-off-by: Bruce Ashfield --- meta-openstack/classes/identity.bbclass | 8 ++++---- meta-openstack/classes/rmargparse.bbclass | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta-openstack/classes') diff --git a/meta-openstack/classes/identity.bbclass b/meta-openstack/classes/identity.bbclass index 1f4f408..6a08eae 100644 --- a/meta-openstack/classes/identity.bbclass +++ b/meta-openstack/classes/identity.bbclass @@ -152,7 +152,7 @@ def servicecreate_param(d, pkg): return service_param # Add the postinst script into the generated package -python populate_packages_append () { +python populate_packages:append () { servicecreate_packages = d.getVar('SERVICECREATE_PACKAGES', True) or "" servicecreate_postinst_common_copy = d.getVar('servicecreate_postinst_common', True) @@ -161,7 +161,7 @@ python populate_packages_append () { for pkg in servicecreate_packages.split(): bb.debug(1, 'Adding service/user creation calls to postinst for %s' % pkg) - postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) + postinst = d.getVar('pkg_postinst:%s' % pkg, True) or d.getVar('pkg_postinst', True) if not postinst: postinst = '' @@ -181,6 +181,6 @@ python populate_packages_append () { # Footer. postinst += ' fi\n' - d.setVar('pkg_postinst_%s' % pkg, postinst) - bb.debug(1, 'pkg_postinst_%s = %s' % (pkg, d.getVar('pkg_postinst_%s' % pkg, True))) + d.setVar('pkg_postinst:%s' % pkg, postinst) + bb.debug(1, 'pkg_postinst:%s = %s' % (pkg, d.getVar('pkg_postinst:%s' % pkg, True))) } diff --git a/meta-openstack/classes/rmargparse.bbclass b/meta-openstack/classes/rmargparse.bbclass index 65d8459..e3930ce 100644 --- a/meta-openstack/classes/rmargparse.bbclass +++ b/meta-openstack/classes/rmargparse.bbclass @@ -1,3 +1,3 @@ -do_install_append() { +do_install:append() { sed -i '/argparse/d' ${D}${libdir}/python2.7/site-packages/*/requires.txt } -- cgit v1.2.3-54-g00ecf