From mboxrd@z Thu Jan 1 00:00:00 1970 From: George Dunlap Subject: Re: [PATCH 2/5] raisin: Detect systemd Date: Mon, 19 Oct 2015 10:54:36 +0100 Message-ID: <5624BDDC.7040804@citrix.com> References: <1444839707-2339-1-git-send-email-george.dunlap@eu.citrix.com> <1444839707-2339-3-git-send-email-george.dunlap@eu.citrix.com> <561E83FB.9040703@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Stefano Stabellini Cc: George Dunlap , Stefano Stabellini , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On 16/10/15 14:41, Stefano Stabellini wrote: > On Wed, 14 Oct 2015, George Dunlap wrote: >> On 14/10/15 17:21, George Dunlap wrote: >>> Add systemd development libraries if we detect systemd present on the system >>> >>> Signed-off-by: George Dunlap >> >> Sorry, meant to add a comment here... >> >>> --- >>> components/xen | 10 ++++++++++ >>> 1 file changed, 10 insertions(+) >>> >>> diff --git a/components/xen b/components/xen >>> index 090cceb..93ed288 100644 >>> --- a/components/xen >>> +++ b/components/xen >>> @@ -8,6 +8,11 @@ function xen_check_package() { >>> local DEP_Debian_common="build-essential python-dev gettext uuid-dev \ >>> libncurses5-dev libyajl-dev libaio-dev pkg-config libglib2.0-dev \ >>> libssl-dev libpixman-1-dev bridge-utils wget" >>> + >>> + if [[ -e "/usr/lib/systemd" ]] >>> + then >>> + DEP_Debian_common="$DEP_Debian_common libsystemd-daemon-dev" >>> + fi >>> local DEP_Debian_x86_32="$DEP_Debian_common bcc iasl bin86 texinfo" >>> local DEP_Debian_x86_64="$DEP_Debian_x86_32 libc6-dev-i386" >>> local DEP_Debian_arm32="$DEP_Debian_common libfdt-dev" >>> @@ -16,6 +21,10 @@ function xen_check_package() { >>> local DEP_Fedora_common="make gcc python-devel gettext libuuid-devel \ >>> ncurses-devel glib2-devel libaio-devel openssl-devel yajl-devel \ >>> patch pixman-devel glibc-devel bridge-utils grub2 wget tar bzip2" >>> + if [[ -e "/usr/lib/systemd" ]] >>> + then >>> + DEP_Fedora_common="$DEP_Fedora_common systemd-devel|systemd-container-devel" >>> + fi >> >> This is a bit dodgy, as basically CentOS (and I think Fedora) have >> separate packages for systemd when inside a container vs on real >> hardware. But unfortunately I'm not sure there's a way to make yum >> smart enough to know, "Gee, I'm in a container, I should run systemd >> instead". >> >> Having the "alias" like this allows the user to work around it by >> manually installing systemd-container-devel. It's not great though, >> because there's still nothing to prompt the user to install the correct >> package. > > Can we check which package is installed on the system using > check-package (systemd vs systemd-container)? Maybe that would be more > reliable. Oh, you mean check-package and then modify the list of required packages as a result? That could work. -George