diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index f1ddfaf440..ce2e9ffba4 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -46,10 +46,16 @@ SYSTEMD_CONF_OPTS += \ SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-lto -# Override path to kmod, used in kmod-static-nodes.service +# Override paths to a few utilities needed at runtime, to +# avoid finding those we would install in $(HOST_DIR). SYSTEMD_CONF_ENV = \ CFLAGS="$(SYSTEMD_CFLAGS)" \ - ac_cv_path_KMOD=/usr/bin/kmod + ac_cv_path_KILL=/usr/bin/kill \ + ac_cv_path_KMOD=/usr/bin/kmod \ + ac_cv_path_KEXEC=/usr/sbin/kexec \ + ac_cv_path_SULOGIN=/usr/sbin/sulogin \ + ac_cv_path_MOUNT_PATH=/usr/bin/mount \ + ac_cv_path_UMOUNT_PATH=/usr/bin/umount define SYSTEMD_RUN_INTLTOOLIZE cd $(@D) && $(HOST_DIR)/usr/bin/intltoolize --force --automake @@ -182,8 +188,14 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_QUOTACHECK),y) SYSTEMD_CONF_OPTS += --enable-quotacheck +SYSTEMD_CONF_ENV += \ + ac_cv_path_QUOTAON=/usr/sbin/quotaon \ + ac_cv_path_QUOTACHECK=/usr/sbin/quotacheck else SYSTEMD_CONF_OPTS += --disable-quotacheck +SYSTEMD_CONF_ENV += \ + ac_cv_path_QUOTAON=/.missing \ + ac_cv_path_QUOTACHECK=/.missing endif ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y)