From cf08f81e53b5d9256aeeef72b009736bf4741ee2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 6 Jun 2017 07:50:25 -0700 Subject: konkretcmpi: Update and fix build with latest oe-core Drop already upstreamed patch Use bbclassextend for deriving native recipe Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- .../konkretcmpi/konkretcmpi-native_0.9.2.bb | 28 ---------------------- .../konkretcmpi/konkretcmpi_0.9.2.bb | 6 ++++- 2 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_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 deleted file mode 100644 index 9b2ace9c41..0000000000 --- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -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 = "git://github.com/rnovacek/konkretcmpi.git \ - file://konkretcmpi-0.9.2-fix-returning-instance-from-method.patch \ - file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch " - -SRCREV = "460e6421c16a8216d29ccd1b7490f814dab8b769" -S = "${WORKDIR}/git" - -inherit native cmake -LDFLAGS_append = "${@bb.utils.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_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb index 4e4aa6cde3..cbf04734e1 100644 --- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb @@ -6,7 +6,8 @@ implementations for many of the provider operations." HOMEPAGE = "https://github.com/rnovacek/konkretcmpi" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873" -DEPENDS = "swig-native sblim-cmpi-devel python" +DEPENDS_append_class-target = " swig-native sblim-cmpi-devel python" +DEPENDS_append_class-native = " cmpi-bindings-native" SRC_URI = "git://github.com/rnovacek/konkretcmpi.git \ file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch \ @@ -23,6 +24,8 @@ EXTRA_OECMAKE = "-DWITH_PYTHON=ON \ ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " +LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + do_install_append() { rm -rf ${D}${datadir} } @@ -32,3 +35,4 @@ 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/*" +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg