From: Chen Qi <[email protected]> util-linux upstream is now supporting systemd.
So in case of a systemd based image, we add to EXTRA_OECONF '--with-systemdsystemunitdir' to specify the location of systemd unit files, and '--enable-socket-activation' to build uuidd with socket activation. Also, package systemd unit files into util-linux if systemd is in DISTRO_FEATURES. [YOCTO #4038] Signed-off-by: Chen Qi <[email protected]> --- meta/recipes-core/util-linux/util-linux.inc | 8 ++++++++ meta/recipes-core/util-linux/util-linux_2.22.2.bb | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 41a5471..b62390a 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -46,8 +46,16 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ usrsbin_execdir='${sbindir}' \ " +# Build uuidd with socket activation for systemd based images +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-socket-activation', '', d)}" +# Specify systemdsystemunitdir for systemd based images +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '', d)}" + EXTRA_OECONF_append_class-native = " --disable-login --disable-su" +# Package systemd unit files +FILES_${PN} += "${@base_contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/', '', d)}" + FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_util-linux-agetty = "${base_sbindir}/agetty" diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.2.bb index 9b94a47..43a55a6 100644 --- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb @@ -1,5 +1,5 @@ MAJOR_VERSION = "2.22" -PR = "r2" +PR = "r3" require util-linux.inc SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ -- 1.7.9.5 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
