[Debian-ha-maintainers] Bug#815346: Bug#815346: crmsh: add multiarch support in config.py (libdir)

[Christoph Berg]

Control: tags -1 = upstream moreinfo

Re: Daniel Hoffend 2016-02-20 <20160220224920.GA4650 at dotCarbon>
> Subject: [PATCH] medium: config: add multiarch support for libdir
> 
> Debian and Ubuntu doesn't use the directory /usr/lib64. They switched to
> a different directory structure for better multiarch support.

Hi Daniel,

the patch is not sufficient. You forgot that there are two dozen other
architectures in Debian, and several more out there. I don't think
including all possible arch-os-vendor triplets in libdir will lead
anywhere; you'll likely need to generate that dynamically.

We've been pondering to move the pacemaker binaries to plain
/usr/lib/pacemaker/ via ./configure --libexecdir which would solve the
issue without any patch for us.

> This also fixes a problem where crmsh can't find crmd on recent
> Debian/Ubuntu 64bit installations (same as in #67) because the
> autodetection doesn't find the correct crm_daemon_dir path
> 
> References:
> * https://wiki.debian.org/Multiarch/
> * https://wiki.ubuntu.com/MultiarchSpec
> ---
>  modules/config.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/modules/config.py b/modules/config.py
> index 25eaea7..82d09f5 100644
> --- a/modules/config.py
> +++ b/modules/config.py
> @@ -19,7 +19,9 @@
>  _PATHLIST = {
>      'datadir': ('/usr/share', '/usr/local/share', '/opt'),
>      'cachedir': ('/var/cache', '/opt/cache'),
> -    'libdir': ('/usr/lib64', '/usr/libexec', '/usr/lib',
> +    'libdir': ('/usr/lib64', '/usr/lib/x86_64-linux-gnu', '/usr/lib/i386-linux-gnu',
> +               '/usr/libexec', '/usr/lib', '/usr/local/lib64',
> +               '/usr/local/lib/x86_64-linux-gnu', '/usr/local/lib/i386-linux-gnu',
>                 '/usr/local/lib64', '/usr/local/libexec', '/usr/local/lib'),
>      'varlib': ('/var/lib', '/opt/var/lib'),
>      'wwwdir': ('/srv/www', '/var/www')

Christoph
-- 
cb at df7cb.de | http://www.df7cb.de/