Skip to contentSkip to conversation

rely on cmake.bbclass to put cmake package files in dev package

PATCH In review Trevor Woerner 4 participants 25 messages May 24, 2018 – May 29, 2018

lore
Share & tools
lore
#0 lore raw

v3 cover rely on cmake.bbclass to put cmake package files in dev package

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(-)
Signature · 1 line
2.17.0.582.gccdcbd54c
#1 lore raw

PATCH v3 1/17 openobex: rely on cmake.bbclass to put cmake package files in dev package

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
---
 meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb +1 -1
index 1b56685c57..dcc2edf76e 100644
@@ -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"
Signature · 1 line
2.17.0.582.gccdcbd54c
#2 lore raw

PATCH v3 2/17 rocksdb: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 2 --
 1 file changed, 2 deletions(-)
meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +0 -2
index 9a2f9dd1c5..a3b06fd133 100644
@@ -30,5 +30,3 @@ EXTRA_OECMAKE = "\
     -DWITH_TESTS=OFF \
     -DWITH_TOOLS=OFF \
 "
-
-FILES_${PN}-dev += "${libdir}/cmake"
Signature · 1 line
2.17.0.582.gccdcbd54c
#3 lore raw

PATCH v3 3/17 capnproto: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb | 1 -
 1 file changed, 1 deletion(-)
meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb +0 -1
index ffbe73feee..dfe19947c0 100644
@@ -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"
Signature · 1 line
2.17.0.582.gccdcbd54c
#4 lore raw

PATCH v3 4/17 json-spirit: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb | 2 --
 1 file changed, 2 deletions(-)
meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb +0 -2
index c7c1ad1eca..3c1d8a9959 100644
@@ -20,6 +20,4 @@ DEPENDS = "boost"
 
 inherit cmake
 
-FILES_${PN}-dev += "${datadir}/cmake/Modules/FindLibJsonSpirit.cmake"
-
 BBCLASSEXTEND = "nativesdk"
Signature · 1 line
2.17.0.582.gccdcbd54c
#5 lore raw

PATCH v3 5/17 librcf: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb | 1 -
 1 file changed, 1 deletion(-)
meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb +0 -1
index 267c0e79f5..dcd47a4e69 100644
@@ -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"
 
Signature · 1 line
2.17.0.582.gccdcbd54c
#6 lore raw

PATCH v3 6/17 msgpack_c: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb | 2 --
 1 file changed, 2 deletions(-)
meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb +0 -2
index 02c0cd2964..3ae4c1f879 100644
@@ -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"
Signature · 1 line
2.17.0.582.gccdcbd54c
#7 lore raw

PATCH v3 7/17 rapidjson: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | 1 -
 1 file changed, 1 deletion(-)
meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +0 -1
index 8ab35d224b..069385d5b0 100644
@@ -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"
Signature · 1 line
2.17.0.582.gccdcbd54c
#8 lore raw

PATCH v3 8/17 glm: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb | 1 -
 1 file changed, 1 deletion(-)
meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb +0 -1
index 4e2ee23787..dc0081d031 100644
@@ -22,7 +22,6 @@ inherit cmake
 
 EXTRA_OECMAKE = "-DGLM_ENABLE_EXPERIMENTAL=ON"
 
-FILES_${PN}-dev += "${libdir}/cmake"
 RDEPENDS_${PN}-dev = ""
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.17.0.582.gccdcbd54c
#9 lore raw

PATCH v3 9/17 openjpeg: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb | 2 --
 1 file changed, 2 deletions(-)
meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb +0 -2
index 4ef1c408fd..f749d62342 100644
@@ -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"
Signature · 1 line
2.17.0.582.gccdcbd54c
#10 lore raw

PATCH v3 10/17 ceres-solver: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb | 2 --
 1 file changed, 2 deletions(-)
meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb +0 -2
index 29917c8a14..a3444b934c 100644
@@ -16,5 +16,3 @@ inherit cmake
 
 # Only a static library and headers are created
 ALLOW_EMPTY_${PN} = "1"
-
-FILES_${PN}-dev += "${libdir}/cmake/*"
Signature · 1 line
2.17.0.582.gccdcbd54c
#11 lore raw

PATCH v3 11/17 gflags: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 2 --
 1 file changed, 2 deletions(-)
meta-oe/recipes-support/gflags/gflags_2.2.0.bb +0 -2
index 28b652a640..b186326e9b 100644
@@ -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}"
Signature · 1 line
2.17.0.582.gccdcbd54c
#12 lore raw

PATCH v3 12/17 libftdi: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-support/libftdi/libftdi_1.4.bb | 2 --
 1 file changed, 2 deletions(-)
