summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-extended/ostree/ostree_2019.5.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/ostree/ostree_2019.5.bb b/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
index efbbeb6a50..7c1ed9c6b7 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
@@ -54,10 +54,12 @@ PACKAGECONFIG ??= " \
54# soup or curl - https://github.com/ostreedev/ostree/issues/1897 54# soup or curl - https://github.com/ostreedev/ostree/issues/1897
55PACKAGECONFIG_class-native ??= " \ 55PACKAGECONFIG_class-native ??= " \
56 ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ 56 ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \
57 builtin-grub2-mkconfig \
57 soup \ 58 soup \
58" 59"
59 60
60PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" 61PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi"
62PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig"
61PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" 63PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl"
62PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" 64PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut"
63PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" 65PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls"
@@ -86,7 +88,6 @@ EXTRA_OEMAKE = " \
86" 88"
87 89
88EXTRA_OECONF_class-native = " \ 90EXTRA_OECONF_class-native = " \
89 --with-builtin-grub2-mkconfig \
90 --enable-wrpseudo-compat \ 91 --enable-wrpseudo-compat \
91 --disable-otmpfile \ 92 --disable-otmpfile \
92" 93"
@@ -124,6 +125,7 @@ FILES_${PN} = " \
124 ${libdir}/${BPN}/ostree-remount \ 125 ${libdir}/${BPN}/ostree-remount \
125 ${libdir}/girepository-1.0 \ 126 ${libdir}/girepository-1.0 \
126 ${libdir}/lib*${SOLIBS} \ 127 ${libdir}/lib*${SOLIBS} \
128 ${libdir}/ostree/ostree-grub-generator \
127 ${libdir}/tmpfiles.d/ostree-tmpfiles.conf \ 129 ${libdir}/tmpfiles.d/ostree-tmpfiles.conf \
128 ${sysconfdir}/ostree/remotes.d \ 130 ${sysconfdir}/ostree/remotes.d \
129 ${systemd_unitdir}/system-generators/ostree-system-generator \ 131 ${systemd_unitdir}/system-generators/ostree-system-generator \