useradd.bbclass: Unify writing of script file in useradd_sysroot_sstate()
PATCH 1/1 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.
Signed-off-by Peter Kjellerstedt <[email protected]>
--- meta/classes/useradd.bbclass | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
meta/classes/useradd.bbclass +3 -6
@@ -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")
Signature · 1 line
2.12.0