[PATCH 1/2] classes-recipe/setuptools3-base: clean up FILES assignments

[PATCH 1/2] classes-recipe/setuptools3-base: clean up FILES assignments

[Ross Burton]

Simply inheriting setuptools3-base should put everything in $libdir in
PN, and there's no need to replicate the pkgconfig packaging rules as
those are the defaults.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/classes-recipe/setuptools3-base.bbclass | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/meta/classes-recipe/setuptools3-base.bbclass b/meta/classes-recipe/setuptools3-base.bbclass
index 21b688ced07..d1c1fa095fc 100644
--- a/meta/classes-recipe/setuptools3-base.bbclass
+++ b/meta/classes-recipe/setuptools3-base.bbclass
@@ -23,15 +23,8 @@ export CCSHARED  = "-fPIC -DPIC"
 # the python executable
 export LINKFORSHARED = "${SECURITY_CFLAGS} -Xlinker -export-dynamic"
 
-FILES:${PN} += "${libdir}/* ${libdir}/${PYTHON_DIR}/*"
+FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"
+FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a"
+FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
 
-FILES:${PN}-staticdev += "\
-  ${PYTHON_SITEPACKAGES_DIR}/*.a \
-"
-FILES:${PN}-dev += "\
-  ${datadir}/pkgconfig \
-  ${libdir}/pkgconfig \
-  ${PYTHON_SITEPACKAGES_DIR}/*.la \
-"
 inherit python3native python3targetconfig
-
-- 
2.34.1

[PATCH 2/2] bind: don't package non-existant .la files into -staticdev

[Ross Burton]

If these files exist they should be packaged into PN-dev, and are with
the default FILES:${PN}-dev.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-connectivity/bind/bind_9.18.12.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-connectivity/bind/bind_9.18.12.bb b/meta/recipes-connectivity/bind/bind_9.18.12.bb
index abce1c0f459..68dad77cdc8 100644
--- a/meta/recipes-connectivity/bind/bind_9.18.12.bb
+++ b/meta/recipes-connectivity/bind/bind_9.18.12.bb
@@ -109,6 +109,5 @@ PACKAGE_BEFORE_PN += "${PN}-libs"
 # https://github.com/isc-projects/bind9/commit/0e25af628cd776f98c04fc4cc59048f5448f6c88
 FILES_SOLIBSDEV = "${libdir}/*[!0-9].so ${libdir}/libbind9.so"
 FILES:${PN}-libs = "${libdir}/named/*.so* ${libdir}/*-${PV}.so"
-FILES:${PN}-staticdev += "${libdir}/*.la"
 
 DEV_PKG_DEPENDENCY = ""
-- 
2.34.1