kea: remove unnecessary reproducibility patch

Rather, adjust the sed invocation to do the correct thing directly.

(From OE-Core rev: a57f48c3bb37d5154ea2ef821525aa8706f9cb37)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 804afb2eb9cc2b5650faa80816f377fa5b72fb38)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Alexander Kanavin
2024-04-19 14:19:32 +02:00
committed by Steve Sakoman
parent b4ab121b5f
commit fc979d94f6
2 changed files with 1 additions and 64 deletions

View File

@@ -1,62 +0,0 @@
From f9bcfed5a1d44d9211c5f6eba403a9898c8c9057 Mon Sep 17 00:00:00 2001
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Date: Tue, 8 Aug 2023 19:03:13 +0100
Subject: [PATCH] kea: fix reproducible build failure
New version of Kea has started using path of build-dir instead of
src-dir which results in reproducible builds failure.
Use src-dir as is used in v2.2.0
Upstream-Status: Pending
https://gitlab.isc.org/isc-projects/kea/-/issues/3007
Upstream has confirmed the patch will not be accepted but discussions
with upstream is still going on, we might have a proper solution later.
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
src/bin/admin/kea-admin.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 034a0ee..8ab11ab 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -51,14 +51,14 @@ dump_qry=""
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
else
- . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+ . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
fi
# Find the installed kea-lfc if available. Fallback to sources otherwise.
if test -x "@sbindir@/kea-lfc"; then
kea_lfc="@sbindir@/kea-lfc"
else
- kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc"
+ kea_lfc="@abs_top_srcdir@/src/bin/lfc/kea-lfc"
fi
# Prints out usage version.
@@ -355,7 +355,7 @@ mysql_upgrade() {
# Check if there are any files in it
num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l)
if [ "$num_files" -eq 0 ]; then
- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql
+ upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/mysql
# Check if the scripts directory exists at all.
if [ ! -d ${upgrade_scripts_dir} ]; then
@@ -405,7 +405,7 @@ pgsql_upgrade() {
# Check if there are any files in it
num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l)
if [ "$num_files" -eq 0 ]; then
- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql
+ upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/pgsql
# Check if the scripts directory exists at all.
if [ ! -d ${upgrade_scripts_dir} ]; then
--
2.39.2

View File

@@ -17,7 +17,6 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
file://fix-multilib-conflict.patch \
file://fix_pid_keactrl.patch \
file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
file://0001-kea-fix-reproducible-build-failure.patch \
"
SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a"
@@ -47,7 +46,7 @@ do_configure:prepend() {
# replace abs_top_builddir to avoid introducing the build path
# don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target
find ${S} -type f -name *.sh.in | xargs sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g"
sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in
sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in
}
# patch out build host paths for reproducibility