From 2c41e766219032dca953eb7c0b18e812a8d0b8f2 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 28 Oct 2021 08:33:20 +0800 Subject: [PATCH] meta: bump HASHEQUIV_HASH_VERSION after RPM fix ef37fca2f4 fixes issues where PLATFORM tag in RPMs generated n aarch and x86 hosts are different for noarch RPMs. But, we'd still need to bump hashequiv version for allarch recipes to avoid issues because of the RPMs that were incorrectly generated so reproducibility tests don't fail. Also bump PR to force rebuilds. Signed-off-by: Anuj Mittal --- .../hicolor-icon-theme/hicolor-icon-theme_0.17.bb | 4 ++++ meta/recipes-graphics/wayland/wayland-protocols_1.20.bb | 4 ++++ meta/recipes-graphics/xorg-font/encodings_1.0.5.bb | 4 ++++ .../wireless-regdb/wireless-regdb_2021.08.28.bb | 4 ++++ meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb | 4 ++++ meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb | 4 ++++ .../pulseaudio-sato/pulseaudio-client-conf-sato_1.bb | 4 ++++ meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb | 5 ++++- meta/recipes-support/iso-codes/iso-codes_4.6.0.bb | 4 ++++ 9 files changed, 36 insertions(+), 1 deletion(-) diff --git a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb index 74e3430528..d70265ee50 100644 --- a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb +++ b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb @@ -16,3 +16,7 @@ inherit allarch autotools FILES_${PN} += "${datadir}/icons" BBCLASSEXTEND = "native nativesdk" + +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.20.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.20.bb index 3fb78f658c..35a46dbb08 100644 --- a/meta/recipes-graphics/wayland/wayland-protocols_1.20.bb +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.20.bb @@ -20,3 +20,7 @@ inherit allarch autotools pkgconfig PACKAGES = "${PN}" FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" + +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb index 713fcfb935..02c8cff25d 100644 --- a/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb +++ b/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb @@ -23,3 +23,7 @@ EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" # postinst from .inc doesn't apply to this recipe pkg_postinst_${PN} () { } + +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.08.28.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.08.28.bb index 376311804e..b1cad01a25 100644 --- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.08.28.bb +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.08.28.bb @@ -41,3 +41,7 @@ do_install_append_class-native() { RSUGGESTS_${PN} = "crda" BBCLASSEXTEND = "native" + +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" diff --git a/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb b/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb index 26542fbbbc..0d4a30a304 100644 --- a/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb +++ b/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb @@ -20,3 +20,7 @@ do_install() { PACKAGES = "${PN}" FILES_${PN} = "*" + +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb index 32cf41c8fd..7787dad268 100644 --- a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb +++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb @@ -21,3 +21,7 @@ do_install() { PACKAGES = "${PN}" FILES_${PN} = "*" + +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" diff --git a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb index e27339fb46..cfba2074f4 100644 --- a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb +++ b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb @@ -15,3 +15,7 @@ do_install() { FILES_${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" CONFFILES_${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" + +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb index 28d5096023..08d3c3fe19 100644 --- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb +++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = "file://shutdown.desktop" -PR = "r1" +PR = "r2" S = "${WORKDIR}" @@ -22,3 +22,6 @@ pkg_postinst_${PN} () { } inherit allarch + +# remove at next version upgrade or when output changes +HASHEQUIV_HASH_VERSION .= ".1" diff --git a/meta/recipes-support/iso-codes/iso-codes_4.6.0.bb b/meta/recipes-support/iso-codes/iso-codes_4.6.0.bb index f915716ce7..cd27fb0b70 100644 --- a/meta/recipes-support/iso-codes/iso-codes_4.6.0.bb +++ b/meta/recipes-support/iso-codes/iso-codes_4.6.0.bb @@ -20,3 +20,7 @@ S = "${WORKDIR}/git" inherit allarch autotools FILES_${PN} += "${datadir}/xml/" + +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" -- 2.40.1