diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 14:27:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-30 14:25:58 +0100 |
commit | 4e9a06b64b43131b731fb59a0305f78a98e27fbd (patch) | |
tree | cd32b3b41ed12639f8266eef83479b0c59621131 /meta/classes | |
parent | 42344347be29f0997cc2f7636d9603b1fe1875ae (diff) | |
download | openembedded-core-contrib-4e9a06b64b43131b731fb59a0305f78a98e27fbd.tar.gz |
meta: Manual override fixes
The automated conversion of OE-Core to use the new override sytax isn't
perfect. This patches some mis-converted lines and some lines which were missed
by the automation.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/insane.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/kernel-grub.bbclass | 8 | ||||
-rw-r--r-- | meta/classes/native.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/package.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/qemuboot.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/sanity.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/systemd.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/useradd.bbclass | 2 |
9 files changed, 13 insertions, 11 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index f9a35f2daa..ee858f84b7 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -1306,7 +1306,7 @@ python () { # Checking ${FILESEXTRAPATHS} extrapaths = (d.getVar("FILESEXTRAPATHS") or "") if '__default' not in extrapaths.split(":"): - msg = "FILESEXTRAPATHS-variable, must always use _prepend (or _append)\n" + msg = "FILESEXTRAPATHS-variable, must always use :prepend (or :append)\n" msg += "type of assignment, and don't forget the colon.\n" msg += "Please assign it with the format of:\n" msg += " FILESEXTRAPATHS:append := \":${THISDIR}/Your_Files_Path\" or\n" diff --git a/meta/classes/kernel-grub.bbclass b/meta/classes/kernel-grub.bbclass index 0bf8fda3e1..44b2015468 100644 --- a/meta/classes/kernel-grub.bbclass +++ b/meta/classes/kernel-grub.bbclass @@ -97,9 +97,9 @@ python __anonymous () { for type in imagetypes.split(): typelower = type.lower() - preinst:append = preinst.replace('KERNEL_IMAGETYPE', type) - postinst:prepend = postinst.replace('KERNEL_IMAGETYPE', type) - d.setVar('pkg_preinst:kernel-image-' + typelower + '_append', preinst:append) - d.setVar('pkg_postinst:kernel-image-' + typelower + '_prepend', postinst:prepend) + preinst_append = preinst.replace('KERNEL_IMAGETYPE', type) + postinst_prepend = postinst.replace('KERNEL_IMAGETYPE', type) + d.setVar('pkg_preinst:kernel-image-' + typelower + ':append', preinst_append) + d.setVar('pkg_postinst:kernel-image-' + typelower + ':prepend', postinst_prepend) } diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 61becfb6d5..76a599bc15 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -133,7 +133,7 @@ python native_virtclass_handler () { def map_dependencies(varname, d, suffix = "", selfref=True): if suffix: - varname = varname + "_" + suffix + varname = varname + ":" + suffix deps = d.getVar(varname) if not deps: return diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index fb8e9514be..a659a1ef5c 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1583,7 +1583,7 @@ fi scriptlet = scriptlet_split[0] + "\nset -e\n" + "\n".join(scriptlet_split[1:]) else: scriptlet = "set -e\n" + "\n".join(scriptlet_split[0:]) - d.setVar('%s_%s' % (scriptlet_name, pkg), scriptlet) + d.setVar('%s:%s' % (scriptlet_name, pkg), scriptlet) def write_if_exists(f, pkg, var): def encode(str): diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index f67849708c..10f3265e91 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -147,7 +147,7 @@ def create_filtered_tasklist(d, sdkbasepath, tasklistfile, conf_initpath): try: with open(sdkbasepath + '/conf/local.conf', 'a') as f: # Force the use of sstate from the build system - f.write('\nSSTATE_DIR_forcevariable = "%s"\n' % d.getVar('SSTATE_DIR')) + f.write('\nSSTATE_DIR:forcevariable = "%s"\n' % d.getVar('SSTATE_DIR')) f.write('SSTATE_MIRRORS:forcevariable = "file://universal/(.*) file://universal-4.9/\\1 file://universal-4.9/(.*) file://universal-4.8/\\1"\n') # Ensure TMPDIR is the default so that clean_esdk_builddir() can delete it f.write('TMPDIR:forcevariable = "${TOPDIR}/tmp"\n') diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index aaf821d6dd..bf529e9aa4 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass @@ -122,6 +122,8 @@ python do_write_qemuboot_conf() { cf = configparser.ConfigParser() cf.add_section('config_bsp') for k in sorted(qemuboot_vars(d)): + if ":" in k: + continue # qemu-helper-native sysroot is not removed by rm_work and # contains all tools required by runqemu if k == 'STAGING_BINDIR_NATIVE': diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 29cc42efe7..ddba1e6e1e 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -199,7 +199,7 @@ def check_toolchain_tune_args(data, tune, multilib, errs): def check_toolchain_args_present(data, tune, multilib, tune_errors, which): args_set = (data.getVar("TUNE_%s" % which) or "").split() - args_wanted = (data.getVar("TUNEABI_REQUIRED_%s_tune-%s" % (which, tune)) or "").split() + args_wanted = (data.getVar("TUNEABI_REQUIRED_%s:tune-%s" % (which, tune)) or "").split() args_missing = [] # If no args are listed/required, we are done. diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 2a272a245f..09ec52792d 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass @@ -70,7 +70,7 @@ python systemd_populate_packages() { return def get_package_var(d, var, pkg): - val = (d.getVar('%s_%s' % (var, pkg)) or "").strip() + val = (d.getVar('%s:%s' % (var, pkg)) or "").strip() if val == "": val = (d.getVar(var) or "").strip() return val diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index fdec5cca56..287ef84334 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -199,7 +199,7 @@ python __anonymous() { def get_all_cmd_params(d, cmd_type): import string - param_type = cmd_type.upper() + "_PARAM_%s" + param_type = cmd_type.upper() + "_PARAM:%s" params = [] useradd_packages = d.getVar('USERADD_PACKAGES') or "" |