From 21eab81f9505ea028ccd6cfb4c78567c35a7e1dc Mon Sep 17 00:00:00 2001 From: Ralph Siemsen Date: Wed, 13 Nov 2024 16:23:03 -0500 Subject: [PATCH] rootfs-postcommands: Actually do the re-ordering Previous commit added logic to move certain tasks to the end, but these had no effect, because the result of the make_last() function was not used to update the post_process_cmds variable. Also, once this is fixed, it becomes evident that the commands need to be joined using whitespace, otherwise they all run together, and cannot be executed as individual commands anymore. Fixes: 0ffff2c1f8 ("rootfs-postcommands: Try and improve ordering constraints") (From OE-Core rev: 2a4e8f06bac1bff0a167f775f7babab94b32732a) Signed-off-by: Ralph Siemsen Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/lib/oe/rootfs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 5abce4ad7d..90d4974965 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -199,12 +199,12 @@ class Rootfs(object, metaclass=ABCMeta): if command in commands: commands.remove(command) commands.append(command) - return "".join(commands) + return " ".join(commands) # We want this to run as late as possible, in particular after # systemd_sysusers_create and set_user_group. Using :append is not enough - make_last("tidy_shadowutils_files", post_process_cmds) - make_last("rootfs_reproducible", post_process_cmds) + post_process_cmds = make_last("tidy_shadowutils_files", post_process_cmds) + post_process_cmds = make_last("rootfs_reproducible", post_process_cmds) execute_pre_post_process(self.d, pre_process_cmds)