summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-17 10:56:19 +0000
committerSteve Sakoman <steve@sakoman.com>2021-03-04 04:19:49 -1000
commit2a50e0e6c226c5f3a4e36be6a80c6880710bc130 (patch)
tree94275530bdac75248e793bdb4dd70b32ce8894a3
parent60c515d84d3bff57412e9c4f616f42e529bf0831 (diff)
downloadopenembedded-core-contrib-2a50e0e6c226c5f3a4e36be6a80c6880710bc130.tar.gz
openembedded-core-contrib-2a50e0e6c226c5f3a4e36be6a80c6880710bc130.tar.bz2
openembedded-core-contrib-2a50e0e6c226c5f3a4e36be6a80c6880710bc130.zip
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> (cherry picked from commit 725a30a30052540a4b7fc2933396fe9eb946eeac) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
index e1e470bf34..bf8385fe6d 100644
--- 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
}