From 34afce294aece8c2d411181b9fb372afb5da7375 Mon Sep 17 00:00:00 2001 From: zhengruoqin Date: Thu, 17 Jun 2021 18:29:15 +0800 Subject: [PATCH] libcomps: upgrade 0.1.16 -> 0.1.17 refresh 0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch Signed-off-by: Zheng Ruoqin Signed-off-by: Richard Purdie --- ...-not-set-PYTHON_INSTALL_DIR-by-running-python.patch | 10 +++++----- .../{libcomps_0.1.16.bb => libcomps_0.1.17.bb} | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) rename meta/recipes-devtools/libcomps/{libcomps_0.1.16.bb => libcomps_0.1.17.bb} (94%) diff --git a/meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch index 3e9102605b..6cd052889a 100644 --- a/meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ b/meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch @@ -10,18 +10,18 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt -index b9b96ab..6d44567 100644 +index f813af4..9eebb6c 100644 --- a/libcomps/src/python/src/CMakeLists.txt +++ b/libcomps/src/python/src/CMakeLists.txt -@@ -115,7 +115,7 @@ IF (SKBUILD) +@@ -85,7 +85,7 @@ IF (SKBUILD) INSTALL(FILES libcomps/__init__.py DESTINATION libcomps/src/python/src/libcomps) INSTALL(TARGETS pycomps LIBRARY DESTINATION libcomps/src/python/src/libcomps) ELSE () -- EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) -+ #EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) +- EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++ #EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/libcomps) #INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION -- -2.26.2 +2.25.1 diff --git a/meta/recipes-devtools/libcomps/libcomps_0.1.16.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.17.bb similarity index 94% rename from meta/recipes-devtools/libcomps/libcomps_0.1.16.bb rename to meta/recipes-devtools/libcomps/libcomps_0.1.17.bb index 851ec5b817..502bc4688b 100644 --- a/meta/recipes-devtools/libcomps/libcomps_0.1.16.bb +++ b/meta/recipes-devtools/libcomps/libcomps_0.1.17.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git \ file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "f3289ed1d812648558ab48ade4fae850b375fa65" +SRCREV = "dfaffdce1969042bda4a184865861573bb07a5a3" S = "${WORKDIR}/git" -- 2.40.1