From: <olani@axis.com>
To: <openembedded-core@lists.openembedded.org>
Subject: [RFC PATCH 5/5] automake: Remove patch that changes path to test-driver
Date: Mon, 11 Nov 2024 09:35:41 +0100 [thread overview]
Message-ID: <20241111083541.291594-6-olani@axis.com> (raw)
In-Reply-To: <20241111083541.291594-1-olani@axis.com>
From: Ola x Nilsson <olani@axis.com>
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]
---
...top_builddir-path-in-Makefile-to-acc.patch | 50 -------------------
.../automake/automake_1.17.bb | 1 -
2 files changed, 51 deletions(-)
delete mode 100644 meta/recipes-devtools/automake/automake/0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch
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 a5bad068a45..00000000000
--- a/meta/recipes-devtools/automake/automake/0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4f576c10613b43cbbfcdf5a451d893faecd6fea9 Mon Sep 17 00:00:00 2001
-From: Adrian Calianu <adrian.calianu@enea.com>
-Date: Thu, 25 Feb 2016 16:08:04 +0100
-Subject: [PATCH 5/6] Set relative to top_builddir path in Makefile to access
- test-driver
-
-Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
-Upstream-Status: Inappropriate [specific to oe-core target ptest installation]
-Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042
----
- bin/automake.in | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/bin/automake.in b/bin/automake.in
-index 18626de..3aa8706 100644
---- a/bin/automake.in
-+++ b/bin/automake.in
-@@ -325,6 +325,9 @@ my $config_aux_dir_set_in_configure_ac = 0;
- # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used
- # in Makefiles.
- my $am_config_aux_dir = '';
-+# Directory used at runtime like running test-driver that should not
-+# depend on $(top_srcdir)
-+my $am_config_rt_aux_dir = '';
-
- # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR
- # in configure.ac.
-@@ -4917,7 +4920,7 @@ sub handle_per_suffix_test
- {
- require_conf_file ("parallel-tests", FOREIGN, 'test-driver');
- define_variable ("${pfx}LOG_DRIVER",
-- "\$(SHELL) $am_config_aux_dir/test-driver",
-+ "\$(SHELL) $am_config_rt_aux_dir/test-driver",
- INTERNAL);
- }
- my $driver = '$(' . $pfx . 'LOG_DRIVER)';
-@@ -7554,6 +7557,10 @@ sub locate_aux_dir ()
- $am_config_aux_dir =
- '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir");
- $am_config_aux_dir =~ s,/*$,,;
-+
-+ $am_config_rt_aux_dir =
-+ '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir");
-+ $am_config_rt_aux_dir =~ s,/*$,,;
- }
-
-
---
-2.39.2
-
diff --git a/meta/recipes-devtools/automake/automake_1.17.bb b/meta/recipes-devtools/automake/automake_1.17.bb
index 27d8dfe1827..e22e51498bf 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 += "\
file://0002-automake-Update-for-python.m4-to-respect-libdir.patch \
file://0003-build-fix-race-in-parallel-builds.patch \
file://0004-Add-a-new-distro-feature-ptest.patch \
- file://0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch \
file://0006-automake-Remove-delays-in-configure-scripts-using-au.patch \
"
--
2.39.5
next prev parent reply other threads:[~2024-11-11 8:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-11 8:35 [RFC PATCH 0/5] Remove automake patch that changes path to test-driver olani
2024-11-11 8:35 ` [RFC PATCH 1/5] attr: Fix the ptest " olani
2024-11-12 9:35 ` [OE-core] " Richard Purdie
2024-11-13 8:37 ` Ola x Nilsson
2024-11-11 8:35 ` [RFC PATCH 2/5] sed: " olani
2024-11-11 8:35 ` [RFC PATCH 3/5] parted: " olani
2024-11-11 8:35 ` [RFC PATCH 4/5] strace: " olani
2024-11-11 8:35 ` olani [this message]
2024-11-11 10:52 ` [OE-core] [RFC PATCH 0/5] Remove automake patch that changes " Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241111083541.291594-6-olani@axis.com \
--to=olani@axis.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.