p11-kit: packaging rewrite

p11-kit is actually a library, pluggable modules, and some helper tools.

Add new packages -bin -modules and -remote to package up the pieces
separately, and leave just the library in the main package.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-support/p11-kit/p11-kit_0.26.2.bb b/meta/recipes-support/p11-kit/p11-kit_0.26.2.bb
index 69fb76658ea407af5d5f679c061b2888f04a97b5..ea636bfb0a808d2cf7df58284c2e0b88609e0766 100644 (file)
--- a/meta/recipes-support/p11-kit/p11-kit_0.26.2.bb
+++ b/meta/recipes-support/p11-kit/p11-kit_0.26.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://p11-glue.github.io/p11-glue/p11-kit.html"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50"
 
-inherit meson gettext pkgconfig gtk-doc bash-completion manpages
+inherit meson gettext pkgconfig gtk-doc bash-completion manpages lib_package
 
 DEPENDS = "libffi"
 
@@ -26,15 +26,22 @@ EXTRA_OEMESON = "\
 
 GTKDOC_MESON_OPTION = 'gtk_doc'
 
-FILES:${PN} += " \
+PACKAGES =+ "${PN}-modules ${PN}-remote"
+
+FILES:${PN}-bin += "${libexecdir}/p11-kit/trust-extract-compat"
+
+FILES:${PN}-modules = "\
+    ${datadir}/p11-kit/modules \
     ${libdir}/p11-kit-proxy.so \
-    ${libdir}/pkcs11/*.so \
-    ${libdir}/pkcs11/*.la \
-    ${datadir} \
-    ${systemd_user_unitdir}/*"
+    ${libdir}/pkcs11"
+
+# p11-kit-proxy.so, a symlink to a loadable module
+INSANE_SKIP:${PN}-modules = "dev-so"
 
-# PN contains p11-kit-proxy.so, a symlink to a loadable module
-INSANE_SKIP:${PN} = "dev-so"
+FILES:${PN}-remote = "\
+    ${libexecdir}/p11-kit/p11-kit-remote \
+    ${libexecdir}/p11-kit/p11-kit-server \
+    ${systemd_user_unitdir}"
 
 BBCLASSEXTEND = "native nativesdk"