| Message ID | 20230326174723.2287560-1-richard.purdie@linuxfoundation.org |
|---|---|
| State | Accepted, archived |
| Commit | f45ddfbf007de858327eef0ffefd5840ef4c69b8 |
| Headers | show |
| Series | abi_version/sstate: Handle pkgconfig output changes and bump output versions | expand |
diff --git a/meta/classes-global/package.bbclass b/meta/classes-global/package.bbclass index 21461ff314b..9c3bd06a921 100644 --- a/meta/classes-global/package.bbclass +++ b/meta/classes-global/package.bbclass @@ -468,7 +468,7 @@ python do_package () { # cache. This is useful if an item this class depends on changes in a # way that the output of this class changes. rpmdeps is a good example # as any change to rpmdeps requires this to be rerun. - # PACKAGE_BBCLASS_VERSION = "4" + # PACKAGE_BBCLASS_VERSION = "5" # Init cachedpath global cpath diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 5b63582b5ae..95373fd60a5 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -SSTATE_VERSION = "10" +SSTATE_VERSION = "11" SSTATE_ZSTD_CLEVEL ??= "8" diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index c716bd7feba..b6643ea60b3 100644 --- a/meta/conf/abi_version.conf +++ b/meta/conf/abi_version.conf @@ -12,4 +12,4 @@ OELAYOUT_ABI = "15" # a reset of the equivalence, for example when reproducibility issues break the # existing match data. Distros can also append to this value for the same effect. # -HASHEQUIV_HASH_VERSION = "14" +HASHEQUIV_HASH_VERSION = "15" diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index d526a8ca207..b93b55fe77d 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc @@ -23,6 +23,4 @@ ARM_INSTRUCTION_SET:armv6 = "arm" COMPATIBLE_HOST:libc-musl:class-target = "null" PV = "2.37" -# remove at next version upgrade or when output changes PR = "r1" -HASHEQUIV_HASH_VERSION .= ".1" diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb index 297dbfb578b..d93152cedd8 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb @@ -100,9 +100,7 @@ SRC_URI = "git://github.com/xrmx/bootchart.git;branch=master;protocol=https \ S = "${WORKDIR}/git" SRCREV = "868a2afab9da34f32c007d773b77253c93104636" -# remove at next version upgrade or when output changes PR = "r1" -HASHEQUIV_HASH_VERSION .= ".1" inherit systemd update-rc.d python3native update-alternatives diff --git a/meta/recipes-devtools/perl/liberror-perl_0.17029.bb b/meta/recipes-devtools/perl/liberror-perl_0.17029.bb index 67e5811f3c2..9585dfc2c61 100644 --- a/meta/recipes-devtools/perl/liberror-perl_0.17029.bb +++ b/meta/recipes-devtools/perl/liberror-perl_0.17029.bb @@ -9,9 +9,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=8f3499d09ee74a050c0319391ff9d100" -# remove at next version upgrade or when output changes PR = "r1" -HASHEQUIV_HASH_VERSION .= ".1" DEPENDS += "perl" diff --git a/meta/recipes-extended/mc/mc_4.8.29.bb b/meta/recipes-extended/mc/mc_4.8.29.bb index 7aac352ab5e..e7f4aacc2e0 100644 --- a/meta/recipes-extended/mc/mc_4.8.29.bb +++ b/meta/recipes-extended/mc/mc_4.8.29.bb @@ -14,9 +14,6 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ " SRC_URI[sha256sum] = "ba6b2d8752806ac23fe045c1b081eb66dcefa6159205c79f86c005dcaf9941c1" -# remove at next version upgrade or when output changes -HASHEQUIV_HASH_VERSION .= ".2" - inherit autotools gettext pkgconfig # 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 1f1ad83e0bc..d3d1cfde60c 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 @@ -12,9 +12,6 @@ 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 88f534ccf7d..babde4b0998 100644 --- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb @@ -14,8 +14,6 @@ SOURCE_DATE_EPOCH = "1613559011" PE = "1" PR = "r4" -# remove at next version upgrade or when output changes -HASHEQUIV_HASH_VERSION .= ".1" inherit allarch features_check diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_3.4.1.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_3.4.1.bb index 3fb8c6b1479..6cef8c068c8 100644 --- a/meta/recipes-support/libjitterentropy/libjitterentropy_3.4.1.bb +++ b/meta/recipes-support/libjitterentropy/libjitterentropy_3.4.1.bb @@ -13,9 +13,6 @@ SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git;branch=master;p SRCREV = "4544e11320138ac02797af81766f4476a71bb09f" S = "${WORKDIR}/git" -# remove at next version upgrade or when output changes -HASHEQUIV_HASH_VERSION .= ".2" - do_configure[noexec] = "1" LDFLAGS += "-Wl,-O0"
A recent package.py change has highlighted some corruption issues with -dev pkgconfig package dependencies. Bump the output versions to trigger a rebuild and ensure everything is consistent. Take the opportunity to also drop all HASHEQUIV_HASH_VERSION entries since the main version is changing. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/classes-global/package.bbclass | 2 +- meta/classes-global/sstate.bbclass | 2 +- meta/conf/abi_version.conf | 2 +- meta/recipes-core/glibc/glibc-common.inc | 2 -- meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb | 2 -- meta/recipes-devtools/perl/liberror-perl_0.17029.bb | 2 -- meta/recipes-extended/mc/mc_4.8.29.bb | 3 --- meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb | 3 --- meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 2 -- .../recipes-support/libjitterentropy/libjitterentropy_3.4.1.bb | 3 --- 10 files changed, 3 insertions(+), 20 deletions(-)