createrepo-c: upgrade 0.17.0 -> 0.17.1
PATCH v2 1/1 createrepo-c: upgrade 0.17.0 -> 0.17.1
0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch updated since it is not available in 0.17.1
Signed-off-by Wang Mingyu <[email protected]>
---
...1-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch | 7 +++++--
.../{createrepo-c_0.17.0.bb => createrepo-c_0.17.1.bb} | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.17.0.bb => createrepo-c_0.17.1.bb} (96%)meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +5 -2
@@ -11,11 +11,11 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 855127f..dff1d97 100644 +index ecc262d..a86514c 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -14,7 +14,7 @@ if (NOT SKBUILD) - FIND_PACKAGE(PythonInterp 3 EXACT REQUIRED) + FIND_PACKAGE(PythonLibs 3 REQUIRED) endif (NOT SKBUILD) -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)
@@ -23,3 +23,6 @@ index 855127f..dff1d97 100644 INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") +-- +2.25.1 +
meta/recipes-devtools/createrepo-c/createrepo-c_0.17.1.bb renamed from meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb +1 -1
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "909a0636665ed96f97babc3b887f9badc88875c3" +SRCREV = "956a318b427e2489ccac754d199a09d32690ddc3" S = "${WORKDIR}/git"
Signature · 1 line
2.25.1
PATCH 1/1 libmc: use update-alternatives for sha1.h
czmq also uses the doc 'sha1.h'.
czmq has a priority of 60.
Signed-off-by Wang Mingyu <[email protected]>
--- meta/recipes-support/libmd/libmd_1.0.3.bb | 6 ++++++ 1 file changed, 6 insertions(+)
meta/recipes-support/libmd/libmd_1.0.3.bb +6 -0
@@ -14,3 +14,9 @@ SRC_URI[sha256sum] = "5a02097f95cc250a3f1001865e4dbba5f1d15554120f95693c0541923c inherit autotools BBCLASSEXTEND = "native nativesdk" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN}-doc = "sha1.h" +ALTERNATIVE_LINK_NAME[sha1.h] = "${includedir}/sha1.h"
Signature · 1 line
2.25.1
Re: [OE-core] [PATCH] libmc: use update-alternatives for sha1.h
Quoted 5 lines · Wang Mingyu
czmq also uses the doc '
sha1.h'.czmq has a priority of 60.
I replied to associated patch you sent to oe-devel. We should do it differently.
Quoted 25 lines
Signed-off-by Wang Mingyu <[email protected]>--- meta/recipes-support/libmd/libmd_1.0.3.bb | 6 ++++++ 1 file changed, 6 insertions(+)meta/recipes-support/libmd/libmd_1.0.3.bb +6
-1@@ -14,3 +14,9 @@ SRC_URI[sha256sum] = "5a02097f95cc250a3f1001865e4dbba5f1d15554120f95693c0541923c inherit autotools BBCLASSEXTEND = "native nativesdk" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN}-doc = "sha1.h" +ALTERNATIVE_LINK_NAME[sha1.h] = "${includedir}/sha1.h" --2.25.1