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. Signed-off-by: Richard Purdie <[email protected]> --- .../cantarell-fonts/cantarell-fonts_0.301.bb | 4 ++++ meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb | 4 ++++ meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb | 5 ++++- meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 4 +++- 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 890c08bf4a0..8dc4ceb399e 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" inherit gnomebase meson allarch fontcache pkgconfig SRC_URI[archive.sha256sum] = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83" +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".2" + EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false" FILES_${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 f5df9efa3b7..abc216f434e 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" LIC_FILES_CHKSUM = "file://LICENSE;md5=f96db970a9a46c5369142b99f530366b" PE = "1" +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".2" + inherit allarch fontcache FONT_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 3e1ba196b58..50c79b3bf00 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." SECTION = "x11/fonts" LICENSE = "BitstreamVera" LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" -PR = "r7" +PR = "r8" inherit allarch fontcache +# remove at next version upgrade or when output changes +HASHEQUIV_HASH_VERSION .= ".1" + FONT_PACKAGES = "${PN}" SRC_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 6a91582068d..f0c77f33bd2 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" SOURCE_DATE_EPOCH = "1613559011" PE = "1" -PR = "r3" +PR = "r4" +# remove at next version upgrade or when output changes +HASHEQUIV_HASH_VERSION .= ".1" inherit allarch features_check -- 2.27.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148639): https://lists.openembedded.org/g/openembedded-core/message/148639 Mute This Topic: https://lists.openembedded.org/mt/80926050/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
