summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2021-11-07 11:36:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-21 11:40:34 +0000
commit03e2fa220c440c8e9224be95d6520f2183295334 (patch)
tree990eedc224d4c85d05ccf4d674ff568a0e155e85 /meta
parent42f080deba8b447a7d35d739519bd7c54ebfd8ff (diff)
downloadpoky-03e2fa220c440c8e9224be95d6520f2183295334.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) (From OE-Core rev: a5240d78f287ff5f3c5831af69e6e0ca3feaf769) Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 5b9210d66c78bb3f79056e5586cea7b0edd714a9) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sstate.bbclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 957762db5c..da29225983 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -863,12 +863,12 @@ python sstate_report_unihash() {
863# 863#
864sstate_unpack_package () { 864sstate_unpack_package () {
865 tar -xvzf ${SSTATE_PKG} 865 tar -xvzf ${SSTATE_PKG}
866 # update .siginfo atime on local/NFS mirror 866 # update .siginfo atime on local/NFS mirror if it is a symbolic link
867 [ -O ${SSTATE_PKG}.siginfo ] && [ -w ${SSTATE_PKG}.siginfo ] && [ -h ${SSTATE_PKG}.siginfo ] && touch -a ${SSTATE_PKG}.siginfo 867 [ ! -h ${SSTATE_PKG}.siginfo ] || touch -a ${SSTATE_PKG}.siginfo 2>/dev/null || true
868 # Use "! -w ||" to return true for read only files 868 # update each symbolic link instead of any referenced file
869 [ ! -w ${SSTATE_PKG} ] || touch --no-dereference ${SSTATE_PKG} 869 touch --no-dereference ${SSTATE_PKG} 2>/dev/null || true
870 [ ! -w ${SSTATE_PKG}.sig ] || [ ! -e ${SSTATE_PKG}.sig ] || touch --no-dereference ${SSTATE_PKG}.sig 870 [ ! -e ${SSTATE_PKG}.sig ] || touch --no-dereference ${SSTATE_PKG}.sig 2>/dev/null || true
871 [ ! -w ${SSTATE_PKG}.siginfo ] || [ ! -e ${SSTATE_PKG}.siginfo ] || touch --no-dereference ${SSTATE_PKG}.siginfo 871 [ ! -e ${SSTATE_PKG}.siginfo ] || touch --no-dereference ${SSTATE_PKG}.siginfo 2>/dev/null || true
872} 872}
873 873
874BB_HASHCHECK_FUNCTION = "sstate_checkhashes" 874BB_HASHCHECK_FUNCTION = "sstate_checkhashes"