xorg-minimal-fonts: Really fix determinism

My previous fix wasn't correct as the file timestamps do vary by git checkout
or modification time and aren't correct here. Instead use a specific
date/time for the files to be deterministic.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
index e1e470bf344090175660f83f924d68d78c18737d..bf8385fe6da208f310d124c4277fb61138861dea 100644 (file)
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
@@ -10,8 +10,12 @@ LIC_FILES_CHKSUM = "file://../misc/fonts.dir;md5=82a143d94d6a974aafe97132d2d519a
 
 SRC_URI = "file://misc"
 
+SOURCE_DATE_EPOCH = "1613559011"
+
 PE = "1"
-PR = "r2"
+PR = "r3"
+HASHEQUIV_HASH_VERSION .= ".1"
+
 
 inherit allarch features_check
 
@@ -26,7 +30,9 @@ RDEPENDS_${PN} += "font-alias"
 
 do_install() {
        install -d ${D}/${datadir}/fonts/X11/misc
-       install -m 0644 -p ${S}/* ${D}/${datadir}/fonts/X11/misc/
+       install -m 0644 ${S}/* ${D}/${datadir}/fonts/X11/misc/
+       # Pick a date/time as otherwise it would be the git checkout/modify time
+       touch -d @1613559011 ${D}/${datadir}/fonts/X11/misc/*
        install -d ${D}/${libdir}/X11
        ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s
 }