From 9fd94853105aaf0670f0f94386d9a30a6876f115 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Mon, 7 Dec 2015 14:08:34 +0100 Subject: ostree: deploy dracut module This is required for ostree boot compatible initramfs image generation on systemd enabled images. Also there is no harm to deploy this module-setup.sh script on a systemd-less images. We overwrite it when deploying our custom dracut module in this case. Change-Id: I8142cfa36db663782ac0399c30bc08cf5bdcd8b2 Reviewed-by: Samuli Piippo --- recipes/ostree/ostree.bb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb index 49060b6..8dac8a5 100644 --- a/recipes/ostree/ostree.bb +++ b/recipes/ostree/ostree.bb @@ -45,7 +45,8 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,," SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service" -FILES_${PN} += "${systemd_unitdir}/system/" +FILES_${PN} += "${systemd_unitdir}/system/ \ + ${libdir}/dracut/" EXTRA_OECONF = "--with-dracut \ --without-selinux \ @@ -61,10 +62,3 @@ do_configure_prepend() { env NOCONFIGURE=1 ./autogen.sh cd - } - -do_install_append() { - # Silence installed-vs-shipped error message. We provide our own dracut module. - # The only way to force OSTree to build necessary binaries is to pass "--with-dracut", - # this of course is a broken configure.ac logic. - rm -rf ${D}${libdir}/dracut/ -} -- cgit v1.2.3-54-g00ecf