From 1221046d7ece2f051420b1dfc1f897e088750626 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 13 Apr 2023 13:29:36 -0300 Subject: classes/image_populate_mfgtool: avoid error copying duplicated files Eventually, multiple `uuu` script may install same binaries. We need to ensure we install them once, otherwise it'll fail as it might try to override a existing binary. This commit ensure all dependencies and binaries are mentioned once, removing duplication. Fixes: ae7af6f8 ("classes/image_populate_mfgtool: init") Signed-off-by: Otavio Salvador --- classes/image_populate_mfgtool.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes/image_populate_mfgtool.bbclass') diff --git a/classes/image_populate_mfgtool.bbclass b/classes/image_populate_mfgtool.bbclass index 90226e35..ab5c78ef 100644 --- a/classes/image_populate_mfgtool.bbclass +++ b/classes/image_populate_mfgtool.bbclass @@ -61,7 +61,7 @@ do_populate_mfgtool[depends] += "uuu-bin:do_populate_sysroot" python () { depends = [] - deploy_files = [] + deploy_files = "" scripts = (d.getVar('MFGTOOLCONFIG') or "").split() scripts_and_flags = d.getVarFlags('MFGTOOLCONFIG') or {} for flag, flagval in sorted(scripts_and_flags.items()): @@ -72,12 +72,12 @@ python () { if flag in scripts: if num >= 2 and items[1]: - deploy_files.append(items[1]) + deploy_files += ' ' + items[1] if num >= 1 and items[0]: depends.append(items[0]) d.appendVarFlag('do_populate_mfgtool', 'depends', ' ' + ' '.join(depends)) - d.setVar('_SCRIPT_DEPLOY_FILES', ' '.join(deploy_files)) + d.setVar('_SCRIPT_DEPLOY_FILES', ' '.join(list(set(deploy_files.split())))) } python do_populate_mfgtool() { -- cgit v1.2.3-54-g00ecf From faf2e7fdee71aa13e0f8f6b2fffcdfe4f504fc36 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 13 Apr 2023 18:15:50 -0300 Subject: classes/image_populate_mfgtool: fix basehash value change Signed-off-by: Otavio Salvador --- classes/image_populate_mfgtool.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes/image_populate_mfgtool.bbclass') diff --git a/classes/image_populate_mfgtool.bbclass b/classes/image_populate_mfgtool.bbclass index ab5c78ef..d30b47a3 100644 --- a/classes/image_populate_mfgtool.bbclass +++ b/classes/image_populate_mfgtool.bbclass @@ -50,12 +50,12 @@ MFGTOOL_FILESPATH ??= " \ " MFGTOOLDIR = "${WORKDIR}/mfgtool-${PN}" -do_populate_mfgtool[dirs] = "${MFGTOOLDIR}" +do_populate_mfgtool[dirs] += "${MFGTOOLDIR}" do_populate_mfgtool[cleandirs] = "${MFGTOOLDIR}" addtask populate_mfgtool after do_image_complete do_unpack before do_deploy -do_populate_mfgtool[dirs] ?= "${DEPLOY_DIR_IMAGE} ${WORKDIR}" do_populate_mfgtool[nostamp] = "1" +do_populate_mfgtool[dirs] += "${DEPLOY_DIR_IMAGE} ${WORKDIR}" do_populate_mfgtool[recrdeptask] += "do_deploy" do_populate_mfgtool[depends] += "uuu-bin:do_populate_sysroot" @@ -77,7 +77,7 @@ python () { depends.append(items[0]) d.appendVarFlag('do_populate_mfgtool', 'depends', ' ' + ' '.join(depends)) - d.setVar('_SCRIPT_DEPLOY_FILES', ' '.join(list(set(deploy_files.split())))) + d.setVar('_SCRIPT_DEPLOY_FILES', ' '.join(sorted(list(set(deploy_files.split()))))) } python do_populate_mfgtool() { -- cgit v1.2.3-54-g00ecf