mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

kea: fix reproducibility

Browse Source 
(From OE-Core rev: 5f486c39a766f921fb4374165b6e342dd87244ec)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2020-12-03 14:37:18 +01:00
committed by Richard Purdie
parent 826b12792b
commit 5a6aaf745f
2 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch
+27
View File
@@ -0,0 +1,27 @@
From 9985a03f13da4d7bb0a433f7305d2ffae3d82a27 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 10 Nov 2020 15:57:03 +0000
Subject: [PATCH] src/lib/log/logger_unittest_support.cc: do not write build
path into binary
This breaks reproducibility and is needed only in unit testing.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
src/lib/log/logger_unittest_support.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/log/logger_unittest_support.cc b/src/lib/log/logger_unittest_support.cc
index 58dbef8..9a2929c 100644
--- a/src/lib/log/logger_unittest_support.cc
+++ b/src/lib/log/logger_unittest_support.cc
@@ -84,7 +84,7 @@ void initLogger(isc::log::Severity severity, int dbglevel) {
const char* localfile = getenv("KEA_LOGGER_LOCALMSG");
// Set a directory for creating lockfiles when running tests
- setenv("KEA_LOCKFILE_DIR", TOP_BUILDDIR, 0);
+ //setenv("KEA_LOCKFILE_DIR", TOP_BUILDDIR, 0);
// Initialize logging
initLogger(root, isc::log::DEBUG, isc::log::MAX_DEBUG_LEVEL, localfile);
meta/recipes-connectivity/kea/kea_1.7.10.bb
+17 -12
View File
@@ -7,18 +7,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=68d95543d2096459290a4e6b9ceccffa"
DEPENDS = "boost log4cplus openssl" DEPENDS = "boost log4cplus openssl"
SRC_URI = "\ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://0001-keactrl.in-create-var-lib-kea-and-var-run-kea-folder.patch \
file://0001-keactrl.in-create-var-lib-kea-and-var-run-kea-folder.patch \ file://kea-dhcp4.service \
file://kea-dhcp4.service \ file://kea-dhcp6.service \
file://kea-dhcp6.service \ file://kea-dhcp-ddns.service \
file://kea-dhcp-ddns.service \ file://kea-dhcp4-server \
file://kea-dhcp4-server \ file://kea-dhcp6-server \
file://kea-dhcp6-server \ file://kea-dhcp-ddns-server \
file://kea-dhcp-ddns-server \ file://fix-multilib-conflict.patch \
file://fix-multilib-conflict.patch \ file://fix_pid_keactrl.patch \
file://fix_pid_keactrl.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
" "
SRC_URI[sha256sum] = "4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82" SRC_URI[sha256sum] = "4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82"
inherit autotools systemd update-rc.d upstream-version-is-even inherit autotools systemd update-rc.d upstream-version-is-even
@@ -50,6 +50,11 @@ do_configure_prepend() {
sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in
} }
# patch out build host paths for reproducibility
do_compile_prepend_class-target() {
sed -i -e "s,${WORKDIR},,g" ${B}/config.report
}
do_install_append() { do_install_append() {
install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/init.d
install -d ${D}${systemd_system_unitdir} install -d ${D}${systemd_system_unitdir}