mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

rootfs-postcommands: Actually do the re-ordering

Browse Source 
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 <ralph.siemsen@linaro.org>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ralph Siemsen
2024-11-13 16:23:03 -05:00
committed by Richard Purdie
parent 79a0585f1b
commit 21eab81f95
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/rootfs.py
+3 -3
View File
@@ -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)