Skip to contentSkip to conversation

rootfs-postcommands: check /etc/gconf exists before working on it

PATCH New Ross Burton 1 participant 1 message Sep 18, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/classes/rootfs-postcommands.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/classes/rootfs-postcommands.bbclass +4 -2
index fc338161c4d..88f75d0f442 100644
@@ -361,7 +361,9 @@ rootfs_reproducible () {
 		echo $sformatted > ${IMAGE_ROOTFS}/etc/version
 		bbnote "rootfs_reproducible: set /etc/version to $sformatted"
 
-		find ${IMAGE_ROOTFS}/etc/gconf -name '%gconf.xml' -print0 | xargs -0r \
-		sed -i -e 's@\bmtime="[0-9][0-9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g'
+		if [ -d ${IMAGE_ROOTFS}${sysconfdir}/gconf ]; then
+			find ${IMAGE_ROOTFS}${sysconfdir}/gconf -name '%gconf.xml' -print0 | xargs -0r \
+			sed -i -e 's@\bmtime="[0-9][0-9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g'
+		fi
 	fi
 }
Signature · 1 line
2.20.1