[meta-oe][master-next][PATCH v3 00/17] rely on cmake.bbclass to put cmake package files in dev package

[meta-oe][master-next][PATCH v3 00/17] rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

v3:
- break patches back up into individual patches for each recipe
- avoid including fftw
- find a couple extra recipes to patch:
	libwebsockets
	opencv
	libeigen

v2:
- re-spin Andre's patches to only include this change
  (i.e. rely on cmake.bbclass) without any formatting changes
- re-base on top of master-next (changes location of grpc)
- combine all such patches together into 2 patches
  (one for meta-oe, one for meta-networking)

v1:
- Andre's original patchset

Trevor Woerner (17):
  openobex: rely on cmake.bbclass to put cmake package files in dev package
  rocksdb: rely on cmake.bbclass to put cmake package files in dev package
  capnproto: rely on cmake.bbclass to put cmake package files in dev package
  json-spirit: rely on cmake.bbclass to put cmake package files in dev package
  librcf: rely on cmake.bbclass to put cmake package files in dev package
  msgpack_c: rely on cmake.bbclass to put cmake package files in dev package
  rapidjson: rely on cmake.bbclass to put cmake package files in dev package
  glm: rely on cmake.bbclass to put cmake package files in dev package
  openjpeg: rely on cmake.bbclass to put cmake package files in dev package
  ceres-solver: rely on cmake.bbclass to put cmake package files in dev package
  gflags: rely on cmake.bbclass to put cmake package files in dev package
  libftdi: rely on cmake.bbclass to put cmake package files in dev package
  libssh: rely on cmake.bbclass to put cmake package files in dev package
  libtinyxml2: rely on cmake.bbclass to put cmake package files in dev package
  libwebsockets: rely on cmake.bbclass to put cmake package files in dev package
  opencv: rely on cmake.bbclass to put cmake package files in dev package
  libeigen: rely on cmake.bbclass to put cmake package files in dev package

 .../recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb   | 1 -
 meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb             | 2 +-
 meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb                      | 2 --
 meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb           | 1 -
 meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb        | 2 --
 meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb               | 1 -
 meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb             | 2 --
 meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb             | 1 -
 meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb                    | 1 -
 meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb             | 2 --
 meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb       | 2 --
 meta-oe/recipes-support/gflags/gflags_2.2.0.bb                  | 2 --
 meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb              | 2 +-
 meta-oe/recipes-support/libftdi/libftdi_1.4.bb                  | 2 --
 meta-oe/recipes-support/libssh/libssh_0.7.3.bb                  | 1 -
 meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb        | 2 --
 meta-oe/recipes-support/opencv/opencv_3.3.bb                    | 2 +-
 17 files changed, 3 insertions(+), 25 deletions(-)

-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 01/17] openobex: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb
index 1b56685c57..dcc2edf76e 100644
--- a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb
+++ b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb
@@ -34,7 +34,7 @@ do_install_append () {
 PACKAGES =+ "openobex-apps"
 FILES_${PN}-apps = "${bindir}/*"
 FILES_${PN} += "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}/openobex-config ${libdir}/cmake"
+FILES_${PN}-dev += "${bindir}/openobex-config"
 DEBIAN_NOAUTONAME_${PN}-apps = "1"
 
 BBCLASSEXTEND = "native"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 02/17] rocksdb: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
index 9a2f9dd1c5..a3b06fd133 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
@@ -30,5 +30,3 @@ EXTRA_OECMAKE = "\
     -DWITH_TESTS=OFF \
     -DWITH_TOOLS=OFF \
 "
-
-FILES_${PN}-dev += "${libdir}/cmake"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 03/17] capnproto: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb b/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb
index ffbe73feee..dfe19947c0 100644
--- a/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb
+++ b/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb
@@ -20,7 +20,6 @@ S = "${WORKDIR}/git/c++"
 PACKAGE_BEFORE_PN = "${PN}-compiler"
 RDEPENDS_${PN}-dev += "${PN}-compiler"
 
-FILES_${PN}-dev += "${libdir}/cmake"
 FILES_${PN}-compiler = "${bindir}"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 04/17] json-spirit: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
index c7c1ad1eca..3c1d8a9959 100644
--- a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
+++ b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
@@ -20,6 +20,4 @@ DEPENDS = "boost"
 
 inherit cmake
 
-FILES_${PN}-dev += "${datadir}/cmake/Modules/FindLibJsonSpirit.cmake"
-
 BBCLASSEXTEND = "nativesdk"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 05/17] librcf: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb
