[Buildroot] [PATCH 0/2] systemd: add compatibility libs option

[Buildroot] [PATCH 0/2] systemd: add compatibility libs option

[Eric Le Bihan]

Hi!

This small series is an alternative to the solution provided by Vicente
Olivert Riera for fixing the build of liblogging with systemd
(http://lists.busybox.net/pipermail/buildroot/2014-April/094039.html).

Since systemd 209, some libraries have been merged into libsystemd.so, but
liblogging (and maybe others) still look for them. As systemd provides an
option to install some compatibility pkg-config files, this patch adds a new
configuration option to enable it. liblogging selects this option if systemd
is chosen as init system. When liblogging will be updated to support
libsystemd.so, this could be removed.

Best regards,
ELB

Eric Le Bihan (2):
  systemd: add option to enable compatibility libs
  liblogging: enable systemd compatibility libs

 package/liblogging/Config.in |  1 +
 package/systemd/Config.in    | 13 +++++++++++++
 package/systemd/systemd.mk   |  4 ++++
 3 files changed, 18 insertions(+)

--
1.9.1

[Buildroot] [PATCH 1/2] systemd: add option to enable compatibility libs

[Eric Le Bihan]

Since systemd 209, some libraries have been merged into libsystemd.so:

 - libsystemd-daemon.so
 - libsystemd-id128.so
 - libsystemd-journal.so
 - libsystemd-login.so

A new configuration menu entry has been added to enable the installation
of compatibility pkg-config files, so that programs that depend on them
can still be built.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
 package/systemd/Config.in  | 13 +++++++++++++
 package/systemd/systemd.mk |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 095fee0..f10637a 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -92,4 +92,17 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD
 
 	  http://www.freedesktop.org/software/systemd/man/systemd-networkd.html
 
+config BR2_PACKAGE_SYSTEMD_COMPAT
+	bool "enable compatibility libraries"
+	help
+	  Since systemd 209, the following libraries have been merged into
+	  libsystemd.so:
+
+	  - libsystemd-daemon
+	  - libsystemd-id128
+	  - libsystemd-journal
+	  - libsystemd-login
+
+	  This option enables the installation of compatibility *.pc files.
+
 endif
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index ecedfce..4fa0e89 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -46,6 +46,10 @@ SYSTEMD_CONF_OPT += \
 	--disable-dbus \
 	--without-python
 
+ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y)
+SYSTEMD_CONF_OPT += --enable-compat-libs
+endif
+
 ifeq ($(BR2_PACKAGE_ACL),y)
 SYSTEMD_CONF_OPT += --enable-acl
 SYSTEMD_DEPENDENCIES += acl
-- 
1.9.1

[Buildroot] [PATCH 2/2] liblogging: enable systemd compatibility libs

[Eric Le Bihan]

If systemd is chosen as init system, liblogging will enable the
installation of compatibility libraries in systemd.

When liblogging will be updated to depend on libsystemd.so, this
selection will have to be removed.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
 package/liblogging/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/liblogging/Config.in b/package/liblogging/Config.in
index 23c3c1a..12ee950 100644
--- a/package/liblogging/Config.in
+++ b/package/liblogging/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBLOGGING
 	bool "liblogging"
+	select BR2_PACKAGE_SYSTEMD_COMPAT if BR2_INIT_SYSTEMD
 	help
 	  Liblogging is an easy to use library for
 	  logging. It offers an enhanced replacement
-- 
1.9.1

[Buildroot] [PATCH 1/2] systemd: add option to enable compatibility libs

[Yann E. MORIN]

Eric, All,

On 2014-04-14 11:25 +0200, Eric Le Bihan spake thusly:
> Since systemd 209, some libraries have been merged into libsystemd.so:
> 
>  - libsystemd-daemon.so
>  - libsystemd-id128.so
>  - libsystemd-journal.so
>  - libsystemd-login.so
> 
> A new configuration menu entry has been added to enable the installation
> of compatibility pkg-config files, so that programs that depend on them
> can still be built.
> 
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

But see small comment below...

[--SNIP--]
> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
> index ecedfce..4fa0e89 100644
> --- a/package/systemd/systemd.mk
> +++ b/package/systemd/systemd.mk
> @@ -46,6 +46,10 @@ SYSTEMD_CONF_OPT += \
>  	--disable-dbus \
>  	--without-python
>  
> +ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y)
> +SYSTEMD_CONF_OPT += --enable-compat-libs
> +endif

I guess the default in systemd's ./configure is --disable-compat-libs.
But I'd prefer we enforce that with an else-block:

    ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y)
    SYSTEMD_CONF_OPT += --enable-compat-libs
    else
    SYSTEMD_CONF_OPT += --disable-compat-libs
    endif

I know Peter does not really mind in that case, so I won't complain much
if this goes in as is. ;-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 2/2] liblogging: enable systemd compatibility libs

[Yann E. MORIN]

Eric, All,

On 2014-04-14 11:25 +0200, Eric Le Bihan spake thusly:
> If systemd is chosen as init system, liblogging will enable the
> installation of compatibility libraries in systemd.
> 
> When liblogging will be updated to depend on libsystemd.so, this
> selection will have to be removed.
> 
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/liblogging/Config.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/package/liblogging/Config.in b/package/liblogging/Config.in
> index 23c3c1a..12ee950 100644
> --- a/package/liblogging/Config.in
> +++ b/package/liblogging/Config.in
> @@ -1,5 +1,6 @@
>  config BR2_PACKAGE_LIBLOGGING
>  	bool "liblogging"
> +	select BR2_PACKAGE_SYSTEMD_COMPAT if BR2_INIT_SYSTEMD
>  	help
>  	  Liblogging is an easy to use library for
>  	  logging. It offers an enhanced replacement
> -- 
> 1.9.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 0/2] systemd: add compatibility libs option

[Thomas Petazzoni]

Dear Eric Le Bihan,

On Mon, 14 Apr 2014 11:25:35 +0200, Eric Le Bihan wrote:

> Eric Le Bihan (2):
>   systemd: add option to enable compatibility libs
>   liblogging: enable systemd compatibility libs

Both patches applied, with the small change suggested by Yann on the
first one.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com