[oe][meta-oe][dunfell 1/2] gattlib: remove includedir from base package

[oe][meta-oe][dunfell 1/2] gattlib: remove includedir from base package

[Steve Sakoman]

From: Konrad Weihmann <kweihmann@outlook.com>

as it's already packaged to ${PN}-dev, so the setting was
without any effect anyway

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1d26b2656b87a95b72d674954283ac014da8793b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta-oe/recipes-connectivity/gattlib/gattlib_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
index 6b4decce5..d79dbed87 100644
--- a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
+++ b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
@@ -28,5 +28,5 @@ EXTRA_OECMAKE += "-DGATTLIB_BUILD_DOCS=OFF"
 
 inherit pkgconfig cmake
 
-FILES_${PN} = "${libdir}/* ${includedir}/*"
+FILES_${PN} = "${libdir}/*"
 FILES_${PN}-dev = "${includedir}/*"
-- 
2.25.1

[oe][meta-oe][dunfell 2/2] gattlib: Place pkgconfig file in correct package

[Steve Sakoman]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

Fixes in OE-Core added some pkgconfig dependencies back and this flagged
that the .pc file was in ${PN}, not ${PN}-dev. Fix that.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit e9b3476ad9964210d5cdbce4d11b31b50738a4b6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta-oe/recipes-connectivity/gattlib/gattlib_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
index d79dbed87..f2da88aa2 100644
--- a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
+++ b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
@@ -29,4 +29,4 @@ EXTRA_OECMAKE += "-DGATTLIB_BUILD_DOCS=OFF"
 inherit pkgconfig cmake
 
 FILES_${PN} = "${libdir}/*"
-FILES_${PN}-dev = "${includedir}/*"
+FILES_${PN}-dev = "${includedir}/* ${libdir}/pkgconfig"
-- 
2.25.1