diff options
Diffstat (limited to 'meta/classes-recipe/rootfs-postcommands.bbclass')
-rw-r--r-- | meta/classes-recipe/rootfs-postcommands.bbclass | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass b/meta/classes-recipe/rootfs-postcommands.bbclass index 29ee74932a..163c7f41b1 100644 --- a/meta/classes-recipe/rootfs-postcommands.bbclass +++ b/meta/classes-recipe/rootfs-postcommands.bbclass | |||
@@ -55,19 +55,14 @@ inherit image-artifact-names | |||
55 | # deterministic. Package installs are not deterministic, causing the ordering | 55 | # deterministic. Package installs are not deterministic, causing the ordering |
56 | # of entries to change between builds. In case that this isn't desired, | 56 | # of entries to change between builds. In case that this isn't desired, |
57 | # the command can be overridden. | 57 | # the command can be overridden. |
58 | SORT_PASSWD_POSTPROCESS_COMMAND ??= "tidy_shadowutils_files" | ||
59 | ROOTFS_POSTPROCESS_COMMAND += '${SORT_PASSWD_POSTPROCESS_COMMAND}' | ||
60 | |||
58 | # | 61 | # |
59 | # Note that useradd-staticids.bbclass has to be used to ensure that | 62 | # Note that useradd-staticids.bbclass has to be used to ensure that |
60 | # the numeric IDs of dynamically created entries remain stable. | 63 | # the numeric IDs of dynamically created entries remain stable. |
61 | # | 64 | # |
62 | # We want this to run as late as possible, in particular after | 65 | ROOTFS_POSTPROCESS_COMMAND += 'rootfs_reproducible' |
63 | # systemd_sysusers_create and set_user_group. Using :append is not | ||
64 | # enough for that, set_user_group is added that way and would end | ||
65 | # up running after us. | ||
66 | SORT_PASSWD_POSTPROCESS_COMMAND ??= "tidy_shadowutils_files" | ||
67 | python () { | ||
68 | d.appendVar('ROOTFS_POSTPROCESS_COMMAND', ' ${SORT_PASSWD_POSTPROCESS_COMMAND}') | ||
69 | d.appendVar('ROOTFS_POSTPROCESS_COMMAND', ' rootfs_reproducible') | ||
70 | } | ||
71 | 66 | ||
72 | # Resolve the ID as described in the sysusers.d(5) manual: ID can be a numeric | 67 | # Resolve the ID as described in the sysusers.d(5) manual: ID can be a numeric |
73 | # uid, a couple uid:gid or uid:groupname or it is '-' meaning leaving it | 68 | # uid, a couple uid:gid or uid:groupname or it is '-' meaning leaving it |