| Andrew Geissler | 5082cc7 | 2023-09-11 08:41:39 -0400 | [diff] [blame] | 1 | From f9bcfed5a1d44d9211c5f6eba403a9898c8c9057 Mon Sep 17 00:00:00 2001 |
| 2 | From: Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
| 3 | Date: Tue, 8 Aug 2023 19:03:13 +0100 |
| 4 | Subject: [PATCH] kea: fix reproducible build failure |
| 5 | |
| 6 | New version of Kea has started using path of build-dir instead of |
| 7 | src-dir which results in reproducible builds failure. |
| 8 | Use src-dir as is used in v2.2.0 |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | https://gitlab.isc.org/isc-projects/kea/-/issues/3007 |
| 12 | |
| 13 | Upstream has confirmed the patch will not be accepted but discussions |
| 14 | with upstream is still going on, we might have a proper solution later. |
| 15 | |
| 16 | Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
| 17 | --- |
| 18 | src/bin/admin/kea-admin.in | 8 ++++---- |
| 19 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 20 | |
| 21 | diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in |
| 22 | index 034a0ee..8ab11ab 100644 |
| 23 | --- a/src/bin/admin/kea-admin.in |
| 24 | +++ b/src/bin/admin/kea-admin.in |
| 25 | @@ -51,14 +51,14 @@ dump_qry="" |
| 26 | if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then |
| 27 | . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh" |
| 28 | else |
| 29 | - . "@abs_top_builddir@/src/bin/admin/admin-utils.sh" |
| 30 | + . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" |
| 31 | fi |
| 32 | |
| 33 | # Find the installed kea-lfc if available. Fallback to sources otherwise. |
| 34 | if test -x "@sbindir@/kea-lfc"; then |
| 35 | kea_lfc="@sbindir@/kea-lfc" |
| 36 | else |
| 37 | - kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc" |
| 38 | + kea_lfc="@abs_top_srcdir@/src/bin/lfc/kea-lfc" |
| 39 | fi |
| 40 | |
| 41 | # Prints out usage version. |
| 42 | @@ -355,7 +355,7 @@ mysql_upgrade() { |
| 43 | # Check if there are any files in it |
| 44 | num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) |
| 45 | if [ "$num_files" -eq 0 ]; then |
| 46 | - upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql |
| 47 | + upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/mysql |
| 48 | |
| 49 | # Check if the scripts directory exists at all. |
| 50 | if [ ! -d ${upgrade_scripts_dir} ]; then |
| 51 | @@ -405,7 +405,7 @@ pgsql_upgrade() { |
| 52 | # Check if there are any files in it |
| 53 | num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) |
| 54 | if [ "$num_files" -eq 0 ]; then |
| 55 | - upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql |
| 56 | + upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/pgsql |
| 57 | |
| 58 | # Check if the scripts directory exists at all. |
| 59 | if [ ! -d ${upgrade_scripts_dir} ]; then |
| 60 | -- |
| 61 | 2.39.2 |
| 62 | |