From 2a50e0e6c226c5f3a4e36be6a80c6880710bc130 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 17 Feb 2021 10:56:19 +0000 Subject: 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 (cherry picked from commit 725a30a30052540a4b7fc2933396fe9eb946eeac) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 10 ++++++++-- 1 file 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 } -- cgit 1.2.3-korg