From b474d7598d0803ba92b01944b961b28beec3bfe2 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Wed, 24 Aug 2022 01:56:23 +0200 Subject: [PATCH] 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'. Signed-off-by: Andrei Gherzan Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- meta/classes-recipe/rootfs-postcommands.bbclass | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass b/meta/classes-recipe/rootfs-postcommands.bbclass index bf1e992bb27..215e38e33df 100644 --- a/meta/classes-recipe/rootfs-postcommands.bbclass +++ b/meta/classes-recipe/rootfs-postcommands.bbclass @@ -63,7 +63,7 @@ inherit image-artifact-names # systemd_sysusers_create and set_user_group. Using :append is not # enough for that, set_user_group is added that way and would end # up running after us. -SORT_PASSWD_POSTPROCESS_COMMAND ??= " sort_passwd; " +SORT_PASSWD_POSTPROCESS_COMMAND ??= " tidy_shadowutils_files; " python () { d.appendVar('ROOTFS_POSTPROCESS_COMMAND', '${SORT_PASSWD_POSTPROCESS_COMMAND}') d.appendVar('ROOTFS_POSTPROCESS_COMMAND', 'rootfs_reproducible;') @@ -221,9 +221,20 @@ serial_autologin_root () { fi } +python tidy_shadowutils_files () { + import rootfspostcommands + rootfspostcommands.tidy_shadowutils_files(d.expand('${IMAGE_ROOTFS}${sysconfdir}')) +} + python sort_passwd () { + """ + Deprecated in the favour of tidy_shadowutils_files. + """ import rootfspostcommands - rootfspostcommands.sort_passwd(d.expand('${IMAGE_ROOTFS}${sysconfdir}')) + bb.warn('[sort_passwd] You are using a deprecated function for ' + 'SORT_PASSWD_POSTPROCESS_COMMAND. The default one is now called ' + '"tidy_shadowutils_files".') + rootfspostcommands.tidy_shadowutils_files(d.expand('${IMAGE_ROOTFS}${sysconfdir}')) } # -- 2.47.3