[Buildroot] [PATCH 0/2] package/lvm2: fix installation (branch yem/lvm2-fixes)

[Buildroot] [PATCH 0/2] package/lvm2: fix installation (branch yem/lvm2-fixes)

[Yann E. MORIN]

Hello All!

This small series cleans up the installation of lvm2 after the recent
version bump.

Regards,
Yann E. MORIN.


----------------------------------------------------------------
Yann E. MORIN (2):
      package/lvm2: fix inverted logic that is confusing
      package/lvm2: fix installation of systemd units

 package/lvm2/lvm2.mk | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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

[Buildroot] [PATCH 1/2] package/lvm2: fix inverted logic that is confusing

[Yann E. MORIN]

Commit ff0f55e38197 (lvm2: replace !BR2_PACKAGE_LVM2_DMSETUP_ONLY by
BR2_PACKAGE_LVM2_STANDARD_INSTALL) changed a negative-logic option to a
positive-logic option.

However, it kept the ordering of the conditional block, which became a
negatice-logic condition.

This is confusing; let's fix that.

Reported-by: Pascal de Bruijn <p.debruijn@unilogic.nl>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/lvm2/lvm2.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 224dbf5d54..00baa50a86 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -46,13 +46,13 @@ else
 LVM2_CONF_OPTS += --disable-selinux
 endif
 
-ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
+ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),y)
+LVM2_INSTALL_STAGING_OPTS += install
+LVM2_INSTALL_TARGET_OPTS += install
+else
 LVM2_MAKE_OPTS = device-mapper
 LVM2_INSTALL_STAGING_OPTS += install_device-mapper
 LVM2_INSTALL_TARGET_OPTS += install_device-mapper
-else
-LVM2_INSTALL_STAGING_OPTS += install
-LVM2_INSTALL_TARGET_OPTS += install
 endif
 
 ifeq ($(BR2_INIT_SYSTEMD),y)
-- 
2.25.1

[Buildroot] [PATCH 2/2] package/lvm2: fix installation of systemd units

[Yann E. MORIN]

Since we bump the version in commit 80997acd3587 (package/lvm2: bump
version to 2.03.12), the installation of systemd units is no longer
functional without a full installation.

As Pascal puts it: the systemd service files don't make a whole lot of
sense when there isn't a full lvm2 install.

Move the conditional block that install system units, so that it only
occurs when we do a full installation.

Fixes;
    http://autobuild.buildroot.org/results/f47/f470ffb55625e2639cecde713442550eb532d0d7/
    http://autobuild.buildroot.org/results/954/9547929292e81671fbe3a5b4bbc87a6424edb1ca/
    http://autobuild.buildroot.org/results/303/30359c351a6ce2f9139494a531e036f0b0406ccf

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Co-Developped-by: Pascal de Bruijn <p.debruijn@unilogic.nl>
Cc: Pascal de Bruijn <p.debruijn@unilogic.nl>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/lvm2/lvm2.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 00baa50a86..5ce79768b6 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -49,16 +49,15 @@ endif
 ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),y)
 LVM2_INSTALL_STAGING_OPTS += install
 LVM2_INSTALL_TARGET_OPTS += install
+ifeq ($(BR2_INIT_SYSTEMD),y)
+LVM2_INSTALL_TARGET_OPTS += install_systemd_units install_systemd_generators
+endif
 else
 LVM2_MAKE_OPTS = device-mapper
 LVM2_INSTALL_STAGING_OPTS += install_device-mapper
 LVM2_INSTALL_TARGET_OPTS += install_device-mapper
 endif
 
-ifeq ($(BR2_INIT_SYSTEMD),y)
-LVM2_INSTALL_TARGET_OPTS += install_systemd_units install_systemd_generators
-endif
-
 ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
 LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no
 endif
-- 
2.25.1

[Buildroot] [PATCH 2/2] package/lvm2: fix installation of systemd units

[Arnout Vandecappelle]

On 21/05/2021 16:44, Yann E. MORIN wrote:
> Since we bump the version in commit 80997acd3587 (package/lvm2: bump
> version to 2.03.12), the installation of systemd units is no longer
> functional without a full installation.
> 
> As Pascal puts it: the systemd service files don't make a whole lot of
> sense when there isn't a full lvm2 install.
> 
> Move the conditional block that install system units, so that it only
> occurs when we do a full installation.
> 
> Fixes;

 In the future, please use a colon so patchwork picks it up as a fix :-)

>     http://autobuild.buildroot.org/results/f47/f470ffb55625e2639cecde713442550eb532d0d7/
>     http://autobuild.buildroot.org/results/954/9547929292e81671fbe3a5b4bbc87a6424edb1ca/
>     http://autobuild.buildroot.org/results/303/30359c351a6ce2f9139494a531e036f0b0406ccf
> 
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Co-Developped-by: Pascal de Bruijn <p.debruijn@unilogic.nl>
> Cc: Pascal de Bruijn <p.debruijn@unilogic.nl>
> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>

 Series applied to master, thanks.

 Regards,
 Arnout

