summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-09-18 13:16:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-19 10:54:32 +0100
commitf3977f03a142c0d0ce0328626f12f43b5fd69121 (patch)
tree0eb49351881c1b766a4a7ce37ea1a6b2f73e3800 /meta/classes
parentc5717f3515a0de57b353d808aa2a3282bb246b32 (diff)
downloadpoky-f3977f03a142c0d0ce0328626f12f43b5fd69121.tar.gz
rootfs-postcommands: check /etc/gconf exists before working on it
Check that /etc/gconf exists before trying to find files under it, to avoid writing find error messages to the rootfs log. Also use ${sysconfdir}/gconf instead of hardcoding /etc/gconf. (From OE-Core rev: 70a77b91031388ea29eff6b8885fd25cc35b1dae) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/rootfs-postcommands.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index fc338161c4..88f75d0f44 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -361,7 +361,9 @@ rootfs_reproducible () {
361 echo $sformatted > ${IMAGE_ROOTFS}/etc/version 361 echo $sformatted > ${IMAGE_ROOTFS}/etc/version
362 bbnote "rootfs_reproducible: set /etc/version to $sformatted" 362 bbnote "rootfs_reproducible: set /etc/version to $sformatted"
363 363
364 find ${IMAGE_ROOTFS}/etc/gconf -name '%gconf.xml' -print0 | xargs -0r \ 364 if [ -d ${IMAGE_ROOTFS}${sysconfdir}/gconf ]; then
365 sed -i -e 's@\bmtime="[0-9][0-9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g' 365 find ${IMAGE_ROOTFS}${sysconfdir}/gconf -name '%gconf.xml' -print0 | xargs -0r \
366 sed -i -e 's@\bmtime="[0-9][0-9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g'
367 fi
366 fi 368 fi
367} 369}