summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-17 10:56:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-04 17:39:08 +0000
commitd680ca79622eede1dcde476141b83e4474edcbbc (patch)
tree0555d0bbd5724efdd8b60b714e93ec09ea6a7137 /meta
parentbe914952f5ede4472f3d115660722ff7ad276669 (diff)
downloadpoky-d680ca79622eede1dcde476141b83e4474edcbbc.tar.gz
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. (From OE-Core rev: 2a50e0e6c226c5f3a4e36be6a80c6880710bc130) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 725a30a30052540a4b7fc2933396fe9eb946eeac) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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
10 10
11SRC_URI = "file://misc" 11SRC_URI = "file://misc"
12 12
13SOURCE_DATE_EPOCH = "1613559011"
14
13PE = "1" 15PE = "1"
14PR = "r2" 16PR = "r3"
17HASHEQUIV_HASH_VERSION .= ".1"
18
15 19
16inherit allarch features_check 20inherit allarch features_check
17 21
@@ -26,7 +30,9 @@ RDEPENDS_${PN} += "font-alias"
26 30
27do_install() { 31do_install() {
28 install -d ${D}/${datadir}/fonts/X11/misc 32 install -d ${D}/${datadir}/fonts/X11/misc
29 install -m 0644 -p ${S}/* ${D}/${datadir}/fonts/X11/misc/ 33 install -m 0644 ${S}/* ${D}/${datadir}/fonts/X11/misc/
34 # Pick a date/time as otherwise it would be the git checkout/modify time
35 touch -d @1613559011 ${D}/${datadir}/fonts/X11/misc/*
30 install -d ${D}/${libdir}/X11 36 install -d ${D}/${libdir}/X11
31 ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s 37 ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s
32} 38}