Skip to contentSkip to conversation

Correct the packaging of libnl

PATCH In review Peter Kjellerstedt 2 participants 3 messages Apr 6, 2016 – Apr 7, 2016

lore
Share & tools
lore
#0 lore raw

cover Correct the packaging of libnl

This corrects the packaging of libnl so that the modules that belong in libnl-cli actually ends up there and not in libnl-dev.

//Peter

The following changes since commit c1157400ab6f5cb0f057bd07e55c4790499107ed:

bitbake: fetch2/git.py: remove .indirectiondir workaround (2016-04-06 10:29:47 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib pkj/libnl
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=pkj/libnl

Peter Kjellerstedt (1):
libnl: Make sure files end up in libnl-cli as they should

 meta/recipes-support/libnl/libnl_3.2.25.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 libnl: Make sure files end up in libnl-cli as they should

The modules that belong to libnl-cli ended up in libnl-dev since the latter appeared earlier in PACKAGES than the former. This also avoids warnings like the following:

WARNING: libnl-1_3.2.25-r1 do_package: libnl-dev-3.2.25 was registered as shlib provider for basic.so, changing it to libnl-cli-3.2.25 because it was built later

---
 meta/recipes-support/libnl/libnl_3.2.25.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/libnl/libnl_3.2.25.bb +1 -1
index cabe841..a80c23e 100644
@@ -27,7 +27,7 @@ RREPLACES_${PN} = "libnl2"
 RCONFLICTS_${PN} = "libnl2"
 FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a"
 
-PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl ${PN}-idiag"
+PACKAGES =+ "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl ${PN}-idiag"
 FILES_${PN}-cli   = "${libdir}/libnl-cli-3.so.* \
                      ${libdir}/libnl/cli/*/*.so \
                      ${libdir}/libnl/cli/*/*.la \
Signature · 1 line
2.1.0
#2 lore raw

Re: [PATCH 1/1] libnl: Make sure files end up in libnl-cli as they should

Quoted 4 lines · Peter Kjellerstedt

The modules that belong to libnl-cli ended up in libnl-dev since the latter appeared earlier in PACKAGES than the former. This also avoids warnings like the following:

This doesn't result in any files moving around for me. In particular, libnl-cli contains /usr/lib/libnl/cli/cls/basic.so.

Ross