From 096d2f11414dbbe927a98bb00085ae79c0ff1b88 Mon Sep 17 00:00:00 2001 From: Jason Andryuk Date: Thu, 12 Oct 2023 14:18:56 -0400 Subject: [PATCH] findlib: Selectively add to FILES Instead of clobbering existing packaging rules, just append the sitelib rules to the existing one. This helps with moving the ocaml build into xen-tools where there is lots of packaging going on, and dropping the default packaging rules results in lots of unpackaged files. Signed-off-by: Jason Andryuk --- classes/findlib.bbclass | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/classes/findlib.bbclass b/classes/findlib.bbclass index 3ef6f05..553991c 100644 --- a/classes/findlib.bbclass +++ b/classes/findlib.bbclass @@ -13,24 +13,21 @@ export sitelibdir OCAMLFIND_CONF = "${STAGING_DIR_NATIVE}/etc/findlib.conf" export OCAMLFIND_CONF -FILES_${PN} = " \ +FILES_${PN} += " \ ${sitelibdir}/*/*${SOLIBSDEV} \ - ${bindir}/* \ - ${sbindir}/* \ " -FILES_${PN}-dev = " \ +FILES_${PN}-dev += " \ ${sitelibdir}/*/*.cm* \ ${sitelibdir}/*/*.mli \ ${sitelibdir}/*/META \ " -FILES_${PN}-staticdev = " \ +FILES_${PN}-staticdev += " \ ${sitelibdir}/*/*.a \ " -FILES_${PN}-dbg = " \ +FILES_${PN}-dbg += " \ ${sitelibdir}/*/.debug \ ${bindir}/.debug \ ${sbindir}/.debug \ - /usr/src/debug \ " do_amend_findlib_conf() {