From dc1d7d8b099aaca2ded66dda1cced67d275f13f6 Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Fri, 2 Sep 2016 19:03:45 +0300 Subject: ostree_git.bb: Bug fixes Fixes for OSTree recipe: * Export staging directories, host and build system, * Deploy installed files in /usr/lib and /usr/share. Bug-AGL: SPEC-194 Change-Id: Ieda8c03f24c571827e91b0e72acad515f0cf14ff Signed-off-by: Leon Anavi --- meta-sota/recipes-sota/ostree/ostree_git.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta-sota/recipes-sota/ostree/ostree_git.bb b/meta-sota/recipes-sota/ostree/ostree_git.bb index 37a2445..e085df0 100644 --- a/meta-sota/recipes-sota/ostree/ostree_git.bb +++ b/meta-sota/recipes-sota/ostree/ostree_git.bb @@ -22,11 +22,19 @@ FILES_${PN} += "${libdir}/ostree/ ${libdir}/ostbuild" BBCLASSEXTEND = "native" +export STAGING_INCDIR +export STAGING_LIBDIR + do_configure() { NOCONFIGURE=true ./autogen.sh oe_runconf } +do_compile_prepend() { + export BUILD_SYS="${BUILD_SYS}" + export HOST_SYS="${HOST_SYS}" +} + do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -p -D ${S}/src/boot/ostree-prepare-root.service ${D}${systemd_unitdir}/system/ostree-prepare-root.service @@ -37,5 +45,9 @@ do_install_append() { SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service" FILES_${PN} += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/', '', d)} \ + ${datadir}/gir-1.0 \ + ${datadir}/gir-1.0/OSTree-1.0.gir \ ${libdir}/dracut/ \ + ${libdir}/girepository-1.0 \ + ${libdir}/girepository-1.0/OSTree-1.0.typelib \ " -- cgit 1.2.3-korg