index 267c0e79f5..dcd47a4e69 100644
--- a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb
+++ b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb
@@ -47,7 +47,6 @@ PACKAGECONFIG[demos] = "-DLIBRCF_BUILD_DEMOS=ON,-DLIBRCF_BUILD_DEMOS=OFF,"
 PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'demos', '${PN}-demos', '', d)}"
 
 FILES_${PN}-demos = "${bindir}/*"
-FILES_${PN}-dev += "${datadir}/cmake/Modules/FindLibRcf.cmake"
 
 BBCLASSEXTEND = "nativesdk"
 
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 06/17] msgpack_c: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb
index 02c0cd2964..3ae4c1f879 100644
--- a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb
+++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb
@@ -18,5 +18,3 @@ SRC_URI = "git://github.com/msgpack/msgpack-c \
 inherit cmake pkgconfig
 
 S = "${WORKDIR}/git"
-
-FILES_${PN}-dev += "${libdir}/cmake/msgpack/*.cmake"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 07/17] rapidjson: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
index 8ab35d224b..069385d5b0 100644
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
+++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
@@ -20,7 +20,6 @@ EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJ
 
 # RapidJSON is a header-only C++ library, so the main package will be empty.
 
-FILES_${PN}-dev += "${libdir}/cmake"
 RDEPENDS_${PN}-dev = ""
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 08/17] glm: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb
index 4e2ee23787..dc0081d031 100644
--- a/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb
+++ b/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb
@@ -22,7 +22,6 @@ inherit cmake
 
 EXTRA_OECMAKE = "-DGLM_ENABLE_EXPERIMENTAL=ON"
 
-FILES_${PN}-dev += "${libdir}/cmake"
 RDEPENDS_${PN}-dev = ""
 
 BBCLASSEXTEND = "native"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 09/17] openjpeg: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb
index 4ef1c408fd..f749d62342 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb
@@ -17,5 +17,3 @@ DEPENDS = "libpng tiff lcms zlib"
 # standard path for *.cmake
 EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_PACKAGE_DIR=${baselib}/cmake \
                   -DOPENJPEG_INSTALL_LIB_DIR:PATH=${libdir}"
-
-FILES_${PN}-dev += "${libdir}/cmake/*.cmake"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 10/17] ceres-solver: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb
index 29917c8a14..a3444b934c 100644
--- a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb
+++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb
@@ -16,5 +16,3 @@ inherit cmake
 
 # Only a static library and headers are created
 ALLOW_EMPTY_${PN} = "1"
-
-FILES_${PN}-dev += "${libdir}/cmake/*"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 11/17] gflags: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.0.bb b/meta-oe/recipes-support/gflags/gflags_2.2.0.bb
index 28b652a640..b186326e9b 100644
--- a/meta-oe/recipes-support/gflags/gflags_2.2.0.bb
+++ b/meta-oe/recipes-support/gflags/gflags_2.2.0.bb
@@ -10,8 +10,6 @@ SRCREV = "f8a0efe03aa69b3336d8e228b37d4ccb17324b88"
 
 S = "${WORKDIR}/git"
 
-FILES_${PN}-dev += "${libdir}/cmake"
-
 inherit cmake
 
 EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 12/17] libftdi: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-support/libftdi/libftdi_1.4.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.4.bb b/meta-oe/recipes-support/libftdi/libftdi_1.4.bb
index 6bea16582f..a1576b5617 100644
--- a/meta-oe/recipes-support/libftdi/libftdi_1.4.bb
+++ b/meta-oe/recipes-support/libftdi/libftdi_1.4.bb
@@ -26,6 +26,4 @@ inherit cmake binconfig pkgconfig
 
 EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
 
-FILES_${PN}-dev += "${libdir}/cmake"
-
 BBCLASSEXTEND = "native"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 13/17] libssh: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-support/libssh/libssh_0.7.3.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb b/meta-oe/recipes-support/libssh/libssh_0.7.3.bb
index 79e7dc5998..e5ea2b8bfa 100644
--- a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb
+++ b/meta-oe/recipes-support/libssh/libssh_0.7.3.bb
@@ -30,5 +30,4 @@ do_configure_prepend () {
         || bbfatal "Failed to disable examples"
 }
 
-FILES_${PN}-dev += "${libdir}/cmake"
 TOOLCHAIN = "gcc"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 14/17] libtinyxml2: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
index 8b5ab44fdd..c763a6c2b3 100644
--- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
+++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
@@ -12,6 +12,4 @@ S = "${WORKDIR}/git"
 
 inherit cmake
 
