aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNorman Stetter <norman.stetter@garz-fricke.com>2020-09-25 13:49:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-28 14:15:45 +0100
commitf1554e8bd40c640fd58daac18ecf7b458e754109 (patch)
tree7182284e46a264bdf9f16ddadf5ae3fdbbdb5bbe
parent8964fa6491f54602b3789e5314f4dab7213eaa0e (diff)
downloadopenembedded-core-contrib-f1554e8bd40c640fd58daac18ecf7b458e754109.tar.gz
openembedded-core-contrib-f1554e8bd40c640fd58daac18ecf7b458e754109.tar.bz2
openembedded-core-contrib-f1554e8bd40c640fd58daac18ecf7b458e754109.zip
sstate.bbclass: Check file ownership before doing 'touch -a'
In contrast to 'touching' a file without parameters 'touch -a' can only be performed by the file owner. In case of a shared sstate-cache served locally (e.g. over NFS), where the user running bitbake is not the owner of sstate-cache files, even if he has write access on group level, the sstate_unpack_package task will fail. Checking if the file is owned by the user before attempting to run 'touch -a' on it solves this. Signed-off-by: Norman Stetter <norman.stetter@garz-fricke.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 375196ef21..66a96a7603 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -847,7 +847,7 @@ python sstate_report_unihash() {
sstate_unpack_package () {
tar -xvzf ${SSTATE_PKG}
# update .siginfo atime on local/NFS mirror
- [ -w ${SSTATE_PKG}.siginfo ] && [ -h ${SSTATE_PKG}.siginfo ] && touch -a ${SSTATE_PKG}.siginfo
+ [ -O ${SSTATE_PKG}.siginfo ] && [ -w ${SSTATE_PKG}.siginfo ] && [ -h ${SSTATE_PKG}.siginfo ] && touch -a ${SSTATE_PKG}.siginfo
# Use "! -w ||" to return true for read only files
[ ! -w ${SSTATE_PKG} ] || touch --no-dereference ${SSTATE_PKG}
[ ! -w ${SSTATE_PKG}.sig ] || [ ! -e ${SSTATE_PKG}.sig ] || touch --no-dereference ${SSTATE_PKG}.sig