mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-13 17:39:57 +00:00
nanopb: fix installed-vs-shipped with multilib
* fixes:
ERROR: QA Issue: nanopb: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/python3.11
/usr/lib/python3.11/site-packages
/usr/lib/python3.11/site-packages/proto
/usr/lib/python3.11/site-packages/proto/nanopb_pb2.py
/usr/lib/python3.11/site-packages/proto/nanopb.proto
/usr/lib/python3.11/site-packages/proto/_utils.py
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
nanopb: 7 installed and not shipped files. [installed-vs-shipped]
when libdir is /usr/lib64 with multilib.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
committed by
Armin Kuster
parent
8bbc9ee4e1
commit
95ae1d58da
+67
@@ -0,0 +1,67 @@
|
|||||||
|
From 30c79d1b49839a15c05a0d0ca7e54787cd7988c6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
|
Date: Thu, 4 May 2023 07:17:57 +0000
|
||||||
|
Subject: [PATCH] CMakeLists.txt: allow to set PYTHON_INSTDIR from outside
|
||||||
|
|
||||||
|
CMakeLists.txt used:
|
||||||
|
|
||||||
|
find_package(Python REQUIRED COMPONENTS Interpreter)
|
||||||
|
execute_process(
|
||||||
|
COMMAND ${Python_EXECUTABLE} -c
|
||||||
|
"import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))"
|
||||||
|
OUTPUT_VARIABLE PYTHON_INSTDIR
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
)
|
||||||
|
|
||||||
|
but with python3native this returns:
|
||||||
|
|
||||||
|
nanopb/0.4.7-r0/git $ ../recipe-sysroot-native/usr/bin/python3-native/python3 -c "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))"
|
||||||
|
lib/python3.11/site-packages
|
||||||
|
|
||||||
|
which doesn't respect target libdir which might be lib64 with multilib and with python3targetconfig
|
||||||
|
it also doesn't work right because of the long relative path:
|
||||||
|
|
||||||
|
nanopb/0.4.7-r0/build $ ../recipe-sysroot-native/usr/bin/python3-native/python3 -c "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))"
|
||||||
|
../../../../../../../../../../../../usr/lib64/python3.11/site-packages
|
||||||
|
|
||||||
|
CMake Error at cmake_install.cmake:46 (file):
|
||||||
|
file cannot create directory:
|
||||||
|
/OE/lge/build/starfish/nanbield/BUILD/work/o22-starfish-linux/nanopb/0.4.7-r0/image/usr/../../../../../../../../../../../../usr/lib64/python3.11/site-packages/proto.
|
||||||
|
Maybe need administrative privileges.
|
||||||
|
|
||||||
|
Let CMake variable to be passed from the recipe to avoid this as we're already using
|
||||||
|
${D}${PYTHON_SITEPACKAGES_DIR} in do_install:append anyway.
|
||||||
|
|
||||||
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
|
Upstream-Status: Pending
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 16 +++++++++-------
|
||||||
|
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 8d241c5..7d3f993 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -39,13 +39,15 @@ if(NOT DEFINED CMAKE_INSTALL_CMAKEDIR)
|
||||||
|
set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/nanopb")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
-find_package(Python REQUIRED COMPONENTS Interpreter)
|
||||||
|
-execute_process(
|
||||||
|
- COMMAND ${Python_EXECUTABLE} -c
|
||||||
|
- "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))"
|
||||||
|
- OUTPUT_VARIABLE PYTHON_INSTDIR
|
||||||
|
- OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
-)
|
||||||
|
+if(NOT DEFINED PYTHON_INSTDIR)
|
||||||
|
+ find_package(Python REQUIRED COMPONENTS Interpreter)
|
||||||
|
+ execute_process(
|
||||||
|
+ COMMAND ${Python_EXECUTABLE} -c
|
||||||
|
+ "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))"
|
||||||
|
+ OUTPUT_VARIABLE PYTHON_INSTDIR
|
||||||
|
+ OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
+ )
|
||||||
|
+endif()
|
||||||
|
|
||||||
|
if(nanopb_BUILD_GENERATOR)
|
||||||
|
set(generator_protos nanopb)
|
||||||
@@ -4,13 +4,17 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f"
|
|||||||
|
|
||||||
DEPENDS = "protobuf-native"
|
DEPENDS = "protobuf-native"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/nanopb/nanopb.git;branch=master;protocol=https"
|
SRC_URI = "git://github.com/nanopb/nanopb.git;branch=master;protocol=https \
|
||||||
|
file://0001-CMakeLists.txt-allow-to-set-PYTHON_INSTDIR-from-outs.patch \
|
||||||
|
"
|
||||||
SRCREV = "b97aa657a706d3ba4a9a6ccca7043c9d6fe41cba"
|
SRCREV = "b97aa657a706d3ba4a9a6ccca7043c9d6fe41cba"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit cmake python3native
|
inherit cmake python3native
|
||||||
|
|
||||||
|
EXTRA_OECMAKE += "-DPYTHON_INSTDIR=${PYTHON_SITEPACKAGES_DIR}"
|
||||||
|
|
||||||
do_install:append() {
|
do_install:append() {
|
||||||
install -Dm 0755 ${S}/generator/nanopb_generator.py ${D}${bindir}/nanopb_generator.py
|
install -Dm 0755 ${S}/generator/nanopb_generator.py ${D}${bindir}/nanopb_generator.py
|
||||||
install -Dm 0755 ${S}/generator/protoc-gen-nanopb ${D}${bindir}/protoc-gen-nanopb
|
install -Dm 0755 ${S}/generator/protoc-gen-nanopb ${D}${bindir}/protoc-gen-nanopb
|
||||||
|
|||||||
Reference in New Issue
Block a user