> ---
>  package/lvm2/lvm2.mk | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
> index 00baa50a86..5ce79768b6 100644
> --- a/package/lvm2/lvm2.mk
> +++ b/package/lvm2/lvm2.mk
> @@ -49,16 +49,15 @@ endif
>  ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),y)
>  LVM2_INSTALL_STAGING_OPTS += install
>  LVM2_INSTALL_TARGET_OPTS += install
> +ifeq ($(BR2_INIT_SYSTEMD),y)
> +LVM2_INSTALL_TARGET_OPTS += install_systemd_units install_systemd_generators
> +endif
>  else
>  LVM2_MAKE_OPTS = device-mapper
>  LVM2_INSTALL_STAGING_OPTS += install_device-mapper
>  LVM2_INSTALL_TARGET_OPTS += install_device-mapper
>  endif
>  
> -ifeq ($(BR2_INIT_SYSTEMD),y)
> -LVM2_INSTALL_TARGET_OPTS += install_systemd_units install_systemd_generators
> -endif
> -
>  ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
>  LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no
>  endif
> 

[Buildroot] [PATCH 2/2] package/lvm2: fix installation of systemd units

[Yann E. MORIN]

Arnout, all,

On 2021-06-02 23:12 +0200, Arnout Vandecappelle spake thusly:
> On 21/05/2021 16:44, Yann E. MORIN wrote:
> > Since we bump the version in commit 80997acd3587 (package/lvm2: bump
> > version to 2.03.12), the installation of systemd units is no longer
> > functional without a full installation.
> > 
> > As Pascal puts it: the systemd service files don't make a whole lot of
> > sense when there isn't a full lvm2 install.
> > 
> > Move the conditional block that install system units, so that it only
> > occurs when we do a full installation.
> > 
> > Fixes;
>  In the future, please use a colon so patchwork picks it up as a fix :-)

Oh come on... It would mean I would have to hit the 'shift' key right
before I hit the ';' key, not right after. This is too difficult for me
to synchronise those two key hits right...

(If I had used an azerty keyboard, not an qwerty one, my excuse would
have been that the ';' and ':' keys are too close to each other, and
aiming for the correct key would too difficult for my fat fingers...)

> >     http://autobuild.buildroot.org/results/f47/f470ffb55625e2639cecde713442550eb532d0d7/
> >     http://autobuild.buildroot.org/results/954/9547929292e81671fbe3a5b4bbc87a6424edb1ca/
> >     http://autobuild.buildroot.org/results/303/30359c351a6ce2f9139494a531e036f0b0406ccf
> > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> > Co-Developped-by: Pascal de Bruijn <p.debruijn@unilogic.nl>
> > Cc: Pascal de Bruijn <p.debruijn@unilogic.nl>
> > Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>  Series applied to master, thanks.

As I understood, that's been applied ot both next and master. Thanks!
:-)

Regards,
Yann E. MORIN.

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

[Buildroot] [PATCH 2/2] package/lvm2: fix installation of systemd units

[Arnout Vandecappelle]

On 03/06/2021 21:54, Yann E. MORIN wrote:
> Arnout, all,
> 
> On 2021-06-02 23:12 +0200, Arnout Vandecappelle spake thusly:
>> On 21/05/2021 16:44, Yann E. MORIN wrote:
>>> Since we bump the version in commit 80997acd3587 (package/lvm2: bump
>>> version to 2.03.12), the installation of systemd units is no longer
>>> functional without a full installation.
>>>
>>> As Pascal puts it: the systemd service files don't make a whole lot of
>>> sense when there isn't a full lvm2 install.
>>>
>>> Move the conditional block that install system units, so that it only
>>> occurs when we do a full installation.
>>>
>>> Fixes;
>>  In the future, please use a colon so patchwork picks it up as a fix :-)
> 
> Oh come on... It would mean I would have to hit the 'shift' key right
> before I hit the ';' key, not right after. This is too difficult for me
> to synchronise those two key hits right...
> 
> (If I had used an azerty keyboard, not an qwerty one, my excuse would
> have been that the ';' and ':' keys are too close to each other, and
> aiming for the correct key would too difficult for my fat fingers...)
> 
>>>     http://autobuild.buildroot.org/results/f47/f470ffb55625e2639cecde713442550eb532d0d7/
>>>     http://autobuild.buildroot.org/results/954/9547929292e81671fbe3a5b4bbc87a6424edb1ca/
>>>     http://autobuild.buildroot.org/results/303/30359c351a6ce2f9139494a531e036f0b0406ccf
>>> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
>>> Co-Developped-by: Pascal de Bruijn <p.debruijn@unilogic.nl>
>>> Cc: Pascal de Bruijn <p.debruijn@unilogic.nl>
>>> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>>  Series applied to master, thanks.
> 
> As I understood, that's been applied ot both next and master. Thanks!

 No, only master. I didn't push next.

 Regards,
 Arnout