[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2] systemd: fall back to default system-sleep dir without systemd-devel
- To: Mykola Kvach <xakep.amatop@xxxxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
- Date: Fri, 5 Dec 2025 16:10:26 +0000
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=I0wbZsFKjcJkry2PhJeuKoLloFPfk1DqvBuHkAecmGc=; b=U/85Yq2TlwUvdmfqRZ/xj5pQi5JXFQQsaA8o3PNwI5s+hsljcUIRY/d2/PLl1W/WvqZAaW7a9EvXMDrBeiIjnvcGdW+n663yklRT7O4FTVEsB66PkQPTX7bl2TIWvylQ6hN2aejOEU7Q9bd/O3sVsV4X9Il0PoUJtm67I1mwJq+fQGpfhSTUu5TWTmBtEoizouV2BLTX6p/DxcIGqpkUxzuwS3KrloKKX2qlYAwQ5+93rZokREVmJl+uM6ZyJ9b3pIxubumDmjzQnBkiTlZWv3WCoIXld2q06Ic3hUFty9xnkJcZnbuGnl29K2iAoEsbMrQr9NtMgGxIlglF2+2+vQ==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=s4nod6UUkZTJER/Aw4q17+539IZXijHf9s48oincNM0gOeS0dBPZzlH7YSHYdr8vw05ztxa+p0eiZrrQUW+7RAf7P9/4NzEryvu+ju65W6lMbivUddsQaF+x6gHZQ9mMtszJQF8hTYJNO8z05D59NT043jEu/QC4WPOupJ2Jzrlj+kxX2j2F4DiS+BkOAkBsd6UZxlPbJctaqaRTFXzEJa2rS0zQ0fH4FuiPi/9XvX+iAQwUlqOrj/5657TRY9WBjXqK6OUJQY3oKU65MNLOmmgwqrMb7tBUkmx5yKM5M7wyNaK+Y3I8DFpHGsP7X9CqSg/RWJlxYHgOxfrq5KCPRQ==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Cc: andrew.cooper3@xxxxxxxxxx, Mykola Kvach <mykola_kvach@xxxxxxxx>, Anthony PERARD <anthony.perard@xxxxxxxxxx>, Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
- Delivery-date: Fri, 05 Dec 2025 16:11:29 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
On 05/12/2025 4:07 pm, Mykola Kvach wrote:
> From: Mykola Kvach <mykola_kvach@xxxxxxxx>
>
> Keep the pkg-config lookup for SYSTEMD_SLEEP_DIR, but fall back to
> "$(prefix)/lib/systemd/system-sleep/" if the variable remains unset.
> This avoids reintroducing a build-time dependency on systemd-devel while
> still honoring the path provided by pkg-config when present.
>
> Fixes: e54a6cd6a1f3 ("systemd: Add hooks to stop/start xen-watchdog on
> suspend/resume")
> Reported-by: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
> Suggested-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> Signed-off-by: Mykola Kvach <mykola_kvach@xxxxxxxx>
> ---
> Build in which the regression was detected:
> https://gitlab.com/xen-project/people/marmarek/xen/-/jobs/10959608099
> ---
> m4/systemd.m4 | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/m4/systemd.m4 b/m4/systemd.m4
> index c47a25ef93..5fb5a7089e 100644
> --- a/m4/systemd.m4
> +++ b/m4/systemd.m4
> @@ -81,7 +81,7 @@ AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [
> ], [])
>
> AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [
> - AC_MSG_ERROR([SYSTEMD_SLEEP_DIR is unset])
> + SYSTEMD_SLEEP_DIR="\$(prefix)/lib/systemd/system-sleep/"
> ], [])
> ])
>
Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Thanks.
|
