From 4e26c7d183e0002c8429db3bb4a04a6e5e8e3581 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Mon, 5 Sep 2022 13:13:17 +0200
Subject: [PATCH] oniro-image.bbclass: Drop subid backup post rootfs command
Upstream (oe-core) handles now the cleanup directly in the default
sort_passwd post rootfs command.
Merged in oe-core, kirkstone 84b2e9a6c17278cbcc08020aa78759004a7b60bf.
This revision is included in the last oe-core bump.
Related to https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/issues/772
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
meta-oniro-core/classes/oniro-image.bbclass | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/meta-oniro-core/classes/oniro-image.bbclass b/meta-oniro-core/classes/oniro-image.bbclass
index 7dcb5a1f..f5c3da84 100644
--- a/meta-oniro-core/classes/oniro-image.bbclass
+++ b/meta-oniro-core/classes/oniro-image.bbclass
@@ -139,16 +139,3 @@ python deploy_boot_artifacts_to_rootfs() {
run_cmd(install_cmd)
}
ROOTFS_POSTPROCESS_COMMAND += "deploy_boot_artifacts_to_rootfs;"
-
-python () {
- d.appendVar('ROOTFS_POSTPROCESS_COMMAND', ' clean_backup_files; ')
-}
-python clean_backup_files () {
- # Cleanup other backup files generated by shadow-utils not covered by the
- # sort_passwd existing rootfs postcommand.
- # https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/issues/772
- import rootfspostcommands
- for file in ['subuid', 'subgid']:
- filename = os.path.join(d.expand('${IMAGE_ROOTFS}${sysconfdir}'), file)
- rootfspostcommands.remove_backup(filename)
-}
--
GitLab