meta-oe/recipes-support/libftdi/libftdi_1.4.bb +0 -2
index 6bea16582f..a1576b5617 100644
@@ -26,6 +26,4 @@ inherit cmake binconfig pkgconfig
 
 EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
 
-FILES_${PN}-dev += "${libdir}/cmake"
-
 BBCLASSEXTEND = "native"
Signature · 1 line
2.17.0.582.gccdcbd54c
#13 lore raw

PATCH v3 13/17 libssh: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-support/libssh/libssh_0.7.3.bb | 1 -
 1 file changed, 1 deletion(-)
meta-oe/recipes-support/libssh/libssh_0.7.3.bb +0 -1
index 79e7dc5998..e5ea2b8bfa 100644
@@ -30,5 +30,4 @@ do_configure_prepend () {
         || bbfatal "Failed to disable examples"
 }
 
-FILES_${PN}-dev += "${libdir}/cmake"
 TOOLCHAIN = "gcc"
Signature · 1 line
2.17.0.582.gccdcbd54c
#14 lore raw

PATCH v3 14/17 libtinyxml2: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb | 2 --
 1 file changed, 2 deletions(-)
meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb +0 -2
index 8b5ab44fdd..c763a6c2b3 100644
@@ -12,6 +12,4 @@ S = "${WORKDIR}/git"
 
 inherit cmake
 
-FILES_${PN}-dev += "${libdir}/cmake/"
-
 BBCLASSEXTEND = "native"
Signature · 1 line
2.17.0.582.gccdcbd54c
#15 lore raw

PATCH v3 15/17 libwebsockets: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 .../recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb    | 1 -
 1 file changed, 1 deletion(-)
meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb +0 -1
index ea262f855b..f38414862a 100644
@@ -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/*"
Signature · 1 line
2.17.0.582.gccdcbd54c
#16 lore raw

PATCH v3 16/17 opencv: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-support/opencv/opencv_3.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/opencv/opencv_3.3.bb +1 -1
index ca62de7c8f..1cadbdb533 100644
@@ -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"
Signature · 1 line
2.17.0.582.gccdcbd54c
#17 lore raw

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

Quoted 17 lines · 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
---
 meta-oe/recipes-support/opencv/opencv_3.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/opencv/opencv_3.3.bb +0 -0
index ca62de7c8f..1cadbdb533 100644

meta-oe/recipes-support/opencv/opencv_3.3.bb PACKAGES_DYNAMIC += "^libopencv-.*" · line 170

Quoted 4 lines
meta-oe/recipes-support/opencv/opencv_3.3.bb +0 -1
@@ -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.

#18 lore raw

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

Quoted 24 lines · Anuj Mittal
Quoted 5 lines · 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

Review

Quoted 8 lines
---
 meta-oe/recipes-support/opencv/opencv_3.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/meta-oe/recipes-support/opencv/opencv_3.3.bb

meta-oe/recipes-support/opencv/opencv_3.3.bb PACKAGES_DYNAMIC += "^libopencv-.*" · line 169

Quoted 7 lines

index ca62de7c8f..1cadbdb533 100644

meta-oe/recipes-support/opencv/opencv_3.3.bb +0 -0
@@ -167,7 +167,7 @@ PACKAGES_DYNAMIC += "^libopencv-.*"
 
 FILES_${PN} = ""
 FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/*

${datadir}/OpenCV/samples/bin/.debug/*"

Quoted 7 lines

meta-oe/recipes-support/opencv/opencv_3.3.bb PACKAGES_DYNAMIC += "^libopencv-.*" · line 170

Quoted 1 line
meta-oe/recipes-support/opencv/opencv_3.3.bb +0 -1
-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!

#19 lore raw

PATCH v3 17/17 libeigen: rely on cmake.bbclass to put cmake package files in dev package

In reply to 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
---
 meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb +1 -1
index bc3b32e384..2ffaea63ad 100644
@@ -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 = ""
Signature · 1 line
2.17.0.582.gccdcbd54c
#20 lore raw

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

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}?

#21 lore raw

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

Quoted 6 lines · 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}?

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).

#22 lore raw

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

Quoted 20 lines · Andre McCurdy
Quoted 5 lines · 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

Quoted 1 line

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.

Quoted 8 lines

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!

#23 lore raw

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

Quoted 2 lines · Trevor Woerner

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

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

#24 lore raw

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

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

Quoted 11 lines · Trevor Woerner
Quoted 2 lines · Trevor Woerner

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

Oops, spoke too soon; looks like someone beat me to it :-) --
_______________________________________________
Openembedded-devel mailing list [email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel