summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-25 21:54:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-26 15:21:20 +0000
commit983d1b70e7de99662cfcbb27f57f28c3c67febf1 (patch)
tree0fdf9df00a9ba8b1357dbff90925944922ac86a6 /meta
parent61d9c0b77bedf1d6d37437447eb6b154c2d84a78 (diff)
downloadpoky-983d1b70e7de99662cfcbb27f57f28c3c67febf1.tar.gz
fonts: Bump HASHEQUIV_HASH_VERSION after rpmdeps change
After the rpmdeps change, the output didn't change in the correct case and hence hashes were cross-linked. We bump the hashequiv version to avoid problems from this. Also bump PR to force a rebuild. (From OE-Core rev: cd1e4f9957c57bebcc8f16ebc200a1ab2e4fd2ce) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb4
-rw-r--r--meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb4
-rw-r--r--meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb5
-rw-r--r--meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb4
4 files changed, 15 insertions, 2 deletions
diff --git a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
index 890c08bf4a..8dc4ceb399 100644
--- a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
+++ b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
@@ -13,6 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb1ef92b6909969a472a6ea3c4e99cb7"
13inherit gnomebase meson allarch fontcache pkgconfig 13inherit gnomebase meson allarch fontcache pkgconfig
14SRC_URI[archive.sha256sum] = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83" 14SRC_URI[archive.sha256sum] = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83"
15 15
16# remove at next version upgrade or when output changes
17PR = "r1"
18HASHEQUIV_HASH_VERSION .= ".2"
19
16EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false" 20EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false"
17 21
18FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig" 22FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig"
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb
index f5df9efa3b..abc216f434 100644
--- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb
+++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb
@@ -10,6 +10,10 @@ LICENSE = "OFL-1.1"
10LIC_FILES_CHKSUM = "file://LICENSE;md5=f96db970a9a46c5369142b99f530366b" 10LIC_FILES_CHKSUM = "file://LICENSE;md5=f96db970a9a46c5369142b99f530366b"
11PE = "1" 11PE = "1"
12 12
13# remove at next version upgrade or when output changes
14PR = "r1"
15HASHEQUIV_HASH_VERSION .= ".2"
16
13inherit allarch fontcache 17inherit allarch fontcache
14 18
15FONT_PACKAGES = "${PN}" 19FONT_PACKAGES = "${PN}"
diff --git a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
index 3e1ba196b5..50c79b3bf0 100644
--- a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
+++ b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
@@ -7,10 +7,13 @@ but is visibly different than normal and bold, and reasonably pleasing."
7SECTION = "x11/fonts" 7SECTION = "x11/fonts"
8LICENSE = "BitstreamVera" 8LICENSE = "BitstreamVera"
9LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" 9LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be"
10PR = "r7" 10PR = "r8"
11 11
12inherit allarch fontcache 12inherit allarch fontcache
13 13
14# remove at next version upgrade or when output changes
15HASHEQUIV_HASH_VERSION .= ".1"
16
14FONT_PACKAGES = "${PN}" 17FONT_PACKAGES = "${PN}"
15 18
16SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" 19SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2"
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
index 6a91582068..f0c77f33bd 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
@@ -13,7 +13,9 @@ SRC_URI = "file://misc"
13SOURCE_DATE_EPOCH = "1613559011" 13SOURCE_DATE_EPOCH = "1613559011"
14 14
15PE = "1" 15PE = "1"
16PR = "r3" 16PR = "r4"
17# remove at next version upgrade or when output changes
18HASHEQUIV_HASH_VERSION .= ".1"
17 19
18inherit allarch features_check 20inherit allarch features_check
19 21