summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOla x Nilsson <olani@axis.com>2024-11-13 15:45:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-11-14 11:56:53 +0000
commit37213bb5d9e20e215984a64780662f0a9fa1edf7 (patch)
tree0c9aea8a96ca17f0481fb51d94739baa28922c0e
parentea0e5262c68e54bb380436b45c8cb3dd0834a216 (diff)
downloadpoky-37213bb5d9e20e215984a64780662f0a9fa1edf7.tar.gz
automake: Remove patch that changes path to test-driver
The patch "Set relative to top_builddir path in Makefile to access" sets the default path of `test-driver` to `$(top_builddir)/$(config_aux_dir)` instead of the normal `$(top_srcdir)/$(config_aux_dir)`. This breaks `check test` for Automake projects in generated images, and probably other places like SDKs. A typical error would be /bin/sh: ./build-aux/test-driver: No such file or directory Removing the patch makes such checks complete successfully. Fixes [YOCTO #15635] (From OE-Core rev: d21dbafda92263d3e30a5b7d84dd9bb02f855610) Signed-off-by: Ola x Nilsson <olani@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/automake/automake/0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch50
-rw-r--r--meta/recipes-devtools/automake/automake_1.17.bb1
2 files changed, 0 insertions, 51 deletions
diff --git a/meta/recipes-devtools/automake/automake/0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch b/meta/recipes-devtools/automake/automake/0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch
deleted file mode 100644
index a5bad068a4..0000000000
--- a/meta/recipes-devtools/automake/automake/0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 4f576c10613b43cbbfcdf5a451d893faecd6fea9 Mon Sep 17 00:00:00 2001
2From: Adrian Calianu <adrian.calianu@enea.com>
3Date: Thu, 25 Feb 2016 16:08:04 +0100
4Subject: [PATCH 5/6] Set relative to top_builddir path in Makefile to access
5 test-driver
6
7Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
8Upstream-Status: Inappropriate [specific to oe-core target ptest installation]
9Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042
10---
11 bin/automake.in | 9 ++++++++-
12 1 file changed, 8 insertions(+), 1 deletion(-)
13
14diff --git a/bin/automake.in b/bin/automake.in
15index 18626de..3aa8706 100644
16--- a/bin/automake.in
17+++ b/bin/automake.in
18@@ -325,6 +325,9 @@ my $config_aux_dir_set_in_configure_ac = 0;
19 # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used
20 # in Makefiles.
21 my $am_config_aux_dir = '';
22+# Directory used at runtime like running test-driver that should not
23+# depend on $(top_srcdir)
24+my $am_config_rt_aux_dir = '';
25
26 # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR
27 # in configure.ac.
28@@ -4917,7 +4920,7 @@ sub handle_per_suffix_test
29 {
30 require_conf_file ("parallel-tests", FOREIGN, 'test-driver');
31 define_variable ("${pfx}LOG_DRIVER",
32- "\$(SHELL) $am_config_aux_dir/test-driver",
33+ "\$(SHELL) $am_config_rt_aux_dir/test-driver",
34 INTERNAL);
35 }
36 my $driver = '$(' . $pfx . 'LOG_DRIVER)';
37@@ -7554,6 +7557,10 @@ sub locate_aux_dir ()
38 $am_config_aux_dir =
39 '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir");
40 $am_config_aux_dir =~ s,/*$,,;
41+
42+ $am_config_rt_aux_dir =
43+ '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir");
44+ $am_config_rt_aux_dir =~ s,/*$,,;
45 }
46
47
48--
492.39.2
50
diff --git a/meta/recipes-devtools/automake/automake_1.17.bb b/meta/recipes-devtools/automake/automake_1.17.bb
index 27d8dfe182..e22e51498b 100644
--- a/meta/recipes-devtools/automake/automake_1.17.bb
+++ b/meta/recipes-devtools/automake/automake_1.17.bb
@@ -23,7 +23,6 @@ SRC_URI += "\
23 file://0002-automake-Update-for-python.m4-to-respect-libdir.patch \ 23 file://0002-automake-Update-for-python.m4-to-respect-libdir.patch \
24 file://0003-build-fix-race-in-parallel-builds.patch \ 24 file://0003-build-fix-race-in-parallel-builds.patch \
25 file://0004-Add-a-new-distro-feature-ptest.patch \ 25 file://0004-Add-a-new-distro-feature-ptest.patch \
26 file://0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch \
27 file://0006-automake-Remove-delays-in-configure-scripts-using-au.patch \ 26 file://0006-automake-Remove-delays-in-configure-scripts-using-au.patch \
28 " 27 "
29 28