summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Minyard <cminyard@mvista.com>2019-03-02 07:58:12 -0600
committerCorey Minyard <cminyard@mvista.com>2019-03-02 07:58:12 -0600
commita41e5f7eefb9557f6e8712630e58507d14cc7882 (patch)
treeb47fd285d21b591eb534133c6192a1f1a76f7d8f
parentc115a66ba9cfbd9656d26af81fe41f2b32d85628 (diff)
downloadmeta-updater-a41e5f7eefb9557f6e8712630e58507d14cc7882.tar.gz
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 <cminyard@mvista.com>
-rw-r--r--recipes-sota/ostree/ostree_git.bb10
1 files 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} \
57 ${sysconfdir}/ostree \ 57 ${sysconfdir}/ostree \
58 ${datadir}/ostree \ 58 ${datadir}/ostree \
59 ${libdir}/*.so.* \ 59 ${libdir}/*.so.* \
60 ${libdir}/ostree/ostree-grub-generator \ 60 /usr/lib/ostree/ostree-grub-generator \
61 ${libdir}/ostree/ostree-remount \ 61 /usr/lib/ostree/ostree-remount \
62 ${libdir}/girepository-1.0/* \ 62 ${libdir}/girepository-1.0/* \
63 ${@bb.utils.contains('DISTRO_FEATURES','systemd','${libdir}/tmpfiles.d', '', d)} \ 63 ${@bb.utils.contains('DISTRO_FEATURES','systemd','/usr/lib/tmpfiles.d', '', d)} \
64 ${@bb.utils.contains('DISTRO_FEATURES','systemd','${systemd_unitdir}/system/*.path', '', d)} \ 64 ${@bb.utils.contains('DISTRO_FEATURES','systemd','${systemd_unitdir}/system/*.path', '', d)} \
65 ${@bb.utils.contains('DISTRO_FEATURES','systemd','${systemd_unitdir}/system-generators', '', d)} \ 65 ${@bb.utils.contains('DISTRO_FEATURES','systemd','${systemd_unitdir}/system-generators', '', d)} \
66" 66"
67FILES_${PN}-dev += " ${datadir}/gir-1.0" 67FILES_${PN}-dev += " ${datadir}/gir-1.0"
68FILES_${PN}-dracut = "${sysconfdir}/dracut.conf.d ${libdir}/dracut" 68FILES_${PN}-dracut = "${sysconfdir}/dracut.conf.d /usr/lib/dracut"
69FILES_${PN}-switchroot = "${libdir}/ostree/ostree-prepare-root" 69FILES_${PN}-switchroot = "/usr/lib/ostree/ostree-prepare-root"