From a41e5f7eefb9557f6e8712630e58507d14cc7882 Mon Sep 17 00:00:00 2001 From: Corey Minyard Date: Sat, 2 Mar 2019 07:58:12 -0600 Subject: ostree: Use /usr/lib for file that ostree puts there Several files are hard-coded to /usr/lib in the ostree makefiles, but referred to with ${libdir} in the recipe. That won't work if ${libdir} != /usr/lib. Change those files. Signed-off-by: Corey Minyard --- recipes-sota/ostree/ostree_git.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb index 93ae6e7..279a27f 100644 --- a/recipes-sota/ostree/ostree_git.bb +++ b/recipes-sota/ostree/ostree_git.bb @@ -57,13 +57,13 @@ FILES_${PN} = "${bindir} \ ${sysconfdir}/ostree \ ${datadir}/ostree \ ${libdir}/*.so.* \ - ${libdir}/ostree/ostree-grub-generator \ - ${libdir}/ostree/ostree-remount \ + /usr/lib/ostree/ostree-grub-generator \ + /usr/lib/ostree/ostree-remount \ ${libdir}/girepository-1.0/* \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','${libdir}/tmpfiles.d', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','/usr/lib/tmpfiles.d', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','${systemd_unitdir}/system/*.path', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','${systemd_unitdir}/system-generators', '', d)} \ " FILES_${PN}-dev += " ${datadir}/gir-1.0" -FILES_${PN}-dracut = "${sysconfdir}/dracut.conf.d ${libdir}/dracut" -FILES_${PN}-switchroot = "${libdir}/ostree/ostree-prepare-root" +FILES_${PN}-dracut = "${sysconfdir}/dracut.conf.d /usr/lib/dracut" +FILES_${PN}-switchroot = "/usr/lib/ostree/ostree-prepare-root" -- cgit v1.2.3-54-g00ecf