[Buildroot] [PATCH 1/1] package/systemd: add fdisk support

[Buildroot] [PATCH 1/1] package/systemd: add fdisk support

[James Hilliard]

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/systemd/systemd.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 22165de2c1..526c749191 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -125,6 +125,12 @@ else
 SYSTEMD_CONF_OPTS += -Dpam=false
 endif
 
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),y)
+SYSTEMD_CONF_OPTS += -Dfdisk=true
+else
+SYSTEMD_CONF_OPTS += -Dfdisk=false
+endif
+
 ifeq ($(BR2_PACKAGE_VALGRIND),y)
 SYSTEMD_DEPENDENCIES += valgrind
 SYSTEMD_CONF_OPTS += -Dvalgrind=true
-- 
2.20.1

[Buildroot] [PATCH 1/1] package/systemd: add fdisk support

[Baruch Siach]

Hi James,

On Mon, Mar 09 2020, James Hilliard wrote:

> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  package/systemd/systemd.mk | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
> index 22165de2c1..526c749191 100644
> --- a/package/systemd/systemd.mk
> +++ b/package/systemd/systemd.mk
> @@ -125,6 +125,12 @@ else
>  SYSTEMD_CONF_OPTS += -Dpam=false
>  endif
>
> +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),y)
> +SYSTEMD_CONF_OPTS += -Dfdisk=true
> +else
> +SYSTEMD_CONF_OPTS += -Dfdisk=false

Since BR2_PACKAGE_UTIL_LINUX_BINARIES -> BR2_PACKAGE_UTIL_LINUX_LIBFDISK
is selected, the 'else' part is dead code. I'd rather have
BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_UTIL_LINUX_LIBFDISK directly, and
make -Dfdisk=true unconditional.

baruch

> +endif
> +
>  ifeq ($(BR2_PACKAGE_VALGRIND),y)
>  SYSTEMD_DEPENDENCIES += valgrind
>  SYSTEMD_CONF_OPTS += -Dvalgrind=true


--
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

[Buildroot] [PATCH 1/1] package/systemd: add fdisk support

[Thomas Petazzoni]

On Sun,  8 Mar 2020 17:18:22 -0600
James Hilliard <james.hilliard1@gmail.com> wrote:

> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  package/systemd/systemd.mk | 6 ++++++
>  1 file changed, 6 insertions(+)

I have seen the comment from Baruch, and I admit I hesitated a bit as
well. However, the fact that UTIL_LINUX_BINARIES selects
UTIL_LINUX_LIBFDISK can be seen as some "internal" detail of
util-linux. It makes sense to keep things simple and simply
enable/disable the -Dfdisk option depending on the availability of the
libfdisk library. It was not a super strong feeling from me though, so
if anybody disagree, I'm definitely willing to reconsider.

In the mean time, I've applied to master. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com