Full list of changes in this release is available at [0]. [0]: https://github.com/rpm-software-management/createrepo_c/releases/tag/1.2.4
Signed-off-by: Moritz Haase <[email protected]> --- ...PYTHON_INSTALL_DIR-by-running-python.patch | 22 ++++++++++--------- ...erepo-c_1.2.3.bb => createrepo-c_1.2.4.bb} | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) rename meta/recipes-devtools/createrepo-c/{createrepo-c_1.2.3.bb => createrepo-c_1.2.4.bb} (96%) diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch index ca3f0782a8a80a3769c878a88c2fc8269cb2c56b..e2f90644c277174adb88a07e4640801eb31943e7 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch @@ -1,25 +1,27 @@ -From 20aec3f83a7ab6ebb89f40ee8c5df1af65eba32b Mon Sep 17 00:00:00 2001 +From 71df5a5471081cf2338f9f046cdc51d064534297 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 30 Dec 2016 18:31:02 +0200 Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python Upstream-Status: Inappropriate [oe-core specific] + Signed-off-by: Alexander Kanavin <[email protected]> Signed-off-by: Wang Mingyu <[email protected]> +Signed-off-by: Moritz Haase <[email protected]> --- src/python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index a31b14d..01fd8ca 100644 +index 05ac89f9f491f93367283974ea38b5e314f0c5b6..44e38b386abc1c8eb135721d89509c649fdc6297 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt -@@ -14,7 +14,7 @@ if (NOT SKBUILD) - FIND_PACKAGE(PythonLibs 3 REQUIRED) - endif (NOT SKBUILD) - --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) - INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) +@@ -48,7 +48,7 @@ IF (SKBUILD) + find_package(Python REQUIRED COMPONENTS Interpreter Development.Module) + Python_add_library(_createrepo_c MODULE WITH_SOABI ${createrepo_cmodule_SRCS}) + ELSE () +- 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) + INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) + MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") - MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_1.2.3.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_1.2.4.bb similarity index 96% rename from meta/recipes-devtools/createrepo-c/createrepo-c_1.2.3.bb rename to meta/recipes-devtools/createrepo-c/createrepo-c_1.2.4.bb index a5c1a9dd440d5f8a7b85a6456f8ed88e427b89af..f6da852f0dc4e969899228a2746830f8d4b6909b 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_1.2.3.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_1.2.4.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;p file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "5ecca5e6c85cca1399378af5756344eb1c7448a1" +SRCREV = "47ab8a418fb3abd58ef3760a7eace1481610c659" DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm" DEPENDS:append:class-native = " file-replacement-native"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#238426): https://lists.openembedded.org/g/openembedded-core/message/238426 Mute This Topic: https://lists.openembedded.org/mt/119753277/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
