summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorAndré Draszik <git@andred.net>2016-08-26 11:31:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 09:58:25 +0100
commit57ddcbde8aad2a2d37619e11a0cd2e9b8d9fb239 (patch)
tree702092decb50c6309be8cd52c970c1b7f11d651f /meta
parent12a8ee44f05e21d5814e31cb9e13c9eab236b836 (diff)
downloadopenembedded-core-57ddcbde8aad2a2d37619e11a0cd2e9b8d9fb239.tar.gz
openembedded-core-57ddcbde8aad2a2d37619e11a0cd2e9b8d9fb239.tar.bz2
openembedded-core-57ddcbde8aad2a2d37619e11a0cd2e9b8d9fb239.zip
libnl: fix packaging mistakes
- *.la files belong into -dev packages - the genl-ctrl-list command line utility should go to into the CLI package, so as to prevent the libnl-genl library package from pulling in all of the command line utilities (as genl-ctrl-list is linked against libnl-cli-3.so.200) Signed-off-by: André Draszik <git@andred.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libnl/libnl_3.2.25.bb12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-support/libnl/libnl_3.2.25.bb b/meta/recipes-support/libnl/libnl_3.2.25.bb
index cabe84107c..26249154a0 100644
--- a/meta/recipes-support/libnl/libnl_3.2.25.bb
+++ b/meta/recipes-support/libnl/libnl_3.2.25.bb
@@ -25,18 +25,18 @@ FILES_${PN} = "${libdir}/libnl-3.so.* \
${sysconfdir}"
RREPLACES_${PN} = "libnl2"
RCONFLICTS_${PN} = "libnl2"
+FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.la"
FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a"
-PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl ${PN}-idiag"
+PACKAGES += "${PN}-cli ${PN}-genl ${PN}-idiag ${PN}-nf ${PN}-route"
FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \
${libdir}/libnl/cli/*/*.so \
- ${libdir}/libnl/cli/*/*.la \
+ ${sbindir}/genl-ctrl-list \
${sbindir}/nl-*"
-FILES_${PN}-route = "${libdir}/libnl-route-3.so.*"
+FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \
+ ${libdir}/libnl-genl.so.*"
FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*"
FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*"
-FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \
- ${libdir}/libnl-genl.so.* \
- ${sbindir}/genl-ctrl-list"
+FILES_${PN}-route = "${libdir}/libnl-route-3.so.*"
RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200"
RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200"