Mirror of git.openembedded.org/meta-openembedded https://git.enea.com/cgit/linux/meta-openembedded.git/atom?h=wrynose 2026-04-02T16:05:46+00:00 2026-04-02T16:05:46+00:00 Jiaying Song jiaying.song.cn@windriver.com 2026-04-02T07:54:34+00:00 urn:sha1:2a4bed73a9c7a8ff060fe7ff26153ea9c74cce6c Fixes issues introduced in commit 16a72067f5 ("python3-ninja: upgrade 1.11.1.1 -> 1.13.0"). Upstream's __init__.py uses a relative import: from .ninja_syntax import Writer, escape, expand This requires ninja_syntax.py to be present inside the ninja package directory. Upstream relies on CMake (via scikit-build-core) to copy ninja_syntax.py from ninja-upstream/misc/ into the package during build [1]. Since the OE recipe replaces scikit-build-core with setuptools (no-scikit-build.patch), CMake is not invoked and this copy does not happen, causing ImportError at runtime. Similarly, upstream uses scikit-build-core's generate feature to create _version.py from the SCM version. With setuptools, this does not happen automatically, so generate it in do_configure. [1] https://github.com/scikit-build/ninja-python-distributions/commit/f3b4a786be Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> 2026-03-18T21:33:27+00:00 Jiaying Song jiaying.song.cn@windriver.com 2026-03-16T09:34:42+00:00 urn:sha1:16a72067f53cd667e674e77913586b3693c51ef2 Changelog: https://github.com/scikit-build/ninja-python-distributions/releases Upstream commit [1] switched build system from scikit-build to scikit-build-core, which changed pyproject.toml structure and rewrote __init__.py. Update patches accordingly: - no-scikit-build.patch: rewrite for new pyproject.toml structure, replace scikit-build-core with setuptools, and remove 'readme' from dynamic fields as setuptools cannot handle the fancy-pypi-readme plugin. - run-ninja-from-path.patch: drop. Old version imported skbuild modules in __init__.py which caused ImportError in OE since scikit-build is not installed. New version replaced these imports with stdlib sysconfig, so the patch is no longer needed. - CMakeLists.txt: drop. This was a stub file added to prevent scikit-build from failing when it could not find CMakeLists.txt. Since we now use setuptools which does not require it, the file can be removed. [1] https://github.com/scikit-build/ninja-python-distributions/commit/f3b4a786be Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>