added my Recipes
This commit is contained in:
@@ -0,0 +1,22 @@
|
||||
From a701ed30ac1bc2f77d063c237d6ae040a2d53f6b Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Mon, 16 May 2016 16:52:24 +0300
|
||||
Subject: [PATCH] Add 'm' suffix to the python library name.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
swig/python/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/swig/python/CMakeLists.txt
|
||||
+++ b/swig/python/CMakeLists.txt
|
||||
@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GE
|
||||
SET( NAME pyCmpiProvider )
|
||||
ADD_LIBRARY( ${NAME} SHARED ${SWIG_OUTPUT})
|
||||
#TARGET_LINK_LIBRARIES( ${NAME} ${PYTHON_LIBRARIES} )
|
||||
-TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION} )
|
||||
+TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}${PYTHON_ABI} )
|
||||
TARGET_LINK_LIBRARIES( ${NAME} pthread )
|
||||
TARGET_LINK_LIBRARIES( ${NAME} dl )
|
||||
TARGET_LINK_LIBRARIES( ${NAME} util )
|
||||
@@ -0,0 +1,26 @@
|
||||
From b8e791ce93a467081fb1594b91841e2f57c634a0 Mon Sep 17 00:00:00 2001
|
||||
From: Qian Lei <qianl.fnst@cn.fujitsu.com>
|
||||
Date: Fri, 16 Jan 2015 18:37:26 +0800
|
||||
Subject: [PATCH] Fix error
|
||||
|
||||
Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
|
||||
---
|
||||
swig/python/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
|
||||
index 3976296..8073fc8 100644
|
||||
--- a/swig/python/CMakeLists.txt
|
||||
+++ b/swig/python/CMakeLists.txt
|
||||
@@ -27,7 +27,7 @@ SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/../cmpi.i" )
|
||||
ADD_CUSTOM_COMMAND (
|
||||
OUTPUT ${SWIG_OUTPUT}
|
||||
COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Python ..."
|
||||
- COMMAND ${SWIG_EXECUTABLE} -python -Wall -threads -features autodoc -o ${SWIG_OUTPUT} -outdir ${CMAKE_CURRENT_BINARY_DIR} -I/usr/include ${SWIG_INPUT}
|
||||
+ COMMAND ${SWIG_EXECUTABLE} -python -Wall -threads -features autodoc -o ${SWIG_OUTPUT} -outdir ${CMAKE_CURRENT_BINARY_DIR} -I$ENV{STAGING_INCDIR} ${SWIG_INPUT}
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "Done."
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From 070822507befe7c1b8bb1be2d36cb12141d03b8f Mon Sep 17 00:00:00 2001
|
||||
From: Qian Lei <qianl.fnst@cn.fujitsu.com>
|
||||
Date: Tue, 6 Jan 2015 18:38:32 +0800
|
||||
Subject: [PATCH] Change the install path in cmakelist
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
|
||||
---
|
||||
swig/python/CMakeLists.txt | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
|
||||
index 3976296..93c87c1 100644
|
||||
--- a/swig/python/CMakeLists.txt
|
||||
+++ b/swig/python/CMakeLists.txt
|
||||
@@ -56,18 +56,18 @@ TARGET_LINK_LIBRARIES( ${NAME} util )
|
||||
|
||||
INSTALL(TARGETS ${NAME} LIBRARY DESTINATION ${CMPI_LIBRARY_DIR})
|
||||
# .py: swig generated
|
||||
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmpi.py DESTINATION ${PYTHON_SITE_DIR} )
|
||||
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmpi.py DESTINATION $ENV{ENV_INSTALL_PATH} )
|
||||
|
||||
|
||||
#
|
||||
# cmpi_pywbem_bindings.py: provider implementation
|
||||
#
|
||||
-INSTALL(FILES cmpi_pywbem_bindings.py DESTINATION ${PYTHON_SITE_DIR} )
|
||||
+INSTALL(FILES cmpi_pywbem_bindings.py DESTINATION $ENV{ENV_INSTALL_PATH} )
|
||||
#INSTALL(FILES Py_UnixProcessProvider.py DESTINATION /usr/lib/pycim )
|
||||
|
||||
-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}${PYTHON_SITE_DIR}/cmpi.py', dfile='${PYTHON_SITE_DIR}/cmpi.py')\")")
|
||||
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}$ENV{ENV_INSTALL_PATH}/cmpi.py', dfile='\$ENV{ENV_INSTALL_PATH}/cmpi.py')\")")
|
||||
|
||||
-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}${PYTHON_SITE_DIR}/cmpi_pywbem_bindings.py', dfile='${PYTHON_SITE_DIR}/cmpi_pywbem_bindings.py')\")")
|
||||
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}$ENV{ENV_INSTALL_PATH}/cmpi_pywbem_bindings.py', dfile='$ENV{ENV_INSTALL_PATH}/cmpi_pywbem_bindings.py')\")")
|
||||
|
||||
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 323ced03a66e6cd963d8277b66cfcc7dce740be7 Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
Date: Fri, 17 Jul 2015 01:33:43 -0700
|
||||
Subject: [PATCH] fix Xthe build error when python>3.0
|
||||
|
||||
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
---
|
||||
src/target_python.c | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/target_python.c b/src/target_python.c
|
||||
index 90b43a1..2b76c9e 100644
|
||||
--- a/src/target_python.c
|
||||
+++ b/src/target_python.c
|
||||
@@ -167,7 +167,12 @@ PyGlobalInitialize(const CMPIBroker* broker, CMPIStatus* st)
|
||||
|
||||
Py_SetProgramName("cmpi_swig");
|
||||
Py_Initialize();
|
||||
- SWIGEXPORT void SWIG_init(void);
|
||||
+#if PY_VERSION_HEX >= 0x03000000
|
||||
+SWIGEXPORT PyObject*
|
||||
+#else
|
||||
+ SWIGEXPORT void
|
||||
+#endif
|
||||
+ SWIG_init(void);
|
||||
SWIG_init();
|
||||
cmpiMainPyThreadState = PyGILState_GetThisThreadState();
|
||||
PyEval_ReleaseThread(cmpiMainPyThreadState);
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
From 7dd01e33f9dac75f177113de9a8ff458d4263a11 Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
Date: Mon, 24 Aug 2015 11:00:13 +0900
|
||||
Subject: [PATCH] cmpi-bindings-0.4.17 no ruby perl
|
||||
|
||||
Port from Fedora20
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
|
||||
---
|
||||
swig/CMakeLists.txt | 22 +++++++++++-----------
|
||||
1 file changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
|
||||
index 8b5555c..c2655b9 100644
|
||||
--- a/swig/CMakeLists.txt
|
||||
+++ b/swig/CMakeLists.txt
|
||||
@@ -15,15 +15,15 @@ IF (PYTHON_LIBRARY)
|
||||
ENDIF (PYTHON_LINK_LIBS)
|
||||
ENDIF (PYTHON_LIBRARY)
|
||||
|
||||
-FIND_PACKAGE(Perl)
|
||||
-IF (PERL_EXECUTABLE)
|
||||
- MESSAGE(STATUS "Building Perl...")
|
||||
- ADD_SUBDIRECTORY(perl)
|
||||
-ENDIF (PERL_EXECUTABLE)
|
||||
+#FIND_PACKAGE(Perl)
|
||||
+#IF (PERL_EXECUTABLE)
|
||||
+# MESSAGE(STATUS "Building Perl...")
|
||||
+# ADD_SUBDIRECTORY(perl)
|
||||
+#ENDIF (PERL_EXECUTABLE)
|
||||
|
||||
-FIND_PACKAGE(Ruby)
|
||||
-IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
|
||||
- MESSAGE(STATUS "Building Ruby...")
|
||||
- ADD_SUBDIRECTORY(ruby)
|
||||
- OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES )
|
||||
-ENDIF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
|
||||
+#FIND_PACKAGE(Ruby)
|
||||
+#IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
|
||||
+# MESSAGE(STATUS "Building Ruby...")
|
||||
+# ADD_SUBDIRECTORY(ruby)
|
||||
+# OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES )
|
||||
+#ENDIF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
Port from Fedora20
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
|
||||
|
||||
diff -up cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py.orig cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py
|
||||
--- cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py.orig 2012-03-01 17:05:31.878367281 +0100
|
||||
+++ cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py 2012-03-01 17:06:34.718110137 +0100
|
||||
@@ -350,10 +350,10 @@ class BrokerCIMOMHandle(object):
|
||||
allow_null_ns = False
|
||||
else:
|
||||
allow_null_ns = True
|
||||
- if self.broker.name() == 'RequestHandler':
|
||||
+# if self.broker.name() == 'RequestHandler':
|
||||
# Check sblim bug #2185410.
|
||||
- if instance.path is not None:
|
||||
- instance.path.namespace = None
|
||||
+# if instance.path is not None:
|
||||
+# instance.path.namespace = None
|
||||
inst = self.proxy.pywbem2cmpi_inst(instance, allow_null_ns)
|
||||
rv = self.broker.deliverIndication(self.ctx, ns, inst)
|
||||
return rv
|
||||
@@ -0,0 +1,17 @@
|
||||
Port from Fedora20
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
|
||||
|
||||
diff -up cmpi-bindings-0.9.5/swig/python/CMakeLists.txt.old cmpi-bindings-0.9.5/swig/python/CMakeLists.txt
|
||||
--- cmpi-bindings-0.9.5/swig/python/CMakeLists.txt.old 2013-08-06 15:57:03.576285764 +0200
|
||||
+++ cmpi-bindings-0.9.5/swig/python/CMakeLists.txt 2013-08-06 15:57:14.891345941 +0200
|
||||
@@ -9,7 +9,7 @@ SET (BUILD_SHARED_LIBS ON)
|
||||
|
||||
FIND_PACKAGE(PythonInterp REQUIRED)
|
||||
|
||||
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_LIB_DIR)
|
||||
+EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR)
|
||||
|
||||
IF (NOT PYTHON_SITE_DIR)
|
||||
SET (PYTHON_SITE_DIR ${PYTHON_LIB_DIR})
|
||||
@@ -0,0 +1,42 @@
|
||||
SUMMARY = "Adapter to write and run CMPI-type CIM providers"
|
||||
DESCRIPTION = "CMPI-compliant provider interface for various languages via SWIG"
|
||||
HOMEPAGE = "http://github.com/kkaempf/cmpi-bindings"
|
||||
LICENSE = "BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064"
|
||||
SECTION = "Development/Libraries"
|
||||
DEPENDS = "swig-native python3 sblim-cmpi-devel"
|
||||
|
||||
SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=master \
|
||||
file://cmpi-bindings-0.4.17-no-ruby-perl.patch \
|
||||
file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \
|
||||
file://cmpi-bindings-0.9.5-python-lib-dir.patch \
|
||||
file://0001-Modify-cmakelist.patch \
|
||||
file://0001-Fix-error.patch \
|
||||
file://0001-fix-the-build-error-when-python-3.0.patch \
|
||||
file://0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch \
|
||||
"
|
||||
|
||||
SRCREV = "62f60e065aa1b901f826e4f530c0573ae32d065e"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit cmake python3native
|
||||
|
||||
EXTRA_OECMAKE = "-DLIB='${baselib}' \
|
||||
-DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \
|
||||
-DPYTHON_ABI=${PYTHON_ABI} \
|
||||
"
|
||||
|
||||
# With Ninja it fails with:
|
||||
# ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$)
|
||||
OECMAKE_GENERATOR = "Unix Makefiles"
|
||||
|
||||
do_configure:prepend() {
|
||||
export STAGING_LIBDIR=${STAGING_LIBDIR}
|
||||
export STAGING_INCDIR=${STAGING_INCDIR}
|
||||
export ENV_INSTALL_PATH=${PYTHON_SITEPACKAGES_DIR}
|
||||
}
|
||||
|
||||
FILES:${PN} =+"${libdir}/cmpi/libpyCmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*"
|
||||
FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
Reference in New Issue
Block a user