]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
rootfs-postcommands.bbclass: add post func remove_unused_dnf_log_lock
authorChangqing Li <changqing.li@windriver.com>
Fri, 30 Jun 2023 09:14:51 +0000 (17:14 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 17 Jul 2023 14:29:56 +0000 (15:29 +0100)
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>
meta/classes-recipe/rootfs-postcommands.bbclass

index 4492c9c0aa7ead8b3f8e1556ce433bdc10cd06e3..53b241413e4f7c34e2c07837606f274678e966d8 100644 (file)
@@ -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