fsharp was failing the 'debug-deps' QA test, i.e. fsharp depended on fsharp-dbg because fsharp's file list included files that properly belong to fsharp-dbg. Fix this by being more explicit about the types of files that ship in fsharp vs fsharp-dbg.
Generalize file patterns as appropriate to make file lists more concise and robust; i.e. replace mono/4.0/*, mono/2.0/* with mono/*/*. Move .xml (machine-readable assembly docs), .rsp, .Targets, etc. into fsharp-dev. Signed-off-by: Richard Tollerton <rich.toller...@ni.com> --- recipes-mono/fsharp/fsharp.inc | 52 +++++++++++++----------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/recipes-mono/fsharp/fsharp.inc b/recipes-mono/fsharp/fsharp.inc index acb17ce..25c41b6 100644 --- a/recipes-mono/fsharp/fsharp.inc +++ b/recipes-mono/fsharp/fsharp.inc @@ -12,45 +12,25 @@ inherit autotools-brokensep SRC_URI = "https://github.com/fsharp/fsharp/archive/${PV}.tar.gz" FILES_${PN} += "\ - ${libdir}/mono/* \ - ${libdir}/mono/4.0/* \ - ${libdir}/mono/2.0/* \ - ${libdir}/mono/xbuild/Microsoft/VisualStudio/* \ - ${libdir}/mono/Microsoft F#/v4.0/* \ - ${libdir}/mono/Microsoft SDKs/F#/3.0/* \ - ${libdir}/mono/Microsoft SDKs/F#/3.1/* \ - ${libdir}/mono/gac/* \ - ${libdir}/mono/gac/*/* \ - ${libdir}/mono/gac/*/*/* \ - ${libdir}/mono/monotouch/* \ - ${libdir}/mono/monodroid/* \ + ${libdir}/mono/*/*.exe \ + ${libdir}/mono/*/*.dll \ + ${libdir}/mono/*/*.config \ + ${libdir}/mono/*/*.optdata \ + ${libdir}/mono/*/*.sigdata \ + ${libdir}/mono/gac/*/*/*.config \ + ${libdir}/mono/gac/*/*/*.optdata \ + ${libdir}/mono/gac/*/*/*.sigdata \ " FILES_${PN}-dbg += "\ - ${libdir}/mono/*.mdb \ - ${libdir}/mono/4.0/*.mdb \ - ${libdir}/mono/4.0/*.optdata \ - ${libdir}/mono/4.0/*.sigdatadata \ - ${libdir}/mono/2.0/*.mdb \ - ${libdir}/mono/2.0/*.optdata \ - ${libdir}/mono/2.0/*.sigdata \ - ${libdir}/mono/xbuild/Microsoft/VisualStudio/*.mdb \ - ${libdir}/mono/Microsoft F#/v4.0/*.mdb \ - ${libdir}/mono/Microsoft SDKs/F#/3.0/*.mdb \ - ${libdir}/mono/Microsoft SDKs/F#/3.1/*.mdb \ - ${libdir}/mono/gac/*.mdb \ - ${libdir}/mono/gac/*/*.mdb \ ${libdir}/mono/gac/*/*/*.mdb \ - ${libdir}/mono/gac/*/*/*.xml \ - ${libdir}/mono/gac/*/*/*.optdata \ - ${libdir}/mono/gac/*/*/*.sigdata \ - ${libdir}/mono/monotouch/*.mdb \ - ${libdir}/mono/monotouch/*.xml \ - ${libdir}/mono/monotouch/*.sigdata \ - ${libdir}/mono/monotouch/*.optdata \ - ${libdir}/mono/monodroid/*.mdb \ - ${libdir}/mono/monodroid/*.xml \ - ${libdir}/mono/monodroid/*.optdata \ - ${libdir}/mono/monodroid/*.sigdata \ " +FILES_${PN}-dev = "\ + ${libdir}/mono/xbuild/* \ + ${libdir}/mono/xbuild-frameworks/* \ + ${libdir}/mono/Microsoft* \ + ${libdir}/mono/*/*.Targets \ + ${libdir}/mono/*/*.xml \ + ${libdir}/mono/gac/*/*/*.xml \ +" -- 2.4.4 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto