diff options
4 files changed, 0 insertions, 110 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 54171a7b15..2df3292a85 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | |||
| @@ -346,7 +346,6 @@ RDEPENDS:packagegroup-meta-oe-extended = "\ | |||
| 346 | isomd5sum \ | 346 | isomd5sum \ |
| 347 | jansson \ | 347 | jansson \ |
| 348 | jpnevulator \ | 348 | jpnevulator \ |
| 349 | konkretcmpi \ | ||
| 350 | libblockdev \ | 349 | libblockdev \ |
| 351 | libcec \ | 350 | libcec \ |
| 352 | libconfig \ | 351 | libconfig \ |
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 deleted file mode 100644 index 2671111b79..0000000000 --- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From d97ac2bf2ed9c84ffd65ff10989068b202e09fdf Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
| 3 | Date: Mon, 3 Aug 2015 00:29:54 +0900 | ||
| 4 | Subject: [PATCH] CMakeLists.txt: fix lib64 can not be shiped in 64bit target | ||
| 5 | |||
| 6 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
| 7 | --- | ||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | CMakeLists.txt | 7 ------- | ||
| 11 | 1 file changed, 7 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 14 | index be544d1..14696e4 100644 | ||
| 15 | --- a/CMakeLists.txt | ||
| 16 | +++ b/CMakeLists.txt | ||
| 17 | @@ -11,13 +11,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_P | ||
| 18 | |||
| 19 | find_package(CMPI) | ||
| 20 | |||
| 21 | -# Set LIB_SUFFIX to 64 on 64bit architectures | ||
| 22 | -if(CMAKE_SIZEOF_VOID_P EQUAL 4) | ||
| 23 | - set(LIB_SUFFIX "") | ||
| 24 | -else(CMAKE_SIZEOF_VOID_P EQUAL 4) | ||
| 25 | - set(LIB_SUFFIX 64) | ||
| 26 | -endif(CMAKE_SIZEOF_VOID_P EQUAL 4) | ||
| 27 | - | ||
| 28 | option(WITH_PYTHON "Build experimental Python bindings" OFF) | ||
| 29 | |||
| 30 | add_subdirectory(cmake) | ||
| 31 | -- | ||
| 32 | 1.8.4.2 | ||
| 33 | |||
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch deleted file mode 100644 index 293706d889..0000000000 --- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From 45e1c4c04a126d2386446775f99084bd603016af Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 1 Jun 2017 23:10:59 -0700 | ||
| 4 | Subject: [PATCH] drop including rpath cmake module | ||
| 5 | |||
| 6 | Fixes cross compilation QA errors e.g. | ||
| 7 | /usr/lib/libkonkret.so.0.0.1 contains probably-redundant RPATH /usr/lib [useless-rpaths] | ||
| 8 | |||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | src/konkret/CMakeLists.txt | 1 - | ||
| 14 | src/program/CMakeLists.txt | 1 - | ||
| 15 | 2 files changed, 2 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/src/konkret/CMakeLists.txt b/src/konkret/CMakeLists.txt | ||
| 18 | index c2faa40..df49e11 100644 | ||
| 19 | --- a/src/konkret/CMakeLists.txt | ||
| 20 | +++ b/src/konkret/CMakeLists.txt | ||
| 21 | @@ -8,7 +8,6 @@ set(konkret_SRCS | ||
| 22 | kstr.c | ||
| 23 | print.c | ||
| 24 | ) | ||
| 25 | -include(rpath) | ||
| 26 | include_directories(${CMPI_INCLUDE_DIR}) | ||
| 27 | |||
| 28 | add_library(libkonkret SHARED ${konkret_SRCS}) | ||
| 29 | diff --git a/src/program/CMakeLists.txt b/src/program/CMakeLists.txt | ||
| 30 | index afcefe5..8a4646c 100644 | ||
| 31 | --- a/src/program/CMakeLists.txt | ||
| 32 | +++ b/src/program/CMakeLists.txt | ||
| 33 | @@ -1,4 +1,3 @@ | ||
| 34 | -include (rpath) | ||
| 35 | include_directories(${CMPI_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src) | ||
| 36 | |||
| 37 | add_executable(konkret main.cpp) | ||
| 38 | -- | ||
| 39 | 2.13.0 | ||
| 40 | |||
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb deleted file mode 100644 index f3f70b8da3..0000000000 --- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | SUMMARY = "Tool for rapid CMPI providers development" | ||
| 2 | DESCRIPTION = "\ | ||
| 3 | KonkretCMPI makes CMPI provider development easier by generating type-safe \ | ||
| 4 | concrete CIM interfaces from MOF definitions and by providing default \ | ||
| 5 | implementations for many of the provider operations." | ||
| 6 | HOMEPAGE = "https://github.com/rnovacek/konkretcmpi" | ||
| 7 | LICENSE = "MIT" | ||
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873" | ||
| 9 | DEPENDS:append:class-target = " swig-native sblim-cmpi-devel python3" | ||
| 10 | DEPENDS:append:class-native = " cmpi-bindings-native" | ||
| 11 | |||
| 12 | SRC_URI = "git://github.com/rnovacek/konkretcmpi.git;branch=master;protocol=https \ | ||
| 13 | file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch \ | ||
| 14 | file://0001-drop-including-rpath-cmake-module.patch \ | ||
| 15 | " | ||
| 16 | |||
| 17 | SRCREV = "ad28225e6eceff88417a60c1ba8896c8e40f21a7" | ||
| 18 | |||
| 19 | inherit cmake python3-dir | ||
| 20 | |||
| 21 | EXTRA_OECMAKE = "-DWITH_PYTHON=ON \ | ||
| 22 | ${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ | ||
| 23 | ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ | ||
| 24 | " | ||
| 25 | |||
| 26 | do_install:append() { | ||
| 27 | rm -rf ${D}${datadir} | ||
| 28 | } | ||
| 29 | |||
| 30 | PACKAGES =+ "${PN}-python" | ||
| 31 | |||
| 32 | RPROVIDES:${PN}-dbg += "${PN}-python-dbg" | ||
| 33 | |||
| 34 | FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/konkretmof.py* ${PYTHON_SITEPACKAGES_DIR}/_konkretmof.so" | ||
| 35 | |||
| 36 | BBCLASSEXTEND = "native" | ||
