* [meta-oe][PATCH v5 0/6] add openlmi and it's depends
@ 2015-08-14 4:43 Lei Maohui
2015-08-14 4:43 ` [meta-oe][PATCH v5 1/6] cmpi-bindings: add new recipe Lei Maohui
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: Lei Maohui @ 2015-08-14 4:43 UTC (permalink / raw)
To: openembedded-devel
OpenLMI = Open Linux Management Infrastructure.
OpenLMI is open-source project aiming to improve management of Linux systems using WBEM standards.
Lei Maohui (6):
cmpi-bindings: add new recipe
konkretcmpi: add new recipe for openlmi
sblim-sfcCommon: add new recipe
sblim-sfcb: add new recipe for openlmi
cim-schema-exper: add new recipe for openlmi
openlmi: add openlmi
.../cim-schema/cim-schema-exper_2.39.0.bb | 26 ++
...schema_2.40.0.bb => cim-schema-final_2.40.0.bb} | 0
.../cim-schema/cim-schema/files/LICENSE | 34 +++
.../cmpi-bindings/0001-Fix-error.patch | 26 ++
.../cmpi-bindings/0001-Modify-cmakelist.patch | 41 ++++
.../0001-fix-build-error-when-the-swig-3.0.6.patch | 268 +++++++++++++++++++++
.../0001-fix-the-build-error-when-python-3.0.patch | 31 +++
.../cmpi-bindings-0.4.17-no-ruby-perl.patch | 44 ++++
.../cmpi-bindings-0.4.17-sblim-sigsegv.patch | 22 ++
.../cmpi-bindings-0.9.5-python-lib-dir.patch | 17 ++
.../cmpi-bindings/cmpi-bindings_git.bb | 38 +++
.../konkretcmpi/konkretcmpi-native_0.9.2.bb | 28 +++
...txt-fix-lib64-can-not-be-shiped-in-64bit-.patch | 31 +++
...x-lib64-can-not-be-shiped-in-64bit-target.patch | 36 +++
...-0.9.2-fix-returning-instance-from-method.patch | 38 +++
.../konkretcmpi/konkretcmpi_0.9.2.bb | 34 +++
...x-lib64-can-not-be-shiped-in-64bit-target.patch | 31 +++
.../openlmi/openlmi-networking_0.3.1.bb | 30 +++
.../openlmi/openlmi-providers/0001-fix-error.patch | 26 ++
...x-lib64-can-not-be-shiped-in-64bit-target.patch | 31 +++
.../openlmi/openlmi-providers_0.6.0.bb | 54 +++++
.../openlmi/openlmi-storage_0.8.1.bb | 32 +++
.../openlmi/openlmi-tools_0.10.5.bb | 23 ++
.../sblim-sfcCommon/sblim-sfcCommon_1.0.1.bb | 25 ++
.../recipes-extended/sblim-sfcb/files/sfcb.service | 11 +
.../sblim-sfcb-1.3.15-fix-provider-debugging.patch | 12 +
.../sblim-sfcb-1.3.16-maxMsgLen.patch | 14 ++
.../sblim-sfcb-1.3.16-multilib-man-cfg.patch | 41 ++++
...blim-sfcb-1.3.9-sfcbrepos-schema-location.patch | 42 ++++
.../sblim-sfcb-1.4.5-service.patch | 27 +++
.../sblim-sfcb-1.4.8-default-ecdh-curve-name.patch | 26 ++
.../sblim-sfcb-1.4.9-fix-ftbfs.patch | 12 +
.../sblim-sfcb/sblim-sfcb_1.4.8.bb | 83 +++++++
33 files changed, 1234 insertions(+)
create mode 100644 meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb
rename meta-networking/recipes-support/cim-schema/{cim-schema_2.40.0.bb => cim-schema-final_2.40.0.bb} (100%)
create mode 100644 meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-build-error-when-the-swig-3.0.6.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb
create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb
create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch
create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch
create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch
create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-networking/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-error.patch
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-storage_0.8.1.bb
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
create mode 100644 meta-oe/recipes-extended/sblim-sfcCommon/sblim-sfcCommon_1.0.1.bb
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.15-fix-provider-debugging.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.16-maxMsgLen.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.16-multilib-man-cfg.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.5-service.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.9-fix-ftbfs.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.8.bb
--
1.8.4.2
^ permalink raw reply [flat|nested] 8+ messages in thread
* [meta-oe][PATCH v5 1/6] cmpi-bindings: add new recipe
2015-08-14 4:43 [meta-oe][PATCH v5 0/6] add openlmi and it's depends Lei Maohui
@ 2015-08-14 4:43 ` Lei Maohui
2015-08-14 4:43 ` [meta-oe][PATCH v5 2/6] konkretcmpi: add new recipe for openlmi Lei Maohui
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Lei Maohui @ 2015-08-14 4:43 UTC (permalink / raw)
To: openembedded-devel
Cmpi-bindings is the dependence of openlmi.
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
---
.../cmpi-bindings/0001-Fix-error.patch | 26 ++
.../cmpi-bindings/0001-Modify-cmakelist.patch | 41 ++++
.../0001-fix-build-error-when-the-swig-3.0.6.patch | 268 +++++++++++++++++++++
.../0001-fix-the-build-error-when-python-3.0.patch | 31 +++
.../cmpi-bindings-0.4.17-no-ruby-perl.patch | 44 ++++
.../cmpi-bindings-0.4.17-sblim-sigsegv.patch | 22 ++
.../cmpi-bindings-0.9.5-python-lib-dir.patch | 17 ++
.../cmpi-bindings/cmpi-bindings_git.bb | 38 +++
8 files changed, 487 insertions(+)
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-build-error-when-the-swig-3.0.6.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch
create mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch
new file mode 100644
index 0000000..d1a303c
--- /dev/null
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch
@@ -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
+
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch
new file mode 100644
index 0000000..92e5e56
--- /dev/null
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch
@@ -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
+
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-build-error-when-the-swig-3.0.6.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-build-error-when-the-swig-3.0.6.patch
new file mode 100644
index 0000000..18d27a1
--- /dev/null
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-build-error-when-the-swig-3.0.6.patch
@@ -0,0 +1,268 @@
+From 7479e3e13871a20d87f45ba4373a3a919071557a Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui@cn.fujitsu.com>
+Date: Sun, 26 Jul 2015 21:39:50 +0900
+Subject: [PATCH] fix build error when the swig = 3.0.6
+
+Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
+---
+ swig/cmpi.i | 6 +++---
+ swig/cmpi_callbacks.i | 6 +++---
+ swig/cmpi_defs.i | 10 +++++-----
+ swig/cmpi_types.i | 44 ++++++++++++++++++++++----------------------
+ 4 files changed, 33 insertions(+), 33 deletions(-)
+
+diff --git a/swig/cmpi.i b/swig/cmpi.i
+index d8f9ac4..59d285b 100644
+--- a/swig/cmpi.i
++++ b/swig/cmpi.i
+@@ -980,11 +980,11 @@ release_select_filter_exp(select_filter_exp *sfe)
+ %apply SWIGTYPE *DISOWN { CMPIInstance *instance_disown };
+ %apply SWIGTYPE *DISOWN { CMPIObjectPath *path_disown };
+
+-# Definitions
++%# Definitions
+ %include "cmpi_defs.i"
+
+-# Data types
++%# Data types
+ %include "cmpi_types.i"
+
+-# Broker callbacks
++%# Broker callbacks
+ %include "cmpi_callbacks.i"
+diff --git a/swig/cmpi_callbacks.i b/swig/cmpi_callbacks.i
+index 4e93a9e..4bba76d 100644
+--- a/swig/cmpi_callbacks.i
++++ b/swig/cmpi_callbacks.i
+@@ -1,6 +1,6 @@
+-# cmpi_callbacks.i
++%# cmpi_callbacks.i
+ #
+-# swig bindings for CMPI broker callbacks
++%# swig bindings for CMPI broker callbacks
+ #
+
+ %nodefault _CMPIBroker;
+@@ -445,7 +445,7 @@ typedef struct _CMPIBroker {} CMPIBroker;
+
+ #-----------------------------------------------------
+ #
+-# TODO: CMPIMsgFileHandle stuff
++%# TODO: CMPIMsgFileHandle stuff
+ #
+ /*
+ * query: The select expression.
+diff --git a/swig/cmpi_defs.i b/swig/cmpi_defs.i
+index ec3e455..7dfb608 100644
+--- a/swig/cmpi_defs.i
++++ b/swig/cmpi_defs.i
+@@ -1,6 +1,6 @@
+-# cmpi_defs.i
++%# cmpi_defs.i
+ #
+-# swig bindings for CMPI constant definitions
++%# swig bindings for CMPI constant definitions
+ #
+
+ %nodefault CMPIData;
+@@ -78,7 +78,7 @@
+
+ #if defined(SWIGPYTHON)
+ #
+-# Conversion from list of python strings to null terminated char** array.
++%# Conversion from list of python strings to null terminated char** array.
+ #
+
+ %typemap(in) char **
+@@ -129,7 +129,7 @@
+
+ #-----------------------------------------------------
+ #
+-# CMPIData
++%# CMPIData
+ #
+
+ %extend _CMPIData {
+@@ -199,7 +199,7 @@
+
+ #-----------------------------------------------------
+ #
+-# CMPIStatus
++%# CMPIStatus
+ #
+
+ %extend _CMPIStatus {
+diff --git a/swig/cmpi_types.i b/swig/cmpi_types.i
+index f69ec16..062b948 100644
+--- a/swig/cmpi_types.i
++++ b/swig/cmpi_types.i
+@@ -29,15 +29,15 @@
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+
+-# cmpift.i
++%# cmpift.i
+ #
+-# swig bindings for CMPI function tables
++%# swig bindings for CMPI function tables
+ #
+
+ #
+-# Prevent default con-/destructors for all types
+-# CMPI types are handled through function tables
+-# and the broker.
++%# Prevent default con-/destructors for all types
++%# CMPI types are handled through function tables
++%# and the broker.
+ #
+
+ %nodefault _CMPIError;
+@@ -102,7 +102,7 @@ typedef struct _CMPIDateTime {} CMPIDateTime;
+
+ #-----------------------------------------------------
+ #
+-# CMPIException
++%# CMPIException
+ #
+ #-----------------------------------------------------
+
+@@ -177,7 +177,7 @@ typedef struct _CMPIException {} CMPIException;
+
+ #-----------------------------------------------------
+ #
+-# CMPIError
++%# CMPIError
+ #
+
+ /*
+@@ -372,7 +372,7 @@ typedef struct _CMPIException {} CMPIException;
+
+ #-----------------------------------------------------
+ #
+-# CMPIResult
++%# CMPIResult
+ #
+
+ /*
+@@ -409,7 +409,7 @@ typedef struct _CMPIException {} CMPIException;
+
+ #-----------------------------------------------------
+ #
+-# CMPIObjectPath
++%# CMPIObjectPath
+ #
+
+ /*
+@@ -860,7 +860,7 @@ FIXME: if clone() is exposed, release() must also
+
+ #-----------------------------------------------------
+ #
+-# CMPIInstance
++%# CMPIInstance
+ #
+
+ /*
+@@ -1166,7 +1166,7 @@ FIXME: if clone() is exposed, release() must also
+
+ #-----------------------------------------------------
+ #
+-# CMPIArgs
++%# CMPIArgs
+
+ /*
+ * CMPI Arguments
+@@ -1282,7 +1282,7 @@ FIXME: if clone() is exposed, release() must also
+
+ #-----------------------------------------------------
+ #
+-# CMPISelectExp
++%# CMPISelectExp
+
+ /*
+ * This structure encompasses queries
+@@ -1343,7 +1343,7 @@ FIXME: if clone() is exposed, release() must also
+
+ #-----------------------------------------------------
+ #
+-# CMPISelectCond
++%# CMPISelectCond
+
+ /*
+ * Select conditions
+@@ -1372,7 +1372,7 @@ FIXME: if clone() is exposed, release() must also
+
+ #-----------------------------------------------------
+ #
+-# CMPISubCond
++%# CMPISubCond
+
+ /*
+ * Sub Conditions
+@@ -1384,7 +1384,7 @@ FIXME: if clone() is exposed, release() must also
+
+ #-----------------------------------------------------
+ #
+-# CMPIPredicate
++%# CMPIPredicate
+
+ /*
+ * Predicate
+@@ -1413,7 +1413,7 @@ FIXME: if clone() is exposed, release() must also
+
+ #-----------------------------------------------------
+ #
+-# CMPIEnumeration
++%# CMPIEnumeration
+
+ /*
+ * Enumeration provide a linked-list type access to multiple elements
+@@ -1474,7 +1474,7 @@ Python for compatibility */
+
+ #-----------------------------------------------------
+ #
+-# CMPIArray
++%# CMPIArray
+
+ /*
+ * Array of equally-typed elements
+@@ -1546,11 +1546,11 @@ Python for compatibility */
+ }
+ }
+
+-#BOOKMARK
++%#BOOKMARK
+
+ #-----------------------------------------------------
+ #
+-# CMPIString
++%# CMPIString
+
+ /*
+ * A string
+@@ -1573,7 +1573,7 @@ Python for compatibility */
+
+ #-----------------------------------------------------
+ #
+-# CMPIContext
++%# CMPIContext
+
+ /*
+ * Context of the provider invocation
+@@ -1687,7 +1687,7 @@ Python for compatibility */
+
+ #-----------------------------------------------------
+ #
+-# CMPIDateTime
++%# CMPIDateTime
+
+ /*
+ * Date and Time
+@@ -1729,4 +1729,4 @@ Python for compatibility */
+ }
+ }
+
+-# EOF
++%# EOF
+--
+1.8.4.2
+
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch
new file mode 100644
index 0000000..0d6f029
--- /dev/null
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch
@@ -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
+
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch
new file mode 100644
index 0000000..a586dbd
--- /dev/null
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch
@@ -0,0 +1,44 @@
+Port from Fedora20
+
+Upstream-Status: Pending
+Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
+
+diff -up cmpi-bindings-0.5.2/swig/CMakeLists.txt.orig cmpi-bindings-0.5.2/swig/CMakeLists.txt
+--- cmpi-bindings-0.5.2/swig/CMakeLists.txt.orig 2012-05-04 15:47:18.000000000 +0200
++++ cmpi-bindings-0.5.2/swig/CMakeLists.txt 2012-05-07 09:59:33.639648918 +0200
+@@ -4,12 +4,12 @@
+
+ enable_testing()
+
+-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)
+
+ FIND_PACKAGE(PythonLibs)
+ IF (PYTHON_LIBRARY)
+@@ -22,9 +22,9 @@ 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)
+-
+\ No newline at end of file
++#FIND_PACKAGE(Perl)
++#IF (PERL_EXECUTABLE)
++# MESSAGE(STATUS "Building Perl...")
++# ADD_SUBDIRECTORY(perl)
++#ENDIF (PERL_EXECUTABLE)
++
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch
new file mode 100644
index 0000000..b993372
--- /dev/null
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch
@@ -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
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch
new file mode 100644
index 0000000..b6a51ec
--- /dev/null
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch
@@ -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})
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb
new file mode 100644
index 0000000..4db6431
--- /dev/null
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb
@@ -0,0 +1,38 @@
+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"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064"
+SECTION = "Development/Libraries"
+DEPENDS = "swig-native python sblim-cmpi-devel"
+
+SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=http \
+ 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-fix-build-error-when-the-swig-3.0.6.patch \
+ "
+
+SRCREV = "93b6044f53bcfa79253d7af51a9c23ddd73f8486"
+S = "${WORKDIR}/git"
+
+inherit cmake pythonnative
+
+EXTRA_OECMAKE = "-DLIB='${baselib}' \
+ -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION}"
+
+do_configure_prepend() {
+ export HOST_SYS=${HOST_SYS}
+ export BUILD_SYS=${BUILD_SYS}
+ 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"
--
1.8.4.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [meta-oe][PATCH v5 2/6] konkretcmpi: add new recipe for openlmi
2015-08-14 4:43 [meta-oe][PATCH v5 0/6] add openlmi and it's depends Lei Maohui
2015-08-14 4:43 ` [meta-oe][PATCH v5 1/6] cmpi-bindings: add new recipe Lei Maohui
@ 2015-08-14 4:43 ` Lei Maohui
2015-08-20 15:02 ` Martin Jansa
2015-08-14 4:43 ` [meta-oe][PATCH v5 3/6] sblim-sfcCommon: add new recipe Lei Maohui
` (3 subsequent siblings)
5 siblings, 1 reply; 8+ messages in thread
From: Lei Maohui @ 2015-08-14 4:43 UTC (permalink / raw)
To: openembedded-devel
Konkretcmpi is dependence of openlmi.
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
---
.../konkretcmpi/konkretcmpi-native_0.9.2.bb | 28 ++++++++++++++++
...txt-fix-lib64-can-not-be-shiped-in-64bit-.patch | 31 ++++++++++++++++++
...x-lib64-can-not-be-shiped-in-64bit-target.patch | 36 ++++++++++++++++++++
...-0.9.2-fix-returning-instance-from-method.patch | 38 ++++++++++++++++++++++
.../konkretcmpi/konkretcmpi_0.9.2.bb | 34 +++++++++++++++++++
5 files changed, 167 insertions(+)
create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb
create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch
create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch
create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch
create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb
new file mode 100644
index 0000000..d04c103
--- /dev/null
+++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Tool for rapid CMPI providers development"
+DESCRIPTION = "\
+KonkretCMPI makes CMPI provider development easier by generating type-safe \
+concrete CIM interfaces from MOF definitions and by providing default \
+implementations for many of the provider operations."
+HOMEPAGE = "https://github.com/rnovacek/konkretcmpi"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873"
+DEPENDS = "cmake-native cmpi-bindings-native"
+
+SRC_URI = "https://github.com/rnovacek/${BPN}/archive/${PV}/${BP}.tar.gz \
+ file://konkretcmpi-0.9.2-fix-returning-instance-from-method.patch \
+ file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch "
+
+SRC_URI[md5sum] = "7e8ed4f47d1a9e5cbed4208920f89d64"
+SRC_URI[sha256sum] = "2ac52fc374e46d68317194bbd6b44e0b2f934df24b201efb395d3eccf0fed634"
+
+inherit native cmake
+LDFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+
+EXTRA_OECMAKE = "-DWITH_PYTHON=ON \
+ ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
+ ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
+ "
+
+do_install_append() {
+ rm -rf ${D}${datadir}
+}
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch
new file mode 100644
index 0000000..40a0643
--- /dev/null
+++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch
@@ -0,0 +1,31 @@
+From d97ac2bf2ed9c84ffd65ff10989068b202e09fdf Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui@cn.fujitsu.com>
+Date: Mon, 3 Aug 2015 00:29:54 +0900
+Subject: [PATCH] CMakeLists.txt: fix lib64 can not be shiped in 64bit target
+
+Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
+---
+ CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index be544d1..14696e4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,13 +11,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_P
+
+ find_package(CMPI)
+
+-# Set LIB_SUFFIX to 64 on 64bit architectures
+-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+- set(LIB_SUFFIX "")
+-else(CMAKE_SIZEOF_VOID_P EQUAL 4)
+- set(LIB_SUFFIX 64)
+-endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+-
+ option(WITH_PYTHON "Build experimental Python bindings" OFF)
+
+ add_subdirectory(cmake)
+--
+1.8.4.2
+
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch
new file mode 100644
index 0000000..7da13ee
--- /dev/null
+++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch
@@ -0,0 +1,36 @@
+From f3c39fd2a4b5f53338b5f821788c63858bf860cf Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui@cn.fujitsu.com>
+Date: Sun, 2 Aug 2015 22:08:43 +0900
+Subject: [PATCH] to fix lib64 can not be shiped in 64bit target
+
+To fix the warning as following:
+WARNING: QA Issue: konkretcmpi: Files/directories were installed but not shipped in any package:
+ /usr/lib64
+ /usr/lib64/libkonkret.so
+ /usr/lib64/libkonkret.so.0.0.1
+ /usr/lib64/libkonkret.so.0
+ /usr/lib64/libkonkretmof.so.0.0.1
+ /usr/lib64/libkonkretmof.so
+ ...
+
+Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
+---
+ cmake/modules/FindKonkretCMPI.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindKonkretCMPI.cmake b/cmake/modules/FindKonkretCMPI.cmake
+index b888cfd..097caed 100644
+--- a/cmake/modules/FindKonkretCMPI.cmake
++++ b/cmake/modules/FindKonkretCMPI.cmake
+@@ -9,7 +9,7 @@ find_path(KONKRETCMPI_INCLUDE_DIR
+ find_library(KONKRETCMPI_LIBRARY
+ NAMES konkret
+ HINTS $ENV{KONKRETCMPI_LIB_DIR}
+- PATH_SUFFIXES lib64 lib
++ PATH_SUFFIXES lib lib64
+ PATHS /usr /usr/local
+ )
+
+--
+1.8.4.2
+
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch
new file mode 100644
index 0000000..b54d091
--- /dev/null
+++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch
@@ -0,0 +1,38 @@
+Port from Fedora20
+
+ | commit aca6c7f910ffe9930b5789969f0adfadd668bb46
+ | Author: Michal Minar <miminar@redhat.com>
+ | Date: Fri Jun 20 10:50:45 2014 +0200
+ |
+ | Fix returning instance as an output argument from method
+ |
+ | Submitted By: Radek Novacek <rnovacek@redhat.com>
+
+Upstream-Status: Pending
+Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
+
+diff --git a/src/program/main.cpp b/src/program/main.cpp
+index 885dc12..9e7108a 100644
+--- a/src/program/main.cpp
++++ b/src/program/main.cpp
+@@ -506,7 +506,11 @@ static void gen_feature_decls(
+
+ // Add sig entry [type][length][name][zero-terminator]
+
+- KTag tag = _ktag(pd->data_type, pd->array_index, key, false, false);
++ KTag tag;
++ if (pd->qualifiers->has_key("EmbeddedInstance"))
++ tag = _ktag(TOK_INSTANCE, pd->array_index, key, false, false);
++ else
++ tag = _ktag(pd->data_type, pd->array_index, key, false, false);
+ pack_tag(sig, tag);
+ pack_name(sig, pd->name);
+ count++;
+@@ -640,6 +644,7 @@ static void gen_param(FILE* os, MOF_Parameter* p, vector<unsigned char>& sig)
+ const char* ktn = _ktype_name(p->data_type);
+
+ if (p->qualifiers->has_key("EmbeddedInstance")) {
++ tag = _ktag(TOK_INSTANCE, p->array_index, false, in, out);
+ if (p->array_index)
+ put(os, " KInstanceA $0;\n", p->name, NULL);
+ else
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
new file mode 100644
index 0000000..fc15fae
--- /dev/null
+++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
@@ -0,0 +1,34 @@
+SUMMARY = "Tool for rapid CMPI providers development"
+DESCRIPTION = "\
+KonkretCMPI makes CMPI provider development easier by generating type-safe \
+concrete CIM interfaces from MOF definitions and by providing default \
+implementations for many of the provider operations."
+HOMEPAGE = "https://github.com/rnovacek/konkretcmpi"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873"
+DEPENDS = "swig sblim-cmpi-devel python cmake-native"
+
+SRC_URI = "https://github.com/rnovacek/${BPN}/archive/${PV}/${BP}.tar.gz \
+ file://konkretcmpi-0.9.2-fix-returning-instance-from-method.patch \
+ file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch \
+ "
+
+SRC_URI[md5sum] = "7e8ed4f47d1a9e5cbed4208920f89d64"
+SRC_URI[sha256sum] = "2ac52fc374e46d68317194bbd6b44e0b2f934df24b201efb395d3eccf0fed634"
+
+inherit cmake
+
+EXTRA_OECMAKE = "-DWITH_PYTHON=ON \
+ ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
+ ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
+ "
+
+do_install_append() {
+ rm -rf ${D}${datadir}
+}
+
+PACKAGES =+ "${PN}-python ${PN}-python-dbg"
+
+FILES_${PN}-python = "${libdir}/python2.7/site-packages/konkretmof.py* ${libdir}/python2.7/site-packages/_konkretmof.so"
+FILES_${PN}-python-dbg = "${libdir}/python2.7/site-packages/.debug/*"
+
--
1.8.4.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [meta-oe][PATCH v5 3/6] sblim-sfcCommon: add new recipe
2015-08-14 4:43 [meta-oe][PATCH v5 0/6] add openlmi and it's depends Lei Maohui
2015-08-14 4:43 ` [meta-oe][PATCH v5 1/6] cmpi-bindings: add new recipe Lei Maohui
2015-08-14 4:43 ` [meta-oe][PATCH v5 2/6] konkretcmpi: add new recipe for openlmi Lei Maohui
@ 2015-08-14 4:43 ` Lei Maohui
2015-08-14 4:43 ` [meta-oe][PATCH v5 4/6] sblim-sfcb: add new recipe for openlmi Lei Maohui
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Lei Maohui @ 2015-08-14 4:43 UTC (permalink / raw)
To: openembedded-devel
Sblim-sfcCommon is dependence of sblim-sfcb.
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
---
.../sblim-sfcCommon/sblim-sfcCommon_1.0.1.bb | 25 ++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 meta-oe/recipes-extended/sblim-sfcCommon/sblim-sfcCommon_1.0.1.bb
diff --git a/meta-oe/recipes-extended/sblim-sfcCommon/sblim-sfcCommon_1.0.1.bb b/meta-oe/recipes-extended/sblim-sfcCommon/sblim-sfcCommon_1.0.1.bb
new file mode 100644
index 0000000..0f5515a
--- /dev/null
+++ b/meta-oe/recipes-extended/sblim-sfcCommon/sblim-sfcCommon_1.0.1.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Common functions for SBLIM Small Footprint CIM Broker and CIM Client Library."
+DESCRIPTION = "\
+This package provides a common library for functions shared between Small Footprint CIM Broker (sblim-sfcb) \
+Small Footprint CIM Client (and sblim-sfcc)."
+HOMEPAGE = "http://sourceforge.net/projects/sblim/"
+LICENSE = "EPL"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261"
+SECTION = "Development/Libraries"
+
+DEPENDS = "cmpi-bindings"
+
+SRC_URI = "http://downloads.sourceforge.net/sblim/${PN}-${PV}.tar.bz2 \
+ "
+SRC_URI[md5sum] = "8aa2655d97bdea54c4750f220b40990c"
+SRC_URI[sha256sum] = "b9b1037173d6ae0181c3bd5a316ddab5afd6a342ad0dbdc18e940fc0ad2c3297"
+
+inherit autotools
+
+do_install() {
+ oe_runmake DESTDIR=${D} install
+
+ rm -rf ${D}${libdir}/libsfcUtil.a
+ rm -rf ${D}${libdir}/libsfcUtil.la
+}
+
--
1.8.4.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [meta-oe][PATCH v5 4/6] sblim-sfcb: add new recipe for openlmi
2015-08-14 4:43 [meta-oe][PATCH v5 0/6] add openlmi and it's depends Lei Maohui
` (2 preceding siblings ...)
2015-08-14 4:43 ` [meta-oe][PATCH v5 3/6] sblim-sfcCommon: add new recipe Lei Maohui
@ 2015-08-14 4:43 ` Lei Maohui
2015-08-14 4:43 ` [meta-oe][PATCH v5 5/6] cim-schema-exper: " Lei Maohui
2015-08-14 4:44 ` [meta-oe][PATCH v5 6/6] openlmi: add openlmi Lei Maohui
5 siblings, 0 replies; 8+ messages in thread
From: Lei Maohui @ 2015-08-14 4:43 UTC (permalink / raw)
To: openembedded-devel
Sblim-sfcb is dependence of openlmi.
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
---
.../recipes-extended/sblim-sfcb/files/sfcb.service | 11 +++
.../sblim-sfcb-1.3.15-fix-provider-debugging.patch | 12 ++++
.../sblim-sfcb-1.3.16-maxMsgLen.patch | 14 ++++
.../sblim-sfcb-1.3.16-multilib-man-cfg.patch | 41 +++++++++++
...blim-sfcb-1.3.9-sfcbrepos-schema-location.patch | 42 +++++++++++
.../sblim-sfcb-1.4.5-service.patch | 27 +++++++
.../sblim-sfcb-1.4.8-default-ecdh-curve-name.patch | 26 +++++++
.../sblim-sfcb-1.4.9-fix-ftbfs.patch | 12 ++++
.../sblim-sfcb/sblim-sfcb_1.4.8.bb | 83 ++++++++++++++++++++++
9 files changed, 268 insertions(+)
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.15-fix-provider-debugging.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.16-maxMsgLen.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.16-multilib-man-cfg.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.5-service.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.9-fix-ftbfs.patch
create mode 100644 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.8.bb
diff --git a/meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service b/meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service
new file mode 100644
index 0000000..5adf63c
--- /dev/null
+++ b/meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Small Footprint CIM Broker Service
+After=syslog.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/sfcbd -d
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.15-fix-provider-debugging.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.15-fix-provider-debugging.patch
new file mode 100644
index 0000000..4fbecaa
--- /dev/null
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.15-fix-provider-debugging.patch
@@ -0,0 +1,12 @@
+diff -up sblim-sfcb-1.4.5/providerDrv.c.orig sblim-sfcb-1.4.5/providerDrv.c
+--- sblim-sfcb-1.4.5/providerDrv.c.orig 2013-09-04 12:59:22.140813239 +0200
++++ sblim-sfcb-1.4.5/providerDrv.c 2013-09-04 12:59:40.511870274 +0200
+@@ -3585,7 +3585,7 @@ processProviderInvocationRequests(char *
+ rc = spRecvReq(&providerSockets.receive, &parms->requestor,
+ (void **) &parms->req, &rl, &mqg);
+ if (mqg.rdone) {
+- int debug_break = 0;
++ volatile int debug_break = 0;
+ if (rc != 0) {
+ mlogf(M_ERROR,M_SHOW, "spRecvReq returned error %d. Skipping message.\n", rc);
+ free(parms);
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.16-maxMsgLen.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.16-maxMsgLen.patch
new file mode 100644
index 0000000..a0dd816
--- /dev/null
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.16-maxMsgLen.patch
@@ -0,0 +1,14 @@
+diff -up sblim-sfcb-1.3.16/sfcb.cfg.pre.in.old sblim-sfcb-1.3.16/sfcb.cfg.pre.in
+--- sblim-sfcb-1.3.16/sfcb.cfg.pre.in.old 2012-06-13 23:21:09.000000000 +0200
++++ sblim-sfcb-1.3.16/sfcb.cfg.pre.in 2013-06-24 15:34:38.881992781 +0200
+@@ -113,8 +113,8 @@ provProcs: 32
+
+ ## Max message length, in bytes. This is a limit on the size of messages
+ ## written across sockets, for instance, between providers and SFCB.
+-## Default is 10000000
+-maxMsgLen: 10000000
++## Default is 100000000
++maxMsgLen: 100000000
+
+ ## Location of the registration directory, where providerRegister can be found
+ ## Default is @localstatedir@/lib/sfcb/registration
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.16-multilib-man-cfg.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.16-multilib-man-cfg.patch
new file mode 100644
index 0000000..c8cece2
--- /dev/null
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.16-multilib-man-cfg.patch
@@ -0,0 +1,41 @@
+diff -up sblim-sfcb-1.3.16/man/sfcbd.1.pre.in.orig sblim-sfcb-1.3.16/man/sfcbd.1.pre.in
+--- sblim-sfcb-1.3.16/man/sfcbd.1.pre.in.orig 2014-02-26 14:05:32.213091734 +0100
++++ sblim-sfcb-1.3.16/man/sfcbd.1.pre.in 2014-02-26 15:10:54.476196379 +0100
+@@ -151,7 +151,7 @@ Default=\fI@localstatedir@/lib/sfcb/regi
+ .TP
+ .B providerDirs
+ A space separated list of directories where sfcb is looking for provider
+-libraries. Default=\fI@libdir@\ @libdir@/cmpi\fR
++libraries. Default=\fI/usr/lib\ /usr/lib/cmpi /usr/lib64\ /usr/lib64/cmpi\fR
+ .TP
+ .B providerSampleInterval
+ The interval in seconds at which the provider manager is checking for
+@@ -275,11 +275,11 @@ SSL private key file for sfcb.
+ SSL client certificate / trust store for sfcb.
+ .SH LIBRARIES
+ .TP
+-.I @libdir@/libsfc*
++.I /usr/lib/libsfc* /usr/lib64/libsfc*
+ Binaries for sfcb runtime libraries.
+ .TP
+-.I @libdir@/cmpi/*
+-Binaries for providers
++.I /usr/lib/cmpi/* /usr/lib64/cmpi/*
++Binaries for providers.
+ .SH AUTHOR
+ Adrian Schuur <schuur@de.ibm.com>
+ .SH CONRIBUTORS
+diff -up sblim-sfcb-1.3.16/sfcb.cfg.pre.in.orig sblim-sfcb-1.3.16/sfcb.cfg.pre.in
+--- sblim-sfcb-1.3.16/sfcb.cfg.pre.in.orig 2014-02-26 15:35:43.133869718 +0100
++++ sblim-sfcb-1.3.16/sfcb.cfg.pre.in 2014-02-26 15:38:12.794240532 +0100
+@@ -121,8 +121,8 @@ maxMsgLen: 100000000
+ registrationDir: @localstatedir@/lib/sfcb/registration
+
+ ## Locations to look for provider libraries. Delimit paths with a space.
+-## Default is @libdir@/sfcb @libdir@ @libdir@/cmpi
+-providerDirs: @libdir@/sfcb @libdir@ @libdir@/cmpi
++## Default is /usr/lib/sfcb /usr/lib64/sfcb /usr/lib /usr/lib64 /usr/lib/cmpi /usr/lib64/cmpi
++providerDirs: /usr/lib/sfcb /usr/lib64/sfcb /usr/lib /usr/lib64 /usr/lib/cmpi /usr/lib64/cmpi
+
+ ## Enable the root/interop namespace (affects indications)
+ ## Default: true
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch
new file mode 100644
index 0000000..7f95a9d
--- /dev/null
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch
@@ -0,0 +1,42 @@
+diff -up sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in.orig sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in
+--- sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in.orig 2009-10-13 21:54:13.000000000 +0200
++++ sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in 2010-09-06 14:01:57.294564062 +0200
+@@ -26,7 +26,7 @@ Supported command line options are:
+ .TP
+ \fB\-c\fR \fIschemadir\fR
+ Path to obtain the CIM Schema classes.
+-Default is \fI@datadir@/sfcb\fR
++Default is \fI@datadir@/mof/cim-current\fR
+ .TP
+ \fB\-s\fR \fIstagingdir\fR
+ Path to sfcb staging area containing class MOFs and registration files
+@@ -58,7 +58,7 @@ Alias of \fB-b\fR
+ Display usage information and exit.
+ .SH FILES
+ .TP
+-\fI@datadir@/sfcb/CIM/CIM_Schema.mof\fR
++\fI@datadir@/mof/cim-current/CIM_Schema.mof\fR
+ CIM Schema
+ .TP
+ \fI@localstatedir@/lib/sfcb/registration/providerRegister\fR
+diff -up sblim-sfcb-1.3.9/sfcbrepos.sh.in.orig sblim-sfcb-1.3.9/sfcbrepos.sh.in
+--- sblim-sfcb-1.3.9/sfcbrepos.sh.in.orig 2009-12-22 01:18:29.000000000 +0100
++++ sblim-sfcb-1.3.9/sfcbrepos.sh.in 2010-09-06 13:45:28.671491648 +0200
+@@ -59,7 +59,7 @@ then
+ echo -e "\t-X create repository in non-native format as specifed by argument"
+ echo -e "\t-s specify staging directory [@localstatedir@/lib/sfcb/stage]"
+ echo -e "\t-r specify repository directory [@localstatedir@/lib/sfcb/registration]"
+- echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/sfcb/CIM]"
++ echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/mof/cim-current]"
+ echo -e "\t-t create tiny class repository by omitting inheritance information"
+ echo -e "\t-z compress repository with gzip"
+ echo
+@@ -99,7 +99,7 @@ fi
+
+ if [ -z "$cimschemadir" ]
+ then
+- cimschemadir=${DESTDIR}@datadir@/sfcb/CIM
++ cimschemadir=${DESTDIR}@datadir@/mof/cim-current
+ fi
+
+ if [ -d $stagingdir ] && [ -f $stagingdir/default.reg ] &&
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.5-service.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.5-service.patch
new file mode 100644
index 0000000..eaccfa5
--- /dev/null
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.5-service.patch
@@ -0,0 +1,27 @@
+diff -up sblim-sfcb-1.4.6/Makefile.in.orig sblim-sfcb-1.4.6/Makefile.in
+--- sblim-sfcb-1.4.6/Makefile.in.orig 2013-10-07 10:43:34.783228137 +0200
++++ sblim-sfcb-1.4.6/Makefile.in 2013-10-07 10:44:30.178533289 +0200
+@@ -627,7 +627,6 @@ initdir = $(sysconfdir)/init.d
+ pamdir = $(sysconfdir)/pam.d
+ sfcblibdir = $(libdir)/sfcb
+ cmpilibdir = $(libdir)/cmpi
+-systemddir = $(DESTDIR)@SYSTEMDDIR@
+ MANFILES = man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \
+ man/sfcbrepos.1 man/sfcbstage.1 man/sfcbunstage.1 man/sfcbuuid.1 \
+ man/wbemcat.1 man/xmltest.1
+@@ -2366,7 +2365,6 @@ unittest:
+ cd test && sh check_all.sh
+
+ install-data-local:
+- if test -d $(systemddir); then cp $(srcdir)/sblim-sfcb.service $(systemddir); fi;
+ test -d $(DESTDIR)$(sfcbstatedir)/registration/repository || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/registration/repository
+ test -d $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop
+ test -d $(DESTDIR)$(sfcbstatedir)/stage/regs || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/stage/regs
+@@ -2384,7 +2382,6 @@ install-data-local:
+ uninstall-local:
+ rm -f $(DESTDIR)$(sfcbstatedir)/stage/default.reg
+ rm -f $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop/10_interop.mof
+- rm -f $(systemddir)/sblim-sfcb.service
+ @INDICATIONS_TRUE@ rm -f $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop/20_indication.mof
+ @INDICATIONS_TRUE@ rm -f $(DESTDIR)$(sfcbstatedir)/stage/mofs/indication.mof
+ @DOCS_TRUE@ rm -rf $(DESTDIR)$(sfcbdocdir)/html
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch
new file mode 100644
index 0000000..3268d49
--- /dev/null
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch
@@ -0,0 +1,26 @@
+diff -up sblim-sfcb-1.4.8/control.c.orig sblim-sfcb-1.4.8/control.c
+--- sblim-sfcb-1.4.8/control.c.orig 2014-03-27 00:46:28.000000000 +0100
++++ sblim-sfcb-1.4.8/control.c 2014-05-15 12:31:38.304169409 +0200
+@@ -170,7 +170,7 @@ static Control init[] = {
+ {"sslCertList", CTL_STRING, SFCB_CONFDIR "/clist.pem", {0}},
+ {"sslCiphers", CTL_STRING, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH", {0}},
+ {"sslDhParamsFilePath", CTL_STRING, NULL, {0}},
+- {"sslEcDhCurveName", CTL_STRING, "secp224r1", {0}},
++ {"sslEcDhCurveName", CTL_STRING, "secp384r1", {0}},
+ {"enableSslCipherServerPref", CTL_BOOL, NULL, {.b=0}},
+
+ {"registrationDir", CTL_STRING, SFCB_STATEDIR "/registration", {0}},
+diff -up sblim-sfcb-1.4.8/sfcb.cfg.pre.in.orig sblim-sfcb-1.4.8/sfcb.cfg.pre.in
+--- sblim-sfcb-1.4.8/sfcb.cfg.pre.in.orig 2014-05-15 12:31:59.188244865 +0200
++++ sblim-sfcb-1.4.8/sfcb.cfg.pre.in 2014-05-15 12:32:45.554408412 +0200
+@@ -293,8 +293,8 @@ sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STR
+ ## environment. If this value is not set, the indicated default is in effect.
+ ## If the value is set but the curve name is not recognized by the underlying
+ ## openssl implementation, SFCB will abort.
+-## Default is secp224r1
+-#sslEcDhCurveName: secp224r1
++## Default is secp384r1
++#sslEcDhCurveName: secp384r1
+
+ ## When set to true, sets the SSL_OP_CIPHER_SERVER_PREFERENCE flag for the ssl
+ ## context, to enforce server's preference instead of the client preference for
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.9-fix-ftbfs.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.9-fix-ftbfs.patch
new file mode 100644
index 0000000..9548b3c
--- /dev/null
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.8/sblim-sfcb-1.4.9-fix-ftbfs.patch
@@ -0,0 +1,12 @@
+diff -up sblim-sfcb-1.4.9/control.c.orig sblim-sfcb-1.4.9/control.c
+--- sblim-sfcb-1.4.9/control.c.orig 2015-07-13 15:06:21.331660336 +0200
++++ sblim-sfcb-1.4.9/control.c 2015-07-13 15:08:38.031308917 +0200
+@@ -83,7 +83,7 @@ long httpReqHandlerTimeout;
+ * Kindly null terminate, always, even if might overwrite
+ * the last char of the truncated string.
+ */
+-inline char *strncpy_kind(char *to, char *from, size_t size) {
++char *strncpy_kind(char *to, char *from, size_t size) {
+ strncpy(to, from, size);
+ *(to + size - 1) = '\0';
+ return to;
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.8.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.8.bb
new file mode 100644
index 0000000..5474fc6
--- /dev/null
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.8.bb
@@ -0,0 +1,83 @@
+SUMMARY = "Small Footprint CIM Broker"
+DESCRIPTION = "\
+Small Footprint CIM Broker (sfcb) is a CIM server conforming to the CIM \
+Operations over HTTP protocol. It is robust, with low resource consumption \
+and therefore specifically suited for embedded and resource constrained \
+environments. sfcb supports providers written against the Common \
+Manageability Programming Interface (CMPI)."
+HOMEPAGE = "http://www.sblim.org"
+SECTION = "Applications/System"
+LICENSE = "EPL-1.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261"
+DEPENDS = "curl libpam openssl sblim-sfcCommon"
+
+SRC_URI = "http://downloads.sourceforge.net/sblim/${PN}-${PV}.tar.bz2 \
+ file://sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch \
+ file://sblim-sfcb-1.3.15-fix-provider-debugging.patch \
+ file://sblim-sfcb-1.3.16-maxMsgLen.patch \
+ file://sblim-sfcb-1.4.5-service.patch \
+ file://sblim-sfcb-1.3.16-multilib-man-cfg.patch \
+ file://sblim-sfcb-1.4.8-default-ecdh-curve-name.patch \
+ file://sblim-sfcb-1.4.9-fix-ftbfs.patch \
+ file://sfcb.service"
+
+SRC_URI[md5sum] = "b2e0cb26628cb31e2374959637d9268c"
+SRC_URI[sha256sum] = "7dc0f16e2c2d3767466a09afee04e6febd611c157d66f8f0ae666be1fefbff3b"
+
+inherit autotools
+inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
+
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "sblim-sfcb.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
+LDFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+
+EXTRA_OECONF = '--enable-debug \
+ --enable-ssl \
+ --enable-pam \
+ --enable-ipv6 \
+ CFLAGS="${CFLAGS} -D_GNU_SOURCE"'
+
+# make all with -j option is unsafe.
+PARALLEL_MAKE = ""
+
+INSANE_SKIP_${PN} = "dev-so"
+CONFIG_SITE = "${WORKDIR}/config-site.${P}"
+
+do_install() {
+ cp -f ${S}/sfcb.cfg.pre.in ${S}/sfcb.cfg
+
+ oe_runmake DESTDIR=${D} install
+
+ if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service
+ fi
+
+ install -d ${D}${sysconfdir}/init.d
+ mv ${D}${sysconfdir}/init.d/sfcb ${D}${sysconfdir}/init.d/sblim-sfcb
+ sed -i -e 's/\/var\/lock\/subsys\/sfcb/\/var\/lock\/subsys\/sblim-sfcb/g' ${D}${sysconfdir}/init.d/sblim-sfcb
+
+ rm -rf ${D}${libdir}/sfcb/*.la
+}
+
+pkg_postinst_${PN} () {
+ OPTS=""
+
+ if [ x"$D" != "x" ]; then
+ OPTS="--root=$D"
+ if type systemctl >/dev/null 2>/dev/null; then
+ systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
+ fi
+ exit 1
+ fi
+
+ ${datadir}/sfcb/genSslCert.sh ${sysconfdir}/sfcb
+ ${bindir}/sfcbrepos -f
+}
+
+FILES_${PN} += "${libdir}/sfcb ${datadir}/sfcb"
+FILES_${PN}-dbg += "${libdir}/sfcb/.debug"
+
+RDEPENDS_${PN} = "perl bash"
--
1.8.4.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [meta-oe][PATCH v5 5/6] cim-schema-exper: add new recipe for openlmi
2015-08-14 4:43 [meta-oe][PATCH v5 0/6] add openlmi and it's depends Lei Maohui
` (3 preceding siblings ...)
2015-08-14 4:43 ` [meta-oe][PATCH v5 4/6] sblim-sfcb: add new recipe for openlmi Lei Maohui
@ 2015-08-14 4:43 ` Lei Maohui
2015-08-14 4:44 ` [meta-oe][PATCH v5 6/6] openlmi: add openlmi Lei Maohui
5 siblings, 0 replies; 8+ messages in thread
From: Lei Maohui @ 2015-08-14 4:43 UTC (permalink / raw)
To: openembedded-devel
- Cim-schema(Experimental-MOFs) is dependence of openlmi.
- Cim-schema_2.40.0.bb is renamed to cim-schema-final_2.40.0.bb.
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
---
.../cim-schema/cim-schema-exper_2.39.0.bb | 26 +++++++++++++++++
...schema_2.40.0.bb => cim-schema-final_2.40.0.bb} | 0
.../cim-schema/cim-schema/files/LICENSE | 34 ++++++++++++++++++++++
3 files changed, 60 insertions(+)
create mode 100644 meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb
rename meta-networking/recipes-support/cim-schema/{cim-schema_2.40.0.bb => cim-schema-final_2.40.0.bb} (100%)
create mode 100644 meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE
diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb
new file mode 100644
index 0000000..3b973bf
--- /dev/null
+++ b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb
@@ -0,0 +1,26 @@
+require cim-schema.inc
+
+LICENSE = "DMTF"
+
+SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2390/cim_schema_${PV}Experimental-MOFs.zip;subdir=${BPN}-${PV} \
+ file://LICENSE \
+ "
+SRC_URI[md5sum] = "b82b31c609c6bcc69521829409f58ccc"
+SRC_URI[sha256sum] = "ed2096ef1ea25d189a02bbc6603fed7a48297f2987f254265763a6eecb7fc870"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4"
+
+do_install() {
+ install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/
+ install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV}
+ install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV}
+
+ cp -a ${S}/* ${D}${datadir}/mof/cimv${PV}/
+ for i in `find ${D}${datadir}/mof/cimv${PV} -name "*.mof"`; do
+ sed -i -e 's/\r//g' $i
+ done
+ ln -s cimv${PV} ${D}${datadir}/mof/cim-current
+ ln -s cim_schema_${PV}.mof ${D}${datadir}/mof/cim-current/CIM_Schema.mof
+}
+
+FILES_${PN} = "${datadir}/mof/* ${datadir}/doc/*"
+FILES_${PN}-doc = ""
diff --git a/meta-networking/recipes-support/cim-schema/cim-schema_2.40.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
similarity index 100%
rename from meta-networking/recipes-support/cim-schema/cim-schema_2.40.0.bb
rename to meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
diff --git a/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE b/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE
new file mode 100644
index 0000000..54a2812
--- /dev/null
+++ b/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE
@@ -0,0 +1,34 @@
+// Copyright 1998-2008 Distributed Management Task Force, Inc. (DMTF).
+// All rights reserved.
+// DMTF is a not-for-profit association of industry members dedicated
+// to promoting enterprise and systems management and interoperability.
+// DMTF specifications and documents may be reproduced by
+// members and non-members, provided that correct attribution is given.
+// As DMTF specifications may be revised from time to time,
+// the particular version and release date should always be noted.
+//
+// Implementation of certain elements of this standard or proposed
+// standard may be subject to third party patent rights, including
+// provisional patent rights (herein "patent rights"). DMTF makes
+// no representations to users of the standard as to the existence
+// of such rights, and is not responsible to recognize, disclose, or
+// identify any or all such third party patent right, owners or
+// claimants, nor for any incomplete or inaccurate identification or
+// disclosure of such rights, owners or claimants. DMTF shall have no
+// liability to any party, in any manner or circumstance, under any
+// legal theory whatsoever, for failure to recognize, disclose, or
+// identify any such third party patent rights, or for such party's
+// reliance on the standard or incorporation thereof in its product,
+// protocols or testing procedures. DMTF shall have no liability to
+// any party implementing such standard, whether such implementation
+// is foreseeable or not, nor to any patent owner or claimant, and shall
+// have no liability or responsibility for costs or losses incurred if
+// a standard is withdrawn or modified after publication, and shall be
+// indemnified and held harmless by any party implementing the
+// standard from any and all claims of infringement by a patent owner
+// for such implementations.
+//
+// For information about patents held by third-parties which have
+// notified the DMTF that, in their opinion, such patent may relate to
+// or impact implementations of DMTF standards, visit
+// http://www.dmtf.org/about/policies/disclosures.php.
--
1.8.4.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [meta-oe][PATCH v5 6/6] openlmi: add openlmi
2015-08-14 4:43 [meta-oe][PATCH v5 0/6] add openlmi and it's depends Lei Maohui
` (4 preceding siblings ...)
2015-08-14 4:43 ` [meta-oe][PATCH v5 5/6] cim-schema-exper: " Lei Maohui
@ 2015-08-14 4:44 ` Lei Maohui
5 siblings, 0 replies; 8+ messages in thread
From: Lei Maohui @ 2015-08-14 4:44 UTC (permalink / raw)
To: openembedded-devel
OpenLMI = Open Linux Management Infrastructure.
OpenLMI is open-source project aiming to improve management of Linux systems using WBEM standards.
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
---
...x-lib64-can-not-be-shiped-in-64bit-target.patch | 31 +++++++++++++
.../openlmi/openlmi-networking_0.3.1.bb | 30 ++++++++++++
.../openlmi/openlmi-providers/0001-fix-error.patch | 26 +++++++++++
...x-lib64-can-not-be-shiped-in-64bit-target.patch | 31 +++++++++++++
.../openlmi/openlmi-providers_0.6.0.bb | 54 ++++++++++++++++++++++
.../openlmi/openlmi-storage_0.8.1.bb | 32 +++++++++++++
.../openlmi/openlmi-tools_0.10.5.bb | 23 +++++++++
7 files changed, 227 insertions(+)
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-networking/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-error.patch
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-storage_0.8.1.bb
create mode 100644 meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-networking/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch b/meta-oe/recipes-extended/openlmi/openlmi-networking/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch
new file mode 100644
index 0000000..c238200
--- /dev/null
+++ b/meta-oe/recipes-extended/openlmi/openlmi-networking/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch
@@ -0,0 +1,31 @@
+From 336bb5a031077461ec6b2e5438738bf100f0dd2f Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui@cn.fujitsu.com>
+Date: Mon, 3 Aug 2015 02:37:46 +0900
+Subject: [PATCH] fix lib64 can not be shiped in 64bit target
+
+Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
+---
+ CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1ba3cd3..2411745 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,13 +35,6 @@ if (DEBUG)
+ add_definitions("-DDEBUG_ENABLED")
+ endif (DEBUG)
+
+-# Set LIB_SUFFIX to 64 on 64bit architectures
+-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+- set(LIB_SUFFIX "")
+-else(CMAKE_SIZEOF_VOID_P EQUAL 4)
+- SET(LIB_SUFFIX 64)
+-endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+-
+ # Find OpenLMIMacros when installed in other prefix than /usr (e.g. /usr/local)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_INSTALL_PREFIX})
+ include(OpenLMIMacros RESULT_VARIABLE LMIMACROS)
+--
+1.8.4.2
+
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb b/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb
new file mode 100644
index 0000000..5442910
--- /dev/null
+++ b/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb
@@ -0,0 +1,30 @@
+SUMMARY = "CIM providers for network management"
+DESCRIPTION = "\
+openlmi-networking is set of CMPI providers for network management using \
+Common Information Model (CIM)."
+HOMEPAGE = "http://www.openlmi.org/"
+LICENSE = "LGPL-2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7c13b3376cea0ce68d2d2da0a1b3a72c"
+SECTION = "System/Management"
+DEPENDS = "openlmi-providers konkretcmpi sblim-cmpi-devel cim-schema-exper networkmanager dbus libcheck glib-2.0"
+
+SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \
+ file://0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch \
+ "
+SRC_URI[md5sum] = "f20de8c76fb6a80001b14c1eb035953e"
+SRC_URI[sha256sum] = "578eaa5c65fe924b5d7aeb635509dd46443166cd6a88b019bc42646e3518a460"
+
+inherit cmake
+
+EXTRA_OECMAKE = "${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
+ ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
+ "
+
+
+do_configure_prepend() {
+ export CMAKE_INSTALL_DATDIR="${STAGING_DATADIR}"
+}
+
+
+FILES_${PN} =+ "${libdir}/cmpi/libcmpiLMI_Networking.so ${prefix}/libexec*"
+FILES_${PN}-dbg =+ "${libdir}/cmpi/.debug*"
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-error.patch b/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-error.patch
new file mode 100644
index 0000000..4bcd1c4
--- /dev/null
+++ b/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-error.patch
@@ -0,0 +1,26 @@
+From 764171866b84e0198b67538f63022abde3e628ad Mon Sep 17 00:00:00 2001
+From: Qian Lei <qianl.fnst@cn.fujitsu.com>
+Date: Fri, 16 Jan 2015 14:15:25 +0800
+Subject: [PATCH] fix error
+
+Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
+---
+ cmake/modules/OpenLMIMacros.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/OpenLMIMacros.cmake b/cmake/modules/OpenLMIMacros.cmake
+index d55f983..dbc32ec 100644
+--- a/cmake/modules/OpenLMIMacros.cmake
++++ b/cmake/modules/OpenLMIMacros.cmake
+@@ -89,7 +89,7 @@ macro(konkretcmpi_generate MOFS CIM_PROVIDERS CIM_HEADERS CIM_CLASSES)
+ endforeach(CLASS ${CIM_CLASS_NAMES})
+
+ # Generate headers for CIM classes
+- set(ENV{KONKRET_SCHEMA_DIR} "/usr/share/mof/cim-current")
++ set(ENV{KONKRET_SCHEMA_DIR} "$ENV{CMAKE_INSTALL_DATDIR}/mof/cim-current")
+ execute_process(COMMAND ${KONKRETCMPI_KONKRET}
+ ${KONKRET_MOF_FILES}
+ ${GENERATE_PROVIDERS}
+--
+1.8.3.1
+
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch b/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch
new file mode 100644
index 0000000..9c8ebe4
--- /dev/null
+++ b/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch
@@ -0,0 +1,31 @@
+From 7cecfa95f033b33a1c3260c214b2d0e5e81b4fd3 Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui@cn.fujitsu.com>
+Date: Mon, 3 Aug 2015 02:05:56 +0900
+Subject: [PATCH] fix lib64 can not be shiped in 64bit target
+
+Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
+---
+ CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 48ae206..3ead9c6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,13 +21,6 @@ else(HAS_STACK_PROTECTOR_STRONG)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
+ endif()
+
+-# Set LIB_SUFFIX to 64 on 64bit architectures
+-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+- set(LIB_SUFFIX "")
+-else(CMAKE_SIZEOF_VOID_P EQUAL 4)
+- SET(LIB_SUFFIX 64)
+-endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+-
+ if(NOT SYSCONF_INSTALL_DIR)
+ set(SYSCONF_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/etc)
+ endif(NOT SYSCONF_INSTALL_DIR)
+--
+1.8.4.2
+
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb b/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb
new file mode 100644
index 0000000..f74fb77
--- /dev/null
+++ b/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb
@@ -0,0 +1,54 @@
+SUMMARY = "Set of basic CIM providers"
+DESCRIPTION = "\
+openlmi-providers is set of (usually) small CMPI providers (agents) for \
+basic monitoring and management of host system using Common Information \
+Model (CIM)."
+HOMEPAGE = "http://www.openlmi.org/"
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7c13b3376cea0ce68d2d2da0a1b3a72c"
+SECTION = "System/Management"
+DEPENDS = "konkretcmpi-native konkretcmpi sblim-sfcb sblim-cmpi-devel cim-schema-exper lmsensors libuser swig swig-native dbus udev systemd-systemctl-native pciutils"
+
+SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \
+ file://0001-fix-error.patch \
+ file://0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch \
+ "
+SRC_URI[md5sum] = "5904f23cf494946237cfbbdbe644a3cd"
+SRC_URI[sha256sum] = "e2b2fbeaec45a83905d0da3b87da83904d9cd94c1b86312f844587b3fff11f56"
+
+inherit cmake
+LDFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+EXTRA_OECMAKE = " \
+ -DWITH-DEVASSISTANT=OFF \
+ -DWITH-JOURNALD=OFF \
+ -DWITH-SERVICE=OFF \
+ -DWITH-SERVICE-LEGACY=ON \
+ -DWITH-ACCOUNT=OFF \
+ -DWITH-PCP=OFF \
+ -DWITH-REALMD=OFF \
+ -DWITH-FAN=OFF \
+ -DWITH-LOCALE=OFF \
+ -DWITH-INDSENDER=OFF \
+ -DWITH-JOBMANAGER=OFF \
+ -DWITH-SSSD=OFF \
+ -DWITH-SELINUX=OFF \
+ -DWITH-SOFTWARE-DBUS=ON \
+ ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
+ ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
+ "
+
+do_configure_prepend() {
+ export CMAKE_INSTALL_DATDIR="${STAGING_DATADIR}"
+}
+
+do_install_append() {
+ if [ -d ${D}${prefix}${sysconfidr} ]; then
+ mv ${D}${prefix}${sysconfdir} ${D}${sysconfdir}
+ fi
+}
+
+FILES_${PN} =+ "${libdir}/cmpi/libcmpiLMI* ${prefix}/libexec*"
+FILES_${PN}-dev =+ "${datadir}/cmake*"
+FILES_${PN}-dbg =+ "${libdir}/cmpi/.debug*"
+
+RDEPENDS_${PN} = "python"
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-storage_0.8.1.bb b/meta-oe/recipes-extended/openlmi/openlmi-storage_0.8.1.bb
new file mode 100644
index 0000000..015d803
--- /dev/null
+++ b/meta-oe/recipes-extended/openlmi/openlmi-storage_0.8.1.bb
@@ -0,0 +1,32 @@
+SUMMARY = "CIM providers for storage management"
+DESCRIPTION = "\
+The openlmi-storage package contains CMPI providers for management of storage \
+using Common Information Managemen (CIM) protocol. \
+\
+The providers can be registered in any CMPI-aware CIMOM, both OpenPegasus and \
+SFCB were tested."
+HOMEPAGE = "http://www.openlmi.org/"
+LICENSE = "LGPL-2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+SECTION = "System/Management"
+DEPENDS = "openlmi-providers pywbem cmpi-bindings"
+RDEPENDS_${PN} += "bash"
+
+SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz"
+SRC_URI[md5sum] = "898cf0d8c03b8ad6b45d65f335ddee0d"
+SRC_URI[sha256sum] = "4a1ba9957750f94ea58a89cea28985564f38d7cc9aa00fcae20c51e7b32bd0a8"
+
+inherit setuptools
+
+do_install_append() {
+ install -m 755 -d ${D}${datadir}/${BPN}
+ install -m 644 ${S}/mof/* ${D}${datadir}/${BPN}/
+
+ install -m 755 -d ${D}${sysconfdir}/openlmi/storage
+ install -m 644 storage.conf ${D}${sysconfdir}/openlmi/storage/storage.conf
+
+ install -m 755 -d ${D}${libexecdir}/pegasus
+ install -m 755 pycmpiLMI_Storage-cimprovagt ${D}${libexecdir}/pegasus/
+}
+
+FILES_${PN} =+ "${sysconfdir}/openlmi/storage/storage.conf ${datadir}/${BPN}/*"
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
new file mode 100644
index 0000000..b23869d
--- /dev/null
+++ b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Set of CLI tools for Openlmi providers"
+DESCRIPTION = "openlmi-tools is a set of command line tools for Openlmi providers."
+HOMEPAGE = "http://www.openlmi.org/"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
+SECTION = "System/Management"
+
+inherit setuptools
+
+DEPENDS = "python-native pywbem-native python-m2crypto pywbem"
+
+SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \
+ "
+SRC_URI[md5sum] = "e156246cb7b49753db82f4ddf7f03e50"
+SRC_URI[sha256sum] = "292b8f5f2250655a4add8183c529b73358bc980bd4f23cfa484a940953fce9e4"
+
+do_compile_prepend() {
+ cd cli
+ sed 's/@@VERSION@@/$(VERSION)/g' setup.py.skel >setup.py
+}
+do_install_prepend() {
+ cd cli
+}
--
1.8.4.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [meta-oe][PATCH v5 2/6] konkretcmpi: add new recipe for openlmi
2015-08-14 4:43 ` [meta-oe][PATCH v5 2/6] konkretcmpi: add new recipe for openlmi Lei Maohui
@ 2015-08-20 15:02 ` Martin Jansa
0 siblings, 0 replies; 8+ messages in thread
From: Martin Jansa @ 2015-08-20 15:02 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 10313 bytes --]
On Fri, Aug 14, 2015 at 12:43:56PM +0800, Lei Maohui wrote:
> Konkretcmpi is dependence of openlmi.
>
> Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
> ---
> .../konkretcmpi/konkretcmpi-native_0.9.2.bb | 28 ++++++++++++++++
> ...txt-fix-lib64-can-not-be-shiped-in-64bit-.patch | 31 ++++++++++++++++++
> ...x-lib64-can-not-be-shiped-in-64bit-target.patch | 36 ++++++++++++++++++++
> ...-0.9.2-fix-returning-instance-from-method.patch | 38 ++++++++++++++++++++++
> .../konkretcmpi/konkretcmpi_0.9.2.bb | 34 +++++++++++++++++++
> 5 files changed, 167 insertions(+)
> create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb
> create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch
> create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch
> create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch
> create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
>
> diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb
> new file mode 100644
> index 0000000..d04c103
> --- /dev/null
> +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb
> @@ -0,0 +1,28 @@
> +SUMMARY = "Tool for rapid CMPI providers development"
> +DESCRIPTION = "\
> +KonkretCMPI makes CMPI provider development easier by generating type-safe \
> +concrete CIM interfaces from MOF definitions and by providing default \
> +implementations for many of the provider operations."
> +HOMEPAGE = "https://github.com/rnovacek/konkretcmpi"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873"
> +DEPENDS = "cmake-native cmpi-bindings-native"
> +
> +SRC_URI = "https://github.com/rnovacek/${BPN}/archive/${PV}/${BP}.tar.gz \
Don't use github archives, they are regenerated from time to time with
different checksums.
> + file://konkretcmpi-0.9.2-fix-returning-instance-from-method.patch \
> + file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch "
> +
> +SRC_URI[md5sum] = "7e8ed4f47d1a9e5cbed4208920f89d64"
> +SRC_URI[sha256sum] = "2ac52fc374e46d68317194bbd6b44e0b2f934df24b201efb395d3eccf0fed634"
> +
> +inherit native cmake
> +LDFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
> +
> +EXTRA_OECMAKE = "-DWITH_PYTHON=ON \
> + ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
> + ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
> + "
> +
> +do_install_append() {
> + rm -rf ${D}${datadir}
> +}
> diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch
> new file mode 100644
> index 0000000..40a0643
> --- /dev/null
> +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch
> @@ -0,0 +1,31 @@
> +From d97ac2bf2ed9c84ffd65ff10989068b202e09fdf Mon Sep 17 00:00:00 2001
> +From: Lei Maohui <leimaohui@cn.fujitsu.com>
> +Date: Mon, 3 Aug 2015 00:29:54 +0900
> +Subject: [PATCH] CMakeLists.txt: fix lib64 can not be shiped in 64bit target
> +
> +Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
> +---
> + CMakeLists.txt | 7 -------
> + 1 file changed, 7 deletions(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index be544d1..14696e4 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -11,13 +11,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_P
> +
> + find_package(CMPI)
> +
> +-# Set LIB_SUFFIX to 64 on 64bit architectures
> +-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
> +- set(LIB_SUFFIX "")
> +-else(CMAKE_SIZEOF_VOID_P EQUAL 4)
> +- set(LIB_SUFFIX 64)
> +-endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
> +-
> + option(WITH_PYTHON "Build experimental Python bindings" OFF)
> +
> + add_subdirectory(cmake)
> +--
> +1.8.4.2
> +
> diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch
> new file mode 100644
> index 0000000..7da13ee
> --- /dev/null
> +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch
> @@ -0,0 +1,36 @@
> +From f3c39fd2a4b5f53338b5f821788c63858bf860cf Mon Sep 17 00:00:00 2001
> +From: Lei Maohui <leimaohui@cn.fujitsu.com>
> +Date: Sun, 2 Aug 2015 22:08:43 +0900
> +Subject: [PATCH] to fix lib64 can not be shiped in 64bit target
> +
> +To fix the warning as following:
> +WARNING: QA Issue: konkretcmpi: Files/directories were installed but not shipped in any package:
> + /usr/lib64
> + /usr/lib64/libkonkret.so
> + /usr/lib64/libkonkret.so.0.0.1
> + /usr/lib64/libkonkret.so.0
> + /usr/lib64/libkonkretmof.so.0.0.1
> + /usr/lib64/libkonkretmof.so
> + ...
> +
> +Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
> +---
> + cmake/modules/FindKonkretCMPI.cmake | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/cmake/modules/FindKonkretCMPI.cmake b/cmake/modules/FindKonkretCMPI.cmake
> +index b888cfd..097caed 100644
> +--- a/cmake/modules/FindKonkretCMPI.cmake
> ++++ b/cmake/modules/FindKonkretCMPI.cmake
> +@@ -9,7 +9,7 @@ find_path(KONKRETCMPI_INCLUDE_DIR
> + find_library(KONKRETCMPI_LIBRARY
> + NAMES konkret
> + HINTS $ENV{KONKRETCMPI_LIB_DIR}
> +- PATH_SUFFIXES lib64 lib
> ++ PATH_SUFFIXES lib lib64
> + PATHS /usr /usr/local
> + )
> +
> +--
> +1.8.4.2
> +
> diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch
> new file mode 100644
> index 0000000..b54d091
> --- /dev/null
> +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch
> @@ -0,0 +1,38 @@
> +Port from Fedora20
> +
> + | commit aca6c7f910ffe9930b5789969f0adfadd668bb46
> + | Author: Michal Minar <miminar@redhat.com>
> + | Date: Fri Jun 20 10:50:45 2014 +0200
> + |
> + | Fix returning instance as an output argument from method
> + |
> + | Submitted By: Radek Novacek <rnovacek@redhat.com>
> +
> +Upstream-Status: Pending
> +Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
> +
> +diff --git a/src/program/main.cpp b/src/program/main.cpp
> +index 885dc12..9e7108a 100644
> +--- a/src/program/main.cpp
> ++++ b/src/program/main.cpp
> +@@ -506,7 +506,11 @@ static void gen_feature_decls(
> +
> + // Add sig entry [type][length][name][zero-terminator]
> +
> +- KTag tag = _ktag(pd->data_type, pd->array_index, key, false, false);
> ++ KTag tag;
> ++ if (pd->qualifiers->has_key("EmbeddedInstance"))
> ++ tag = _ktag(TOK_INSTANCE, pd->array_index, key, false, false);
> ++ else
> ++ tag = _ktag(pd->data_type, pd->array_index, key, false, false);
> + pack_tag(sig, tag);
> + pack_name(sig, pd->name);
> + count++;
> +@@ -640,6 +644,7 @@ static void gen_param(FILE* os, MOF_Parameter* p, vector<unsigned char>& sig)
> + const char* ktn = _ktype_name(p->data_type);
> +
> + if (p->qualifiers->has_key("EmbeddedInstance")) {
> ++ tag = _ktag(TOK_INSTANCE, p->array_index, false, in, out);
> + if (p->array_index)
> + put(os, " KInstanceA $0;\n", p->name, NULL);
> + else
> diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
> new file mode 100644
> index 0000000..fc15fae
> --- /dev/null
> +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
> @@ -0,0 +1,34 @@
> +SUMMARY = "Tool for rapid CMPI providers development"
> +DESCRIPTION = "\
> +KonkretCMPI makes CMPI provider development easier by generating type-safe \
> +concrete CIM interfaces from MOF definitions and by providing default \
> +implementations for many of the provider operations."
> +HOMEPAGE = "https://github.com/rnovacek/konkretcmpi"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873"
> +DEPENDS = "swig sblim-cmpi-devel python cmake-native"
> +
> +SRC_URI = "https://github.com/rnovacek/${BPN}/archive/${PV}/${BP}.tar.gz \
> + file://konkretcmpi-0.9.2-fix-returning-instance-from-method.patch \
> + file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch \
> + "
> +
> +SRC_URI[md5sum] = "7e8ed4f47d1a9e5cbed4208920f89d64"
> +SRC_URI[sha256sum] = "2ac52fc374e46d68317194bbd6b44e0b2f934df24b201efb395d3eccf0fed634"
> +
> +inherit cmake
> +
> +EXTRA_OECMAKE = "-DWITH_PYTHON=ON \
> + ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
> + ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
> + "
> +
> +do_install_append() {
> + rm -rf ${D}${datadir}
> +}
> +
> +PACKAGES =+ "${PN}-python ${PN}-python-dbg"
> +
> +FILES_${PN}-python = "${libdir}/python2.7/site-packages/konkretmof.py* ${libdir}/python2.7/site-packages/_konkretmof.so"
> +FILES_${PN}-python-dbg = "${libdir}/python2.7/site-packages/.debug/*"
> +
> --
> 1.8.4.2
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-08-20 15:01 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-14 4:43 [meta-oe][PATCH v5 0/6] add openlmi and it's depends Lei Maohui
2015-08-14 4:43 ` [meta-oe][PATCH v5 1/6] cmpi-bindings: add new recipe Lei Maohui
2015-08-14 4:43 ` [meta-oe][PATCH v5 2/6] konkretcmpi: add new recipe for openlmi Lei Maohui
2015-08-20 15:02 ` Martin Jansa
2015-08-14 4:43 ` [meta-oe][PATCH v5 3/6] sblim-sfcCommon: add new recipe Lei Maohui
2015-08-14 4:43 ` [meta-oe][PATCH v5 4/6] sblim-sfcb: add new recipe for openlmi Lei Maohui
2015-08-14 4:43 ` [meta-oe][PATCH v5 5/6] cim-schema-exper: " Lei Maohui
2015-08-14 4:44 ` [meta-oe][PATCH v5 6/6] openlmi: add openlmi Lei Maohui
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox