diff options
author | Andrei Gherzan <andrei.gherzan@huawei.com> | 2022-08-24 01:56:23 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-25 11:08:06 +0100 |
commit | e141072888eb107af57d168ac75176f80bb2722e (patch) | |
tree | 74b79c2b99a651b8e914f1f1d56bb8c682e16475 | |
parent | 50f150e7e3d7e3c8de946e937ce0a655c97b0a70 (diff) | |
download | poky-e141072888eb107af57d168ac75176f80bb2722e.tar.gz |
rootfs-postcommands.bbclass: Follow function rename in rootfspostcommands.py
'shadow_sort' was renamed to 'tidy_shadowutils_files' in
rootfspostcommands.py so we reflect this in
SORT_PASSWD_POSTPROCESS_COMMAND. This also creates a deprecation
function for 'shadow_sort'.
(From OE-Core rev: b474d7598d0803ba92b01944b961b28beec3bfe2)
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes-recipe/rootfs-postcommands.bbclass | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass b/meta/classes-recipe/rootfs-postcommands.bbclass index bf1e992bb2..215e38e33d 100644 --- a/meta/classes-recipe/rootfs-postcommands.bbclass +++ b/meta/classes-recipe/rootfs-postcommands.bbclass | |||
@@ -63,7 +63,7 @@ inherit image-artifact-names | |||
63 | # systemd_sysusers_create and set_user_group. Using :append is not | 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 | 64 | # enough for that, set_user_group is added that way and would end |
65 | # up running after us. | 65 | # up running after us. |
66 | SORT_PASSWD_POSTPROCESS_COMMAND ??= " sort_passwd; " | 66 | SORT_PASSWD_POSTPROCESS_COMMAND ??= " tidy_shadowutils_files; " |
67 | python () { | 67 | python () { |
68 | d.appendVar('ROOTFS_POSTPROCESS_COMMAND', '${SORT_PASSWD_POSTPROCESS_COMMAND}') | 68 | d.appendVar('ROOTFS_POSTPROCESS_COMMAND', '${SORT_PASSWD_POSTPROCESS_COMMAND}') |
69 | d.appendVar('ROOTFS_POSTPROCESS_COMMAND', 'rootfs_reproducible;') | 69 | d.appendVar('ROOTFS_POSTPROCESS_COMMAND', 'rootfs_reproducible;') |
@@ -221,9 +221,20 @@ serial_autologin_root () { | |||
221 | fi | 221 | fi |
222 | } | 222 | } |
223 | 223 | ||
224 | python tidy_shadowutils_files () { | ||
225 | import rootfspostcommands | ||
226 | rootfspostcommands.tidy_shadowutils_files(d.expand('${IMAGE_ROOTFS}${sysconfdir}')) | ||
227 | } | ||
228 | |||
224 | python sort_passwd () { | 229 | python sort_passwd () { |
230 | """ | ||
231 | Deprecated in the favour of tidy_shadowutils_files. | ||
232 | """ | ||
225 | import rootfspostcommands | 233 | import rootfspostcommands |
226 | rootfspostcommands.sort_passwd(d.expand('${IMAGE_ROOTFS}${sysconfdir}')) | 234 | bb.warn('[sort_passwd] You are using a deprecated function for ' |
235 | 'SORT_PASSWD_POSTPROCESS_COMMAND. The default one is now called ' | ||
236 | '"tidy_shadowutils_files".') | ||
237 | rootfspostcommands.tidy_shadowutils_files(d.expand('${IMAGE_ROOTFS}${sysconfdir}')) | ||
227 | } | 238 | } |
228 | 239 | ||
229 | # | 240 | # |