From mboxrd@z Thu Jan  1 00:00:00 1970
From: George Dunlap <george.dunlap@citrix.com>
Subject: Re: [PATCH 2/5] raisin: Detect systemd
Date: Wed, 14 Oct 2015 17:34:03 +0100
Message-ID: <561E83FB.9040703@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>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1444839707-2339-3-git-send-email-george.dunlap@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: George Dunlap <george.dunlap@eu.citrix.com>, xen-devel@lists.xen.org
Cc: Stefano Stabellini <stefano.stabellini@citrix.com>
List-Id: xen-devel@lists.xenproject.org

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 <george.dunlap@citrix.com>

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.

Also...

>      local DEP_Fedora_x86_32="$DEP_Fedora_common dev86 acpica-tools texinfo"
>      local DEP_Fedora_x86_64="$DEP_Fedora_x86_32 glibc-devel.i686"
>  
> @@ -23,6 +32,7 @@ function xen_check_package() {
>      local DEP_CentOS_x86_32="$DEP_CentOS_common dev86 texinfo iasl"
>      local DEP_CentOS_x86_64="$DEP_CentOS_x86_32 glibc-devel.i686"
>  
> +

Oops.

 -George