summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-07-17 22:33:49 +0200
committerSteve Sakoman <steve@sakoman.com>2023-08-15 06:18:49 -1000
commit3fbeec5e39c061b1c3c0d53247a0eb8f3a7832bd (patch)
tree8f1e89f85b4d3010cf33cca4accb09aa7fce9ceb
parentea2032446c5dd2ef34d10e6be693f4cc13bb9a05 (diff)
downloadpoky-3fbeec5e39c061b1c3c0d53247a0eb8f3a7832bd.tar.gz
Revert "rootfs-postcommands.bbclass: add post func remove_unused_dnf_log_lock"
This was not well researched or explained, and obscures a problem elsewhere: if dnf leaves lock files around, the problem should be fixed at the source, and not in an after-the-fact function. (From OE-Core rev: d38e40661acfbd84197a7731f0dd02d16fba7c59) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 49bad18012a4079f0dbfe6c541a46ec508940f28) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/classes-recipe/rootfs-postcommands.bbclass7
1 files changed, 0 insertions, 7 deletions
diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass b/meta/classes-recipe/rootfs-postcommands.bbclass
index 7538c8b0b5..690fa976aa 100644
--- a/meta/classes-recipe/rootfs-postcommands.bbclass
+++ b/meta/classes-recipe/rootfs-postcommands.bbclass
@@ -49,8 +49,6 @@ ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile;'
49 49
50ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "overlayfs", "overlayfs_qa_check; overlayfs_postprocess;", "", d)}' 50ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "overlayfs", "overlayfs_qa_check; overlayfs_postprocess;", "", d)}'
51 51
52ROOTFS_POSTPROCESS_COMMAND += 'remove_unused_dnf_log_lock;'
53
54inherit image-artifact-names 52inherit image-artifact-names
55 53
56# Sort the user and group entries in /etc by ID in order to make the content 54# Sort the user and group entries in /etc by ID in order to make the content
@@ -278,11 +276,6 @@ empty_var_volatile () {
278 fi 276 fi
279} 277}
280 278
281remove_unused_dnf_log_lock() {
282 if [ -e ${IMAGE_ROOTFS}/log_lock.pid ]; then
283 rm -rf ${IMAGE_ROOTFS}/log_lock.pid
284 fi
285}
286# Turn any symbolic /sbin/init link into a file 279# Turn any symbolic /sbin/init link into a file
287remove_init_link () { 280remove_init_link () {
288 if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then 281 if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then