-FILES_${PN}-dev += "${libdir}/cmake/"
-
 BBCLASSEXTEND = "native"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 15/17] libwebsockets: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 .../recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb
index ea262f855b..f38414862a 100644
--- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb
+++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb
@@ -23,5 +23,4 @@ PACKAGECONFIG[testapps] = "-DLWS_WITHOUT_TESTAPPS=OFF,-DLWS_WITHOUT_TESTAPPS=ON,
 
 PACKAGES =+ "${PN}-testapps"
 
-FILES_${PN}-dev += "${libdir}/cmake"
 FILES_${PN}-testapps += "${datadir}/libwebsockets-test-server/*"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 16/17] opencv: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-support/opencv/opencv_3.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb b/meta-oe/recipes-support/opencv/opencv_3.3.bb
index ca62de7c8f..1cadbdb533 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.3.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.3.bb
@@ -167,7 +167,7 @@ PACKAGES_DYNAMIC += "^libopencv-.*"
 
 FILES_${PN} = ""
 FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*"
-FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake"
+FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig"
 FILES_${PN}-staticdev += "${datadir}/OpenCV/3rdparty/lib/*.a"
 FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV"
 FILES_${PN}-java = "${datadir}/OpenCV/java"
-- 
2.17.0.582.gccdcbd54c

[meta-oe][master-next][PATCH v3 17/17] libeigen: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb b/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb
index bc3b32e384..2ffaea63ad 100644
--- a/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb
+++ b/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/eigen-eigen-5a0156e40feb"
 inherit cmake
 
 FILES_${PN} = "${includedir} ${libdir}"
-FILES_${PN}-dev = "${datadir}/eigen3/cmake ${datadir}/cmake/Modules ${datadir}/pkgconfig"
+FILES_${PN}-dev = "${datadir}/pkgconfig"
 
 # ${PN} is empty so we need to tweak -dev and -dbg package dependencies
 RDEPENDS_${PN}-dev = ""
-- 
2.17.0.582.gccdcbd54c

Re: [meta-oe][master-next][PATCH v3 16/17] opencv: rely on cmake.bbclass to put cmake package files in dev package

[Anuj Mittal]

On 05/24/2018 10:38 PM, Trevor Woerner wrote:
> The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
> ${datadir}/cmake end up in the dev package, so recipes no longer need to
> provide custom packaging rules to handles these files.
> 
> 	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93
> 
> Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  meta-oe/recipes-support/opencv/opencv_3.3.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb b/meta-oe/recipes-support/opencv/opencv_3.3.bb
> index ca62de7c8f..1cadbdb533 100644
> --- a/meta-oe/recipes-support/opencv/opencv_3.3.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_3.3.bb
> @@ -167,7 +167,7 @@ PACKAGES_DYNAMIC += "^libopencv-.*"
>  
>  FILES_${PN} = ""
>  FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*"
> -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake"

