]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
rootfs-postcommands.bbclass: move host-user-contaminated.txt to ${S}
authorMing Liu <liu.ming50@gmail.com>
Fri, 15 Jul 2022 11:18:57 +0000 (13:18 +0200)
committerSteve Sakoman <steve@sakoman.com>
Thu, 18 Aug 2022 17:16:39 +0000 (07:16 -1000)
This is to ensure host-user-contaminated.txt would be removed before
do_rootfs runs, since ${S} is in cleandirs of do_rootfs, otherwise, a
host-user-contaminated.txt file that generated from previous builds
could be used which is wrong.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 54a3fd63e684d070fad962be97e549f3af7ac111)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes/rootfs-postcommands.bbclass

index 0fef52af401ce9d12766dd813e1109cf5b0c1306..d9e2aeab64fdf137b5eaffaf6590aec3b5ab98ef 100644 (file)
@@ -305,7 +305,7 @@ rootfs_trim_schemas () {
 }
 
 rootfs_check_host_user_contaminated () {
-       contaminated="${WORKDIR}/host-user-contaminated.txt"
+       contaminated="${S}/host-user-contaminated.txt"
        HOST_USER_UID="$(PSEUDO_UNLOAD=1 id -u)"
        HOST_USER_GID="$(PSEUDO_UNLOAD=1 id -g)"