From nobody Sun May 19 00:47:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1714066373; cv=none; d=zohomail.com; s=zohoarc; b=BiYnPAjhl09Hd5bB9/GLX5Ws4aulqsuQiHFG9uWPELOLXYuEF+wPFaTuSUUqpQM94NNqLuYifNvJ4q5PKbKKA2wsf87QvtkeZ0Cd8MCAV0FmES+rmexZFItjK7tFRW5pzvSTTPI9Ty0ElCewZVOuuNyZuuObLypR5Nb2x9MaaA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714066373; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2g8t/wF4ZdxY0SPfZVITk0ux9PxKIO0edydKGkf+TxQ=; b=QaN6Vy48YmdUxLnIzOaAS43rUK7VD/RUE/IxjHhx6B3T9CP5BKkhlTrW86fMva7ehIiEyOTj9aw4qjoXmJ8GC0PJkWYuQNSmu0a+RwMUQTa/hmGX0ksXJSH2BdbUGVAaxTrgUH1tUF8/WBUiuDjVjPXpNTqsJC4jdx/8PIPCK0E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1714066373065991.8936818992481; Thu, 25 Apr 2024 10:32:53 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.712193.1112671 (Exim 4.92) (envelope-from ) id 1s02xP-0004Uo-5Z; Thu, 25 Apr 2024 17:32:27 +0000 Received: by outflank-mailman (output) from mailman id 712193.1112671; Thu, 25 Apr 2024 17:32:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s02xP-0004Tr-1I; Thu, 25 Apr 2024 17:32:27 +0000 Received: by outflank-mailman (input) for mailman id 712193; Thu, 25 Apr 2024 17:32:26 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s02xO-0004RI-6p for xen-devel@lists.xenproject.org; Thu, 25 Apr 2024 17:32:26 +0000 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [2a00:1450:4864:20::631]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c6764d40-0329-11ef-b4bb-af5377834399; Thu, 25 Apr 2024 19:32:23 +0200 (CEST) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a51addddbd4so152438266b.0 for ; Thu, 25 Apr 2024 10:32:23 -0700 (PDT) Received: from andrewcoop.citrite.net (default-46-102-197-194.interdsl.co.uk. [46.102.197.194]) by smtp.gmail.com with ESMTPSA id ci8-20020a170906c34800b00a587356c04csm4006477ejb.187.2024.04.25.10.32.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Apr 2024 10:32:21 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c6764d40-0329-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1714066342; x=1714671142; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2g8t/wF4ZdxY0SPfZVITk0ux9PxKIO0edydKGkf+TxQ=; b=p37RIUPxST9+PS4/0UfaQtG/qcLTtnHzqCC5vk3vplFXJmF+9p/tTlT7PPdUwYrJIK ajp65vtpsQZd//AtSqYo1RXj08/4ND+AIrJo2oIDAKxMsuKluGQS6ZDAMDHmc1Vp5+gX RVGpP7qPCc7iam+5xwcPoowAUUYIbMhekr7F0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714066342; x=1714671142; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2g8t/wF4ZdxY0SPfZVITk0ux9PxKIO0edydKGkf+TxQ=; b=v35yIh0JrFloSTrvRBZCABGEQQ//nwjLPJ1aZXIAXWFcCReF/yOeGV5cgBpYS7d0up PvlrpZfoIWMwFzNkWmCCwwoY4ba6bC5f5w99LwHd5ojiwFdStWlByyPlLNcaoE9BUzX0 T5tfqGqFNZ2pvVvZsiwtcLiPUi8y/LsPt4kvG0tfO8TDy6rzI8302LEazgpQvGppIPim GKhrWZK4VQFZjNLoegQ3VCeInUDENLmfbLIANM0SoOoHmYLkMK7WLPMBkLT+TN7Wd6MF CxJMp8m6nlPGLSbTk2zPBCz0xNc6ALu2d4dg2CxzPkO+8D1t9MVoGQKSpuIlg/ZxqnzZ UnSQ== X-Gm-Message-State: AOJu0YxW3vcznBVzLtlP9L4AOCHrsLPznmwUrBgAehHl8jyaxXvMgqnl D1dpTBqW1ogl6bqh+PNBQQbTag+vHXWiNJqI/tuL1ALsmK6qDrI8rx+3lQgAUncXJm5mWk9h8GX b X-Google-Smtp-Source: AGHT+IHVB43cnp+cLbbkrKERJDS2FM3sZyAzoNUN0K7eSLYTJeoTcaQ6iPtkWtSf/QdM6L/5szTjDg== X-Received: by 2002:a17:906:e285:b0:a58:be32:b247 with SMTP id gg5-20020a170906e28500b00a58be32b247mr294683ejb.35.1714066341986; Thu, 25 Apr 2024 10:32:21 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , Christian Lindig , =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= , Stefano Stabellini Subject: [PATCH 1/2] tools/{c,o}xenstored: Don't link against libsystemd Date: Thu, 25 Apr 2024 18:32:15 +0100 Message-Id: <20240425173216.410940-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240425173216.410940-1-andrew.cooper3@citrix.com> References: <20240425173216.410940-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1714066374617100003 libsystemd is a giant dependency for one single function, but in the wake of the xz backdoor, it turns out that even systemd leadership recommend against linking against libsystemd for sd_notify(). Since commit 7b61011e1450 ("tools: make xenstore domain easy configurable")= in Xen 4.8, the launch-xenstore script invokes systemd-notify directly, so its not even necessary for the xenstored's to call sd_notify() themselves. Therefore, just drop the calls to sd_notify() and stop linking against libsystemd. No functional change. Signed-off-by: Andrew Cooper Acked-by: Christian Lindig --- CC: Anthony PERARD CC: Juergen Gross CC: Christian Lindig CC: Edwin T=C3=B6r=C3=B6k CC: Stefano Stabellini --- tools/ocaml/xenstored/Makefile | 12 +------ tools/ocaml/xenstored/systemd.ml | 15 --------- tools/ocaml/xenstored/systemd.mli | 16 --------- tools/ocaml/xenstored/systemd_stubs.c | 47 --------------------------- tools/ocaml/xenstored/xenstored.ml | 1 - tools/xenstored/Makefile | 5 --- tools/xenstored/posix.c | 9 ----- 7 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 tools/ocaml/xenstored/systemd.ml delete mode 100644 tools/ocaml/xenstored/systemd.mli delete mode 100644 tools/ocaml/xenstored/systemd_stubs.c diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index e8aaecf2e630..1e4b51cc5432 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -4,8 +4,6 @@ include $(OCAML_TOPLEVEL)/common.make =20 # Include configure output (config.h) CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h -CFLAGS-$(CONFIG_SYSTEMD) +=3D $(SYSTEMD_CFLAGS) -LDFLAGS-$(CONFIG_SYSTEMD) +=3D $(SYSTEMD_LIBS) =20 CFLAGS +=3D $(CFLAGS-y) CFLAGS +=3D $(APPEND_CFLAGS) @@ -25,13 +23,6 @@ poll_OBJS =3D poll poll_C_OBJS =3D select_stubs OCAML_LIBRARY =3D syslog poll =20 -LIBS +=3D systemd.cma systemd.cmxa -systemd_OBJS =3D systemd -systemd_C_OBJS =3D systemd_stubs -OCAML_LIBRARY +=3D systemd - -LIBS_systemd +=3D $(LDFLAGS-y) - OBJS =3D paths \ define \ stdext \ @@ -56,12 +47,11 @@ OBJS =3D paths \ process \ xenstored =20 -INTF =3D symbol.cmi trie.cmi syslog.cmi systemd.cmi poll.cmi +INTF =3D symbol.cmi trie.cmi syslog.cmi poll.cmi =20 XENSTOREDLIBS =3D \ unix.cmxa \ -ccopt -L -ccopt . syslog.cmxa \ - -ccopt -L -ccopt . systemd.cmxa \ -ccopt -L -ccopt . poll.cmxa \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/mmap $(OCAML_TOPLEVEL)/libs/mmap/= xenmmap.cmxa \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/eventchn $(OCAML_TOPLEVEL)/libs/e= ventchn/xeneventchn.cmxa \ diff --git a/tools/ocaml/xenstored/systemd.ml b/tools/ocaml/xenstored/syste= md.ml deleted file mode 100644 index 39127f712d72..000000000000 --- a/tools/ocaml/xenstored/systemd.ml +++ /dev/null @@ -1,15 +0,0 @@ -(* - * Copyright (C) 2014 Luis R. Rodriguez - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - *) - -external sd_notify_ready: unit -> unit =3D "ocaml_sd_notify_ready" diff --git a/tools/ocaml/xenstored/systemd.mli b/tools/ocaml/xenstored/syst= emd.mli deleted file mode 100644 index 18b9331031f9..000000000000 --- a/tools/ocaml/xenstored/systemd.mli +++ /dev/null @@ -1,16 +0,0 @@ -(* - * Copyright (C) 2014 Luis R. Rodriguez - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - *) - -(** Tells systemd we're ready *) -external sd_notify_ready: unit -> unit =3D "ocaml_sd_notify_ready" diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/= systemd_stubs.c deleted file mode 100644 index f4c875075abe..000000000000 --- a/tools/ocaml/xenstored/systemd_stubs.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2014 Luis R. Rodriguez - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(HAVE_SYSTEMD) - -#include - -CAMLprim value ocaml_sd_notify_ready(value ignore) -{ - CAMLparam1(ignore); - - sd_notify(1, "READY=3D1"); - - CAMLreturn(Val_unit); -} - -#else - -CAMLprim value ocaml_sd_notify_ready(value ignore) -{ - CAMLparam1(ignore); - - CAMLreturn(Val_unit); -} -#endif diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xen= stored.ml index 1aaa3e995e1f..6bcd6d11da55 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -621,7 +621,6 @@ let () =3D process_domains store cons domains in =20 - Systemd.sd_notify_ready (); let live_update =3D ref false in while not (!quit && Connections.prevents_quit cons =3D []) do diff --git a/tools/xenstored/Makefile b/tools/xenstored/Makefile index e0897ed1ba30..09adfe1d5064 100644 --- a/tools/xenstored/Makefile +++ b/tools/xenstored/Makefile @@ -9,11 +9,6 @@ xenstored: LDLIBS +=3D $(LDLIBS_libxenctrl) xenstored: LDLIBS +=3D -lrt xenstored: LDLIBS +=3D $(SOCKET_LIBS) =20 -ifeq ($(CONFIG_SYSTEMD),y) -$(XENSTORED_OBJS-y): CFLAGS +=3D $(SYSTEMD_CFLAGS) -xenstored: LDLIBS +=3D $(SYSTEMD_LIBS) -endif - TARGETS :=3D xenstored =20 .PHONY: all diff --git a/tools/xenstored/posix.c b/tools/xenstored/posix.c index d88c82d972d7..dc4ed8db591f 100644 --- a/tools/xenstored/posix.c +++ b/tools/xenstored/posix.c @@ -26,9 +26,6 @@ #include #include #include -#if defined(HAVE_SYSTEMD) -#include -#endif #include =20 #include "utils.h" @@ -390,12 +387,6 @@ void handle_special_fds(void) =20 void late_init(bool live_update) { -#if defined(HAVE_SYSTEMD) - if (!live_update) { - sd_notify(1, "READY=3D1"); - fprintf(stderr, SD_NOTICE "xenstored is ready\n"); - } -#endif } =20 int get_socket_fd(void) --=20 2.30.2 From nobody Sun May 19 00:47:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1714066374; cv=none; d=zohomail.com; s=zohoarc; b=Ct6XUjSJjGjsQ6co6OJxO9QBjAbMGkt4DwhTgxEx+cBBEKYVqMHtfjee2v2BUv+tEHa4T8Ax4Ha3zWtYXNCC3jcmem8/cN1Wt1ku8FIgJtD+Wn1jcMifYwpKsCoAYCVtRlAvmubHLbZjnuS1tZm4zowUrmoeNktl9jT57naf3Lw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714066374; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Vm54fAi6JaNw3+G4sAOX+Z6d3qFSN3u7bim0oUjoPQA=; b=ivbbm/yT/lOb/IkDLXcmyYEuieXZlIBVkGrYuL551SpgL3ykTVcYTN4AbWPHIEthNTfR3AIhDB2e8vN0KXh4h+GL+zqbO6GODw8whI/kBOYTiqgr/2ju7GA1gMWV8DsUrtZiG9LtQws0+ts0Db6+jQbtX3P/7kiuhI9fKFGP2zY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1714066374319134.42571648637; Thu, 25 Apr 2024 10:32:54 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.712194.1112685 (Exim 4.92) (envelope-from ) id 1s02xQ-0004u4-DA; Thu, 25 Apr 2024 17:32:28 +0000 Received: by outflank-mailman (output) from mailman id 712194.1112685; Thu, 25 Apr 2024 17:32:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s02xQ-0004tx-9o; Thu, 25 Apr 2024 17:32:28 +0000 Received: by outflank-mailman (input) for mailman id 712194; Thu, 25 Apr 2024 17:32:27 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s02xP-0004RI-74 for xen-devel@lists.xenproject.org; Thu, 25 Apr 2024 17:32:27 +0000 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [2a00:1450:4864:20::536]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c708567b-0329-11ef-b4bb-af5377834399; Thu, 25 Apr 2024 19:32:24 +0200 (CEST) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-56e6acb39d4so1574208a12.1 for ; Thu, 25 Apr 2024 10:32:24 -0700 (PDT) Received: from andrewcoop.citrite.net (default-46-102-197-194.interdsl.co.uk. [46.102.197.194]) by smtp.gmail.com with ESMTPSA id ci8-20020a170906c34800b00a587356c04csm4006477ejb.187.2024.04.25.10.32.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Apr 2024 10:32:22 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c708567b-0329-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1714066343; x=1714671143; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Vm54fAi6JaNw3+G4sAOX+Z6d3qFSN3u7bim0oUjoPQA=; b=MjUZ9OAoneTSmFUNVR4EkgNPMBd7q6cSIDu2tQKtRenGXaVoo439MK/Xs20YdOyMeX GWhWI6k+5oFtAwYEqOx16EyTmD7xE+GnSPR93xmQLZQT3x0jLLORDZUybOefSWYJ8N2R ojBUB9td1imEKj5L9/uBbxvY2O2LtTKownLrY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714066343; x=1714671143; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vm54fAi6JaNw3+G4sAOX+Z6d3qFSN3u7bim0oUjoPQA=; b=orebE5QJBMi4BpDZAUFXq25vqQ8TZiS13/wyte/EyjRa9ZTwNMGMJ9WwmqBuipJEnT hGyMHwWOm9PIqgbCs+Ffa1VIWtYOLF+o6GufHSN+lmcquaXaZyfrHjQXxuAQKaNIyMsl DHouOPLbevo3aUra7LZ8CFGsir3kgIcLhTekq+a/svTIBk0vOHfCf3ACYOpGN9tpTUpy SmSrhewPDScllWO9OTEHbCU3mZPNUjP0LV6Mv7Vvb4jU8zlkrh2UPCLySEN1yYEKOXKm kf9oFZiWSVfKzJlLL616b2lrPTPcbuwOFulzxP+muwwQoslPBrqXV0VN4xtAVKfqFw8o IRQg== X-Gm-Message-State: AOJu0YxgDUcjEMQH2I+iibUtcp8ytDrgslkCBplrsfVQsqyT4ekRjEFh p1Pk3DT5AhcCrE/2z/rhsrzwPm0FDXIVj4X9uTv42uIYq3zrGDxd5Hf8aR5QMTDAYYOPUndoKTu u X-Google-Smtp-Source: AGHT+IGaLa1zNEWZHpeeeP1AdDVXMoTYi3EoCApLK6i7TXo3GFhX8sygt05jFrL3wuycaQMjhsxmYA== X-Received: by 2002:a17:906:b210:b0:a55:387b:eef9 with SMTP id p16-20020a170906b21000b00a55387beef9mr316035ejz.10.1714066343401; Thu, 25 Apr 2024 10:32:23 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , Christian Lindig , =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= , Stefano Stabellini Subject: [PATCH 2/2] tools: Drop libsystemd as a dependency Date: Thu, 25 Apr 2024 18:32:16 +0100 Message-Id: <20240425173216.410940-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240425173216.410940-1-andrew.cooper3@citrix.com> References: <20240425173216.410940-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1714066376271100005 There are no more users, and we want to disuade people from introducing new users just for sd_notify() and friends. Drop the dependency. We still want the overall --with{,out}-systemd to gate the generation of the service/unit/mount/etc files. Rerun autogen.sh, and mark the dependency as removed in the build container= s. Signed-off-by: Andrew Cooper Acked-by: Christian Lindig --- CC: Anthony PERARD CC: Juergen Gross CC: Christian Lindig CC: Edwin T=C3=B6r=C3=B6k CC: Stefano Stabellini --- automation/build/archlinux/current.dockerfile | 1 + .../build/suse/opensuse-leap.dockerfile | 1 + .../build/suse/opensuse-tumbleweed.dockerfile | 1 + automation/build/ubuntu/focal.dockerfile | 1 + config/Tools.mk.in | 2 - m4/systemd.m4 | 23 +- tools/config.h.in | 3 - tools/configure | 523 +----------------- 8 files changed, 7 insertions(+), 548 deletions(-) diff --git a/automation/build/archlinux/current.dockerfile b/automation/bui= ld/archlinux/current.dockerfile index d974a1434fd5..a350b53ad8e2 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -39,6 +39,7 @@ RUN pacman -S --refresh --sysupgrade --noconfirm --noprog= ressbar --needed \ sdl2 \ spice \ spice-protocol \ + # systemd for Xen < 4.19 systemd \ transfig \ usbredir \ diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/bu= ild/suse/opensuse-leap.dockerfile index e1ec38a41445..0483d9826d7d 100644 --- a/automation/build/suse/opensuse-leap.dockerfile +++ b/automation/build/suse/opensuse-leap.dockerfile @@ -61,6 +61,7 @@ RUN zypper install -y --no-recommends \ 'pkgconfig(sdl2)' \ python3-devel \ python3-setuptools \ + # systemd-devel for Xen < 4.19 systemd-devel \ tar \ transfig \ diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automat= ion/build/suse/opensuse-tumbleweed.dockerfile index f00e03eda7b1..59b168e717b2 100644 --- a/automation/build/suse/opensuse-tumbleweed.dockerfile +++ b/automation/build/suse/opensuse-tumbleweed.dockerfile @@ -62,6 +62,7 @@ RUN zypper install -y --no-recommends \ 'pkgconfig(sdl2)' \ python3-devel \ python3-setuptools \ + # systemd-devel for Xen < 4.19 systemd-devel \ tar \ transfig \ diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ub= untu/focal.dockerfile index 30a9b8e84ffe..8171347c4656 100644 --- a/automation/build/ubuntu/focal.dockerfile +++ b/automation/build/ubuntu/focal.dockerfile @@ -36,6 +36,7 @@ RUN apt-get update && \ libnl-3-dev \ ocaml-nox \ libfindlib-ocaml-dev \ + # libsystemd-dev for Xen < 4.19 libsystemd-dev \ transfig \ pandoc \ diff --git a/config/Tools.mk.in b/config/Tools.mk.in index b54ab21f966b..50fbef841f3f 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -52,8 +52,6 @@ CONFIG_PYGRUB :=3D @pygrub@ CONFIG_LIBFSIMAGE :=3D @libfsimage@ =20 CONFIG_SYSTEMD :=3D @systemd@ -SYSTEMD_CFLAGS :=3D @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS :=3D @SYSTEMD_LIBS@ XEN_SYSTEMD_DIR :=3D @SYSTEMD_DIR@ XEN_SYSTEMD_MODULES_LOAD :=3D @SYSTEMD_MODULES_LOAD@ CONFIG_9PFS :=3D @ninepfs@ diff --git a/m4/systemd.m4 b/m4/systemd.m4 index 112dc11b5e05..aa1ebe94f56c 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -41,15 +41,6 @@ AC_DEFUN([AX_ALLOW_SYSTEMD_OPTS], [ ]) =20 AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon],, - [PKG_CHECK_MODULES([SYSTEMD], [libsystemd >=3D 209])] - ) - dnl pkg-config older than 0.24 does not set these for - dnl PKG_CHECK_MODULES() worth also noting is that as of version 208 - dnl of systemd pkg-config --cflags currently yields no extra flags yet. - AC_SUBST([SYSTEMD_CFLAGS]) - AC_SUBST([SYSTEMD_LIBS]) - AS_IF([test "x$SYSTEMD_DIR" =3D x], [ dnl In order to use the line below we need to fix upstream systemd dnl to properly ${prefix} for child variables in @@ -83,23 +74,11 @@ AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ AC_DEFUN([AX_CHECK_SYSTEMD], [ dnl Respect user override to disable AS_IF([test "x$enable_systemd" !=3D "xno"], [ - AS_IF([test "x$systemd" =3D "xy" ], [ - AC_DEFINE([HAVE_SYSTEMD], [1], [Systemd available and enabled]) - systemd=3Dy - AX_CHECK_SYSTEMD_LIBS() - ],[ - AS_IF([test "x$enable_systemd" =3D "xyes"], - [AC_MSG_ERROR([Unable to find systemd development library])], - [systemd=3Dn]) - ]) + systemd=3Dy ],[systemd=3Dn]) ]) =20 AC_DEFUN([AX_CHECK_SYSTEMD_ENABLE_AVAILABLE], [ - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], [systemd=3D"y"],[ - PKG_CHECK_MODULES([SYSTEMD], [libsystemd >=3D 209], - [systemd=3D"y"],[systemd=3D"n"]) - ]) ]) =20 dnl Enables systemd by default and requires a --disable-systemd option flag diff --git a/tools/config.h.in b/tools/config.h.in index 0bb2fe08a143..56ac7800032f 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -60,9 +60,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H =20 -/* Systemd available and enabled */ -#undef HAVE_SYSTEMD - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_EVENTFD_H =20 diff --git a/tools/configure b/tools/configure index 3d557234b319..b0873a5601a7 100755 --- a/tools/configure +++ b/tools/configure @@ -626,8 +626,6 @@ ac_subst_vars=3D'LTLIBOBJS LIBOBJS pvshim ninepfs -SYSTEMD_LIBS -SYSTEMD_CFLAGS SYSTEMD_MODULES_LOAD SYSTEMD_DIR systemd @@ -864,9 +862,7 @@ pixman_LIBS libzstd_CFLAGS libzstd_LIBS LIBNL3_CFLAGS -LIBNL3_LIBS -SYSTEMD_CFLAGS -SYSTEMD_LIBS' +LIBNL3_LIBS' =20 =20 # Initialize some variables set by options. @@ -1621,10 +1617,6 @@ Some influential environment variables: LIBNL3_CFLAGS C compiler flags for LIBNL3, overriding pkg-config LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config - SYSTEMD_CFLAGS - C compiler flags for SYSTEMD, overriding pkg-config - SYSTEMD_LIBS - linker flags for SYSTEMD, overriding pkg-config =20 Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -9541,521 +9533,10 @@ fi =20 =20 =20 -pkg_failed=3Dno -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS=3D"$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 - ac_status=3D$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 - test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_CFLAGS=3D`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev= /null` - test "x$?" !=3D "x0" && pkg_failed=3Dyes -else - pkg_failed=3Dyes -fi - else - pkg_failed=3Duntried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS=3D"$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 - ac_status=3D$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 - test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_LIBS=3D`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/nul= l` - test "x$?" !=3D "x0" && pkg_failed=3Dyes -else - pkg_failed=3Dyes -fi - else - pkg_failed=3Duntried -fi - - - -if test $pkg_failed =3D yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=3Dyes -else - _pkg_short_errors_supported=3Dno -fi - if test $_pkg_short_errors_supported =3D yes; then - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --short-errors --print-errors -= -cflags --libs "libsystemd-daemon" 2>&1` - else - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --print-errors --cflags --libs = "libsystemd-daemon" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - - -pkg_failed=3Dno -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS=3D"$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd >=3D 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >=3D 209") 2>&5 - ac_status=3D$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 - test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_CFLAGS=3D`$PKG_CONFIG --cflags "libsystemd >=3D 209" 2>/d= ev/null` - test "x$?" !=3D "x0" && pkg_failed=3Dyes -else - pkg_failed=3Dyes -fi - else - pkg_failed=3Duntried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS=3D"$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd >=3D 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >=3D 209") 2>&5 - ac_status=3D$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 - test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_LIBS=3D`$PKG_CONFIG --libs "libsystemd >=3D 209" 2>/dev/n= ull` - test "x$?" !=3D "x0" && pkg_failed=3Dyes -else - pkg_failed=3Dyes -fi - else - pkg_failed=3Duntried -fi - - - -if test $pkg_failed =3D yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=3Dyes -else - _pkg_short_errors_supported=3Dno -fi - if test $_pkg_short_errors_supported =3D yes; then - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --short-errors --print-errors -= -cflags --libs "libsystemd >=3D 209" 2>&1` - else - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --print-errors --cflags --libs = "libsystemd >=3D 209" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - systemd=3D"n" -elif test $pkg_failed =3D untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - systemd=3D"n" -else - SYSTEMD_CFLAGS=3D$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=3D$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - systemd=3D"y" -fi - -elif test $pkg_failed =3D untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - - -pkg_failed=3Dno -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS=3D"$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd >=3D 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >=3D 209") 2>&5 - ac_status=3D$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 - test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_CFLAGS=3D`$PKG_CONFIG --cflags "libsystemd >=3D 209" 2>/d= ev/null` - test "x$?" !=3D "x0" && pkg_failed=3Dyes -else - pkg_failed=3Dyes -fi - else - pkg_failed=3Duntried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS=3D"$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd >=3D 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >=3D 209") 2>&5 - ac_status=3D$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 - test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_LIBS=3D`$PKG_CONFIG --libs "libsystemd >=3D 209" 2>/dev/n= ull` - test "x$?" !=3D "x0" && pkg_failed=3Dyes -else - pkg_failed=3Dyes -fi - else - pkg_failed=3Duntried -fi - - - -if test $pkg_failed =3D yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=3Dyes -else - _pkg_short_errors_supported=3Dno -fi - if test $_pkg_short_errors_supported =3D yes; then - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --short-errors --print-errors -= -cflags --libs "libsystemd >=3D 209" 2>&1` - else - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --print-errors --cflags --libs = "libsystemd >=3D 209" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - systemd=3D"n" -elif test $pkg_failed =3D untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - systemd=3D"n" -else - SYSTEMD_CFLAGS=3D$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=3D$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - systemd=3D"y" -fi - -else - SYSTEMD_CFLAGS=3D$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=3D$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - systemd=3D"y" -fi - =20 if test "x$enable_systemd" !=3D "xno"; then : =20 - if test "x$systemd" =3D "xy" ; then : - - -$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h - - systemd=3Dy - - -pkg_failed=3Dno -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS=3D"$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 - ac_status=3D$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 - test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_CFLAGS=3D`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev= /null` - test "x$?" !=3D "x0" && pkg_failed=3Dyes -else - pkg_failed=3Dyes -fi - else - pkg_failed=3Duntried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS=3D"$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 - ac_status=3D$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 - test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_LIBS=3D`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/nul= l` - test "x$?" !=3D "x0" && pkg_failed=3Dyes -else - pkg_failed=3Dyes -fi - else - pkg_failed=3Duntried -fi - - - -if test $pkg_failed =3D yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=3Dyes -else - _pkg_short_errors_supported=3Dno -fi - if test $_pkg_short_errors_supported =3D yes; then - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --short-errors --print-errors -= -cflags --libs "libsystemd-daemon" 2>&1` - else - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --print-errors --cflags --libs = "libsystemd-daemon" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - -pkg_failed=3Dno -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS=3D"$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd >=3D 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >=3D 209") 2>&5 - ac_status=3D$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 - test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_CFLAGS=3D`$PKG_CONFIG --cflags "libsystemd >=3D 209" 2>/d= ev/null` - test "x$?" !=3D "x0" && pkg_failed=3Dyes -else - pkg_failed=3Dyes -fi - else - pkg_failed=3Duntried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS=3D"$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd >=3D 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >=3D 209") 2>&5 - ac_status=3D$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 - test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_LIBS=3D`$PKG_CONFIG --libs "libsystemd >=3D 209" 2>/dev/n= ull` - test "x$?" !=3D "x0" && pkg_failed=3Dyes -else - pkg_failed=3Dyes -fi - else - pkg_failed=3Duntried -fi - - - -if test $pkg_failed =3D yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=3Dyes -else - _pkg_short_errors_supported=3Dno -fi - if test $_pkg_short_errors_supported =3D yes; then - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --short-errors --print-errors -= -cflags --libs "libsystemd >=3D 209" 2>&1` - else - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --print-errors --cflags --libs = "libsystemd >=3D 209" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (libsystemd >=3D 209) were not met: - -$SYSTEMD_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed =3D untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. M= ake sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - SYSTEMD_CFLAGS=3D$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=3D$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - -elif test $pkg_failed =3D untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -pkg_failed=3Dno -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS=3D"$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd >=3D 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >=3D 209") 2>&5 - ac_status=3D$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 - test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_CFLAGS=3D`$PKG_CONFIG --cflags "libsystemd >=3D 209" 2>/d= ev/null` - test "x$?" !=3D "x0" && pkg_failed=3Dyes -else - pkg_failed=3Dyes -fi - else - pkg_failed=3Duntried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS=3D"$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd >=3D 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >=3D 209") 2>&5 - ac_status=3D$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 - test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_LIBS=3D`$PKG_CONFIG --libs "libsystemd >=3D 209" 2>/dev/n= ull` - test "x$?" !=3D "x0" && pkg_failed=3Dyes -else - pkg_failed=3Dyes -fi - else - pkg_failed=3Duntried -fi - - - -if test $pkg_failed =3D yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=3Dyes -else - _pkg_short_errors_supported=3Dno -fi - if test $_pkg_short_errors_supported =3D yes; then - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --short-errors --print-errors -= -cflags --libs "libsystemd >=3D 209" 2>&1` - else - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --print-errors --cflags --libs = "libsystemd >=3D 209" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (libsystemd >=3D 209) were not met: - -$SYSTEMD_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed =3D untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. M= ake sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - SYSTEMD_CFLAGS=3D$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=3D$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - -else - SYSTEMD_CFLAGS=3D$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=3D$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - - - if test "x$SYSTEMD_DIR" =3D x; then : - - SYSTEMD_D= IR=3D"\$(prefix)/lib/systemd/system/" - -fi - - if test "x$SYSTEMD_DIR" =3D x; then : - - as_fn_error $? "SYSTEMD_DIR is unset" "$LINENO" 5 - -fi - - if test "x$SYSTEMD_MODULES_LOAD" =3D x; then : - - SYSTEMD_MODULES_LOAD=3D"\$(prefix)/lib/modules-load.d/" - -fi - - if test "x$SYSTEMD_MODULES_LOAD" =3D x; then : - - as_fn_error $? "SYSTEMD_MODULES_LOAD is unset" "$LINENO" 5 - -fi - - -else - - if test "x$enable_systemd" =3D "xyes"; then : - as_fn_error $? "Unable to find systemd development library" "$LINENO" 5 -else - systemd=3Dn -fi - -fi + systemd=3Dy =20 else systemd=3Dn --=20 2.30.2