mc: fix reproducibility
PATCH 1/2 mc: fix reproducibility
From: Alexander Kanavin <[email protected]>
It is probing into what options the /usr/bin/file executable does and does not support and bakes that into target binaries, so we need to use a deterministic one we build ourselves.
Signed-off-by Alexander Kanavin <[email protected]>
--- meta/recipes-extended/mc/mc_4.8.27.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-extended/mc/mc_4.8.27.bb +6 -1
@@ -4,7 +4,7 @@ DESCRIPTION = "GNU Midnight Commander is a visual file manager, licensed under G LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=270bbafe360e73f9840bd7981621f9c2" SECTION = "console/utils" -DEPENDS = "ncurses glib-2.0 util-linux" +DEPENDS = "ncurses glib-2.0 util-linux file-replacement-native" RDEPENDS:${PN} = "ncurses-terminfo-base" RRECOMMENDS:${PN} = "ncurses-terminfo"
@@ -14,6 +14,10 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ " SRC_URI[sha256sum] = "2f52dd9c75c20d8eac7701bd3a8c6c125aaf8cdd9cf12b78ca50a0102b543407" +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".2" + inherit autotools gettext pkgconfig #
@@ -25,6 +29,7 @@ PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," CFLAGS:append:libc-musl = ' -DNCURSES_WIDECHAR=1 ' EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable-configure-args" +EXTRANATIVEPATH += "file-native" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'"
Signature · 1 line
2.31.1
PATCH 2/2 libjitterentropy: remove contaminated hashequiv entry
From: Alexander Kanavin <[email protected]>
This was caused by intermittent reproducibility problems.
Signed-off-by Alexander Kanavin <[email protected]>
--- .../libjitterentropy/libjitterentropy_3.1.0.bb | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb +4 -0
@@ -15,6 +15,10 @@ SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git \ SRCREV = "409828cfccf4b3b07edc40a7840a821ce074e2c3" S = "${WORKDIR}/git" +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".2" + do_configure[noexec] = "1" LDFLAGS += "-Wl,-O0"
Signature · 1 line
2.31.1