diff options
author | Jose Quaresma <quaresma.jose@gmail.com> | 2021-11-04 19:12:23 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-05 11:41:00 +0000 |
commit | 5b9210d66c78bb3f79056e5586cea7b0edd714a9 (patch) | |
tree | 9fa718ae4b5a5e7f2b98af52d5f5b8c063d74886 /meta/classes/sstate.bbclass | |
parent | d313f5312644223e349d9754266297b5dcd519fe (diff) | |
download | poky-5b9210d66c78bb3f79056e5586cea7b0edd714a9.tar.gz |
sstate: another fix for touching files inside pseudo
This patch is a fixup for 676757f "sstate: fix touching files inside pseudo"
running the 'id' command inside the sstate_unpack_package
function shows that this funcion run inside the pseudo:
uid=0(root) gid=0(root) groups=0(root)
The check for [ -w ${SSTATE_PKG} ] and [ -O ${SSTATE_PKG}.siginfo ]
will always return true and the touch can fail when the real user
don't have permission or in readonly filesystem.
As the documentation refers:
- the file test operator "-w" check if the file has write permission
(for the user running the test).
- the file test operator "-O" check if you are owner of file
We can avoid this test running the touch and mask any return errors
that we have.
(From OE-Core rev: 29fc85997ade490ae46ffca37ef8e1a56957c876)
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r-- | meta/classes/sstate.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 8182010047..849723d4dc 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -900,12 +900,12 @@ sstate_unpack_package () { | |||
900 | fi | 900 | fi |
901 | 901 | ||
902 | tar -I "$ZSTD" -xvf ${SSTATE_PKG} | 902 | tar -I "$ZSTD" -xvf ${SSTATE_PKG} |
903 | # update .siginfo atime on local/NFS mirror | 903 | # update .siginfo atime on local/NFS mirror if it is a symbolic link |
904 | [ -O ${SSTATE_PKG}.siginfo ] && [ -w ${SSTATE_PKG}.siginfo ] && [ -h ${SSTATE_PKG}.siginfo ] && touch -a ${SSTATE_PKG}.siginfo | 904 | [ ! -h ${SSTATE_PKG}.siginfo ] || touch -a ${SSTATE_PKG}.siginfo 2>/dev/null || true |
905 | # Use "! -w ||" to return true for read only files | 905 | # update each symbolic link instead of any referenced file |
906 | [ ! -w ${SSTATE_PKG} ] || touch --no-dereference ${SSTATE_PKG} | 906 | touch --no-dereference ${SSTATE_PKG} 2>/dev/null || true |
907 | [ ! -w ${SSTATE_PKG}.sig ] || [ ! -e ${SSTATE_PKG}.sig ] || touch --no-dereference ${SSTATE_PKG}.sig | 907 | [ ! -e ${SSTATE_PKG}.sig ] || touch --no-dereference ${SSTATE_PKG}.sig 2>/dev/null || true |
908 | [ ! -w ${SSTATE_PKG}.siginfo ] || [ ! -e ${SSTATE_PKG}.siginfo ] || touch --no-dereference ${SSTATE_PKG}.siginfo | 908 | [ ! -e ${SSTATE_PKG}.siginfo ] || touch --no-dereference ${SSTATE_PKG}.siginfo 2>/dev/null || true |
909 | } | 909 | } |
910 | 910 | ||
911 | BB_HASHCHECK_FUNCTION = "sstate_checkhashes" | 911 | BB_HASHCHECK_FUNCTION = "sstate_checkhashes" |