summaryrefslogtreecommitdiffstats
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:37 +0100
commitd1c566f71e187b8ca2b8724576ae91b641f517af (patch)
treeaad1ba6188d72084f6069d0ac2d108bfb76501a5
parent5dcb2a1999e1773bbaa18e46d81159b4a181a7ac (diff)
downloadpoky-d1c566f71e187b8ca2b8724576ae91b641f517af.tar.gz
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) (From OE-Core rev: 57ddcbde8aad2a2d37619e11a0cd2e9b8d9fb239) Signed-off-by: André Draszik <git@andred.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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.* \
25 ${sysconfdir}" 25 ${sysconfdir}"
26RREPLACES_${PN} = "libnl2" 26RREPLACES_${PN} = "libnl2"
27RCONFLICTS_${PN} = "libnl2" 27RCONFLICTS_${PN} = "libnl2"
28FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.la"
28FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" 29FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a"
29 30
30PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl ${PN}-idiag" 31PACKAGES += "${PN}-cli ${PN}-genl ${PN}-idiag ${PN}-nf ${PN}-route"
31FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \ 32FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \
32 ${libdir}/libnl/cli/*/*.so \ 33 ${libdir}/libnl/cli/*/*.so \
33 ${libdir}/libnl/cli/*/*.la \ 34 ${sbindir}/genl-ctrl-list \
34 ${sbindir}/nl-*" 35 ${sbindir}/nl-*"
35FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" 36FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \
37 ${libdir}/libnl-genl.so.*"
36FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*" 38FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*"
37FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*" 39FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*"
38FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \ 40FILES_${PN}-route = "${libdir}/libnl-route-3.so.*"
39 ${libdir}/libnl-genl.so.* \
40 ${sbindir}/genl-ctrl-list"
41RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200" 41RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200"
42RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200" 42RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200"