From 4d09da54577bebfcd1f6487bd54c28fc83465b95 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Mon, 2 Dec 2019 19:33:42 +0000 Subject: ostree: Add PACKAGECONFIG for builtin-grub2-mkconfig Signed-off-by: Alex Kiernan Signed-off-by: Khem Raj --- meta-oe/recipes-extended/ostree/ostree_2019.5.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta-oe/recipes-extended/ostree') 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 ??= " \ # soup or curl - https://github.com/ostreedev/ostree/issues/1897 PACKAGECONFIG_class-native ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ + builtin-grub2-mkconfig \ soup \ " PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" +PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" @@ -86,7 +88,6 @@ EXTRA_OEMAKE = " \ " EXTRA_OECONF_class-native = " \ - --with-builtin-grub2-mkconfig \ --enable-wrpseudo-compat \ --disable-otmpfile \ " @@ -124,6 +125,7 @@ FILES_${PN} = " \ ${libdir}/${BPN}/ostree-remount \ ${libdir}/girepository-1.0 \ ${libdir}/lib*${SOLIBS} \ + ${libdir}/ostree/ostree-grub-generator \ ${libdir}/tmpfiles.d/ostree-tmpfiles.conf \ ${sysconfdir}/ostree/remotes.d \ ${systemd_unitdir}/system-generators/ostree-system-generator \ -- cgit 1.2.3-korg