summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2023-06-30 17:14:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-07-17 15:29:56 +0100
commit406a72a9a47c2735b7e18cefc682b1df00d5a9aa (patch)
treeca62905b4a800a5637780a88bddc06933fd2c6b7
parente4d60408b869c9cc2ccff794d4e271d993ec8a97 (diff)
downloadopenembedded-core-406a72a9a47c2735b7e18cefc682b1df00d5a9aa.tar.gz
rootfs-postcommands.bbclass: add post func remove_unused_dnf_log_lock
Remove log_lock.pid which maybe created during do_rootfs. In commit [dnf: only write the log lock to root for native dnf], native dnf changed to write log lock to root, and target dnf still use /var/log, so log_lock.pid need to be removed post do_rootfs. Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes-recipe/rootfs-postcommands.bbclass7
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass b/meta/classes-recipe/rootfs-postcommands.bbclass
index 4492c9c0aa..53b241413e 100644
--- a/meta/classes-recipe/rootfs-postcommands.bbclass
+++ b/meta/classes-recipe/rootfs-postcommands.bbclass
@@ -49,6 +49,8 @@ ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile;'
ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "overlayfs", "overlayfs_qa_check; overlayfs_postprocess;", "", d)}'
+ROOTFS_POSTPROCESS_COMMAND += 'remove_unused_dnf_log_lock;'
+
inherit image-artifact-names
# Sort the user and group entries in /etc by ID in order to make the content
@@ -361,6 +363,11 @@ empty_var_volatile () {
fi
}
+remove_unused_dnf_log_lock() {
+ if [ -e ${IMAGE_ROOTFS}/log_lock.pid ]; then
+ rm -rf ${IMAGE_ROOTFS}/log_lock.pid
+ fi
+}
# Turn any symbolic /sbin/init link into a file
remove_init_link () {
if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then