${datadir}/OpenCV/*.cmake won't be handled by the bbclass and if you
remove this change, *.cmake files in OpenCV directory will go to
${PN}-apps which is probably not the intention here.

Re: [meta-oe][master-next][PATCH v3 16/17] opencv: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

On Thu, May 24, 2018 at 11:19 PM, Anuj Mittal <anuj.mittal@intel.com> wrote:

> On 05/24/2018 10:38 PM, Trevor Woerner wrote:
> > The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
> > ${datadir}/cmake end up in the dev package, so recipes no longer need to
> > provide custom packaging rules to handles these files.
> >
> >       http://git.openembedded.org/openembedded-core/commit/?id=
> d91dc4666683a96e9d03cbbd21b8a546f9069c93
> >
> > Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
> > Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> > ---
> >  meta-oe/recipes-support/opencv/opencv_3.3.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb
> b/meta-oe/recipes-support/opencv/opencv_3.3.bb
> > index ca62de7c8f..1cadbdb533 100644
> > --- a/meta-oe/recipes-support/opencv/opencv_3.3.bb
> > +++ b/meta-oe/recipes-support/opencv/opencv_3.3.bb
> > @@ -167,7 +167,7 @@ PACKAGES_DYNAMIC += "^libopencv-.*"
> >
> >  FILES_${PN} = ""
> >  FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/*
> ${datadir}/OpenCV/samples/bin/.debug/*"
> > -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig
> ${datadir}/OpenCV/*.cmake"
>
> ${datadir}/OpenCV/*.cmake won't be handled by the bbclass and if you
> remove this change, *.cmake files in OpenCV directory will go to
> ${PN}-apps which is probably not the intention here.
>

Good catch, thank you!

Re: [meta-oe][master-next][PATCH v3 17/17] libeigen: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

As Anuj pointed out with patch 16/17 of this series (opencv: rely on
cmake.bbclass...), so too is this patch wrong and shouldn't be applied.
Sorry!

Looking closer at this recipe (on an unrelated issue) do we really want the
include files being part of FILES_${PN}?

Re: [meta-oe][master-next][PATCH v3 17/17] libeigen: rely on cmake.bbclass to put cmake package files in dev package

[Andre McCurdy]

On Fri, May 25, 2018 at 8:22 AM, Trevor Woerner <twoerner@gmail.com> wrote:
> As Anuj pointed out with patch 16/17 of this series (opencv: rely on
> cmake.bbclass...), so too is this patch wrong and shouldn't be applied.
> Sorry!
>
> Looking closer at this recipe (on an unrelated issue) do we really want the
> include files being part of FILES_${PN}?

No, we don't. It looks like it's been done that way as a workaround
for the libeigen build not creating anything which would normally go
in the main package. Setting:

  ALLOW_EMPTY_${PN} = "1"

together with careful review of the packaging rules and probably
removing the RDEPENDS and RRECOMMENDS over-rides may be a better
solution.

You should also carefully check that things work as expected when
libeigen is added to an SDK. That's a corner case which tests
dependencies between runtime and -dev packages which isn't tested
during a normal build (for what it's worth, creating an empty runtime
package by using ALLOW_EMPTY_${PN} = "1" has always been the easiest
solution whenever I've looked into this kind of issue in the past and
it "just works" for the SDK case).

Re: [meta-oe][master-next][PATCH v3 17/17] libeigen: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

On Fri, May 25, 2018 at 3:58 PM, Andre McCurdy <armccurdy@gmail.com> wrote:

> On Fri, May 25, 2018 at 8:22 AM, Trevor Woerner <twoerner@gmail.com>
> wrote:
> > As Anuj pointed out with patch 16/17 of this series (opencv: rely on
> > cmake.bbclass...), so too is this patch wrong and shouldn't be applied.
> > Sorry!
> >
> > Looking closer at this recipe (on an unrelated issue) do we really want
> the
> > include files being part of FILES_${PN}?
>
> No, we don't. It looks like it's been done that way as a workaround
> for the libeigen build not creating anything which would normally go
> in the main package. Setting:
>
>   ALLOW_EMPTY_${PN} = "1"
>
> together with careful review of the packaging rules and probably
> removing the RDEPENDS and RRECOMMENDS over-rides may be a better
> solution.
>
> You should also carefully check that things work as expected when
> libeigen is added to an SDK. That's a corner case which tests
> dependencies between runtime and -dev packages which isn't tested
> during a normal build (for what it's worth, creating an empty runtime
> package by using ALLOW_EMPTY_${PN} = "1" has always been the easiest
> solution whenever I've looked into this kind of issue in the past and
> it "just works" for the SDK case).
>

Sounds good; I'll take a look. Thanks!

Re: [meta-oe][master-next][PATCH v3 17/17] libeigen: rely on cmake.bbclass to put cmake package files in dev package

[Trevor Woerner]

On Fri, May 25, 2018 at 10:45 PM, Trevor Woerner <twoerner@gmail.com> wrote:

> Sounds good; I'll take a look. Thanks!
>

Oops, spoke too soon; looks like someone beat me to it :-)

Re: [meta-oe][master-next][PATCH v3 17/17] libeigen: rely on cmake.bbclass to put cmake package files in dev package

[Khem Raj]

it was in queue so ran through it

ERROR: libeigen-3.3.4-r0 do_package: QA Issue: libeigen:
Files/directories were installed but not shipped in any package:
  /usr/share/eigen3
  /usr/share/eigen3/cmake
  /usr/share/eigen3/cmake/Eigen3Config.cmake
  /usr/share/eigen3/cmake/UseEigen3.cmake
  /usr/share/eigen3/cmake/Eigen3Targets.cmake
  /usr/share/eigen3/cmake/Eigen3ConfigVersion.cmake


It seems you need to keep

${datadir}/eigen3 added to FILES_${PN}-dev


On Fri, May 25, 2018 at 7:49 PM, Trevor Woerner <twoerner@gmail.com> wrote:
> On Fri, May 25, 2018 at 10:45 PM, Trevor Woerner <twoerner@gmail.com> wrote:
>
>> Sounds good; I'll take a look. Thanks!
>>
>
> Oops, spoke too soon; looks like someone beat me to it :-)
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel