diff options
| author | Ming Liu <liu.ming50@gmail.com> | 2022-07-15 13:18:57 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-01 16:27:30 +0100 |
| commit | b581f101894242f405158b6f6afdbf4627550c9e (patch) | |
| tree | 58b1ce47e25d504eaab03c54ef135dc00c1437b2 /meta | |
| parent | ca3a1f17cc672c74272f8e1797d345051bf9821f (diff) | |
| download | poky-b581f101894242f405158b6f6afdbf4627550c9e.tar.gz | |
rootfs-postcommands.bbclass: move host-user-contaminated.txt to ${S}
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.
(From OE-Core rev: 96215d6d45d2cae59c9e36e6a77bbbada410b259)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index fc179613fb..a59d9b5878 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass | |||
| @@ -305,7 +305,7 @@ rootfs_trim_schemas () { | |||
| 305 | } | 305 | } |
| 306 | 306 | ||
| 307 | rootfs_check_host_user_contaminated () { | 307 | rootfs_check_host_user_contaminated () { |
| 308 | contaminated="${WORKDIR}/host-user-contaminated.txt" | 308 | contaminated="${S}/host-user-contaminated.txt" |
| 309 | HOST_USER_UID="$(PSEUDO_UNLOAD=1 id -u)" | 309 | HOST_USER_UID="$(PSEUDO_UNLOAD=1 id -u)" |
| 310 | HOST_USER_GID="$(PSEUDO_UNLOAD=1 id -g)" | 310 | HOST_USER_GID="$(PSEUDO_UNLOAD=1 id -g)" |
| 311 | 311 | ||