From d5a71b7589fd483065e98d47d3ee79b7f569cbe0 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 3 Dec 2024 15:31:24 -0500 Subject: [PATCH] common/environment/setup-subpkg/subpkg: add vars for python dep verif --- Manual.md | 7 +++++++ common/environment/setup-subpkg/subpkg.sh | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/Manual.md b/Manual.md index c39509f5c7f..9d1fabe07d8 100644 --- a/Manual.md +++ b/Manual.md @@ -1639,6 +1639,13 @@ written in Python) or just single Python file ones that live in `/usr/bin`. If `python_version` is set to `ignore`, python-containing shebangs will not be rewritten. Use this only if a package should not be using a system version of python. +- `python_extras`: Python module extras to consider when verifying Python module dependencies. +Can be used to ensure additional dependency sets are checked. Example: `python_extras="all"`. + +- `nopyprovides`: if set, don't create `provides` entries for Python modules in the package. + +- `nopyverifydeps`: if set, don't verify Python module dependencies. + Also, a set of useful variables are defined to use in the templates: | Variable | Value | diff --git a/common/environment/setup-subpkg/subpkg.sh b/common/environment/setup-subpkg/subpkg.sh index 6edab5d882e..379ade740fa 100644 --- a/common/environment/setup-subpkg/subpkg.sh +++ b/common/environment/setup-subpkg/subpkg.sh @@ -11,6 +11,9 @@ unset -v nostrip nostrip_files # hooks/post-install/14-fix-permissions unset -v nocheckperms nofixperms +# hooks/pre-pkg/04-generate-provides +unset -v nopyprovides + # hooks/pre-pkg/04-generate-runtime-deps unset -v noverifyrdeps skiprdeps allow_unknown_shlibs shlib_requires @@ -20,6 +23,9 @@ unset -v lib32depends lib32disabled lib32files lib32mode lib32symlinks # hooks/pre-pkg/06-shlib-provides unset -v noshlibprovides shlib_provides +# hooks/pre-pkg/06-verify-python-deps +unset -v noverifypydeps python_extras + # xbps-triggers: system-accounts unset -v system_accounts system_groups