Re: [PATCH 2/5] raisin: Detect systemd

[George Dunlap <george.dunlap@citrix.com>]

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 <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.
> 
> 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