From: Herve Codina <herve.codina@bootlin.com>
To: buildroot@buildroot.org
Cc: Herve Codina <herve.codina@bootlin.com>,
Naumann Andreas <ANaumann@ultratronik.de>,
Peter Seiderer <ps.report@gmx.net>,
Julien Corjon <corjon.j@ecagroup.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
"Yann E . MORIN" <yann.morin.1998@free.fr>,
Ricardo Martincoski <ricardo.martincoski@gmail.com>
Subject: [Buildroot] [PATCH v3 01/16] package/pkg-python: fix PKG_PYTHON_FIXUP_SYSCONFIGDATA
Date: Tue, 17 Aug 2021 10:39:15 +0200 [thread overview]
Message-ID: <20210817083930.3718711-2-herve.codina@bootlin.com> (raw)
In-Reply-To: <20210817083930.3718711-1-herve.codina@bootlin.com>
Find used by PKG_PYTHON_FIXUP_SYSCONFIGDATA can fail if directories
are not present. This failure is silently ignored because find is
on the LHS of a pipe.
This commit fixes the find failure. HOST_DIR is used as the starting
point and the search is filtered on the expected directories.
This commit also adds -print0 and the $(Q) verbosity flag as minor
changes.
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
---
New patch in this v3 series.
The find failure was highlighted in 836528f03eb89fdc64432f7a7470145ddf553b8c
and reverted in b928074e2d83f5b873bf1ba381b212dfad9bf207.
package/pkg-python.mk | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/package/pkg-python.mk b/package/pkg-python.mk
index 59a48e5a87..cd48402e02 100644
--- a/package/pkg-python.mk
+++ b/package/pkg-python.mk
@@ -92,11 +92,22 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \
--root=/ \
--single-version-externally-managed
+# Make sure python _sysconfigdata*.py files only reference the current
+# per-package directory.
+#
+# Can't use $(foreach d, $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python*, ...)
+# because those directories may be created in the same recipe this macro will
+# be expanded in.
+# Additionally, either or both may be missing, which would make find whine and
+# fail.
+# So we just use HOST_DIR as a starting point, and filter on the two directories
+# of interest.
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
define PKG_PYTHON_FIXUP_SYSCONFIGDATA
- find $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python* \
- -name "_sysconfigdata*.py" | xargs --no-run-if-empty \
- $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g"
+ $(Q)find $(HOST_DIR) \
+ \( -path '$(HOST_DIR)/lib/python*' -o -path '$(STAGING_DIR)/usr/lib/python*' \) \
+ -name "_sysconfigdata*.py" -print0 | xargs -0 --no-run-if-empty \
+ $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g'
endef
endif
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
next prev parent reply other threads:[~2021-08-17 8:40 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-17 8:39 [Buildroot] [PATCH v3 00/16] Overwritten file detection and fixes, one more step to TLP build Herve Codina
2021-08-17 8:39 ` Herve Codina [this message]
2021-08-17 8:39 ` [Buildroot] [PATCH v3 02/16] package/pkg-python: invalidate precompiled _sysconfigdata*.pyc Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 03/16] package/pkg-generic.mk: move python fixup to generic package infrastructure Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 04/16] package/owfs: remove Python sysconfigdata fixup Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 05/16] qt5: Fix sporadic build failure during top-level parallel build Herve Codina
2021-08-28 16:38 ` Yann E. MORIN
2021-08-28 17:39 ` Yann E. MORIN
2021-08-28 20:19 ` Yann E. MORIN
2021-08-17 8:39 ` [Buildroot] [PATCH v3 06/16] package/pkg-qmake.mk: Move QT5_QT_CONF_FIXUP to post-prepare hook Herve Codina
2021-08-28 20:19 ` Yann E. MORIN
2021-08-17 8:39 ` [Buildroot] [PATCH v3 07/16] package/pkg-generic.mk: detect files overwritten in TARGET_DIR and HOST_DIR Herve Codina
2021-08-28 22:47 ` Yann E. MORIN
2021-08-29 11:39 ` Thomas Petazzoni
2021-08-29 12:51 ` Yann E. MORIN
2021-08-29 16:40 ` Yann E. MORIN
2021-08-30 9:46 ` Arnout Vandecappelle
2021-08-29 15:01 ` Arnout Vandecappelle
2021-08-31 15:35 ` Andreas Naumann
2021-09-17 19:43 ` Yann E. MORIN
2021-08-17 8:39 ` [Buildroot] [PATCH v3 08/16] package/pkg-generic.mk: generate final rsync exclude file list Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 09/16] Makefile: rsync global {TARGET, HOST}_DIR using exclusion " Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 10/16] Makefile: breaks hardlinks in global {TARGET, HOST}_DIR on per-package build Herve Codina
2021-09-17 19:51 ` Yann E. MORIN
2023-10-01 12:56 ` Peter Korsgaard
2023-10-13 14:36 ` Peter Korsgaard
2021-08-17 8:39 ` [Buildroot] [PATCH v3 11/16] package/pkg-generic.mk: fix per-package <pkg>-{reconfigure, rebuild, reinstall} Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 12/16] package/pkg-generic.mk: remove .files-final-rsync.before temporary file Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 13/16] support/testing/infra: add log_file_path() function Herve Codina
2021-08-29 10:42 ` Yann E. MORIN
2021-08-17 8:39 ` [Buildroot] [PATCH v3 14/16] support/testing/tests: add test for check_bin_arch Herve Codina
2021-08-29 10:46 ` Yann E. MORIN
2021-08-17 8:39 ` [Buildroot] [PATCH v3 15/16] support/testing/tests: add test for file overwrite detection Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 16/16] package/pkg-generic.mk: move fixup-libtool-files to post-prepare hook Herve Codina
2021-08-28 14:47 ` [Buildroot] [PATCH v3 00/16] Overwritten file detection and fixes, one more step to TLP build Yann E. MORIN
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=20210817083930.3718711-2-herve.codina@bootlin.com \
--to=herve.codina@bootlin.com \
--cc=ANaumann@ultratronik.de \
--cc=buildroot@buildroot.org \
--cc=corjon.j@ecagroup.com \
--cc=ps.report@gmx.net \
--cc=ricardo.martincoski@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=yann.morin.1998@free.fr \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).