From 1b0e9f8534acff5e9e6c3847e70af810e27edefc Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Fri, 15 Sep 2017 16:48:59 +0200 Subject: useradd.bbclass: Unify writing of script file in useradd_sysroot_sstate() There were two identical code blocks for writing the postinst-useradd-${PN} scripts. This combines them into one. (From OE-Core rev: 0c4259dd3c74d81f20b87417cecb1e636365ce10) Signed-off-by: Peter Kjellerstedt Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/useradd.bbclass | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'meta/classes/useradd.bbclass') diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 0f51e5522b..686e5fbefe 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -138,22 +138,19 @@ useradd_sysroot () { EXTRA_STAGING_FIXMES += "COMPONENTS_DIR" python useradd_sysroot_sstate () { + scriptfile = None task = d.getVar("BB_CURRENTTASK") if task == "package_setscene": bb.build.exec_func("useradd_sysroot", d) elif task == "prepare_recipe_sysroot": # Used to update this recipe's own sysroot so the user/groups are available to do_install scriptfile = d.expand("${RECIPE_SYSROOT}${bindir}/postinst-useradd-${PN}") - bb.utils.mkdirhier(os.path.dirname(scriptfile)) - with open(scriptfile, 'w') as script: - script.write("#!/bin/sh\n") - bb.data.emit_func("useradd_sysroot", script, d) - script.write("useradd_sysroot\n") - os.chmod(scriptfile, 0o755) bb.build.exec_func("useradd_sysroot", d) elif task == "populate_sysroot": # Used when installed in dependent task sysroots scriptfile = d.expand("${SYSROOT_DESTDIR}${bindir}/postinst-useradd-${PN}") + + if scriptfile: bb.utils.mkdirhier(os.path.dirname(scriptfile)) with open(scriptfile, 'w') as script: script.write("#!/bin/sh\n") -- cgit v1.2.3-54-g00ecf