Skip to contentSkip to conversation

Fix Buildroot Makefile failure on lvm2

PATCH New Giulio Benetti 2 participants 5 messages Jun 3, 2021

lore
Share & tools
lore
#0 lore raw

cover Fix Buildroot Makefile failure on lvm2

Commit 8a313b019c7d7e898186a8b08f9c25ae0194fa16 prevents Buildroot to make any target due to a endif left behing in lvm2.mk. Following patch removes it and make Buildroot to work again.

Giulio Benetti (1):
package/lvm2: remove endif that prevents Buildroot to use Makefiles at
all

 package/lvm2/lvm2.mk | 2 --
 1 file changed, 2 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 package/lvm2: remove endif that prevents Buildroot to use Makefiles at all

Commit [1] breaks Buildroot Makefile since a Makefile endif has been left with no sense giving following error:
package/lvm2/lvm2.mk:61: *** extraneous 'endif'. Stop.

So let's remove that forgotten endif.

[1]: https://git.buildroot.net/buildroot/commit/?id=8a313b019c7d7e898186a8b08f9c25ae0194fa16

---
 package/lvm2/lvm2.mk | 2 --
 1 file changed, 2 deletions(-)
package/lvm2/lvm2.mk +0 -2
index 70787fe91b..5ce79768b6 100644
@@ -58,8 +58,6 @@ LVM2_INSTALL_STAGING_OPTS += install_device-mapper
 LVM2_INSTALL_TARGET_OPTS += install_device-mapper
 endif
 
-endif
-
 ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
 LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no
 endif
Signature · 1 line
2.25.1
#2 lore raw

cover Fix Buildroot Makefile failure on lvm2

In reply to Giulio Benetti
Quoted 3 lines · Giulio Benetti

Commit 8a313b019c7d7e898186a8b08f9c25ae0194fa16 prevents Buildroot to make any target due to a endif left behing in lvm2.mk. Following patch removes it and make Buildroot to work again.

Gah. I had first applied it to next and tested it there, and then I saw that it
was actually a fix so I cherry-picked it on master. There was a merge conflict but it got resolved automatically so I didn't look at it :-(

Thanks for the quick fix!

Applied to master, thanks.

Regards,
Arnout

Quoted 8 lines

Giulio Benetti (1):
package/lvm2: remove endif that prevents Buildroot to use Makefiles at
all

 package/lvm2/lvm2.mk | 2 --
 1 file changed, 2 deletions(-)
#3 lore raw

cover Fix Buildroot Makefile failure on lvm2

Quoted 10 lines · Arnout Vandecappelle
Quoted 3 lines · Giulio Benetti

Commit 8a313b019c7d7e898186a8b08f9c25ae0194fa16 prevents Buildroot to make any target due to a endif left behing in lvm2.mk. Following patch removes it and make Buildroot to work again.

Gah. I had first applied it to next and tested it there, and then I saw that it
was actually a fix so I cherry-picked it on master. There was a merge conflict but it got resolved automatically so I didn't look at it :-(

It happens :-)

Quoted 3 lines

Thanks for the quick fix!

Applied to master, thanks.

I see you didn't push, or am I wrong? My worry is that autobuilders start to fail every build. I don't know how often they pull master.

Best regards

Signature · 2 lines
Giulio Benetti
Benetti Engineering sas
Quoted 16 lines

Regards,
Arnout

Quoted 8 lines

Giulio Benetti (1):
package/lvm2: remove endif that prevents Buildroot to use Makefiles at
all

  package/lvm2/lvm2.mk | 2 --
  1 file changed, 2 deletions(-)

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#4 lore raw

cover Fix Buildroot Makefile failure on lvm2

Quoted 12 lines · Giulio Benetti
Quoted 10 lines · Arnout Vandecappelle
Quoted 3 lines · Giulio Benetti

Commit 8a313b019c7d7e898186a8b08f9c25ae0194fa16 prevents Buildroot to make any target due to a endif left behing in lvm2.mk. Following patch removes it and make Buildroot to work again.

? Gah. I had first applied it to next and tested it there, and then I saw that it was actually a fix so I cherry-picked it on master. There was a merge conflict but it got resolved automatically so I didn't look at it :-(

Quoted 8 lines

It happens :-)

Quoted 3 lines

? Thanks for the quick fix!

? Applied to master, thanks.

I see you didn't push, or am I wrong? My worry is that autobuilders start to fail every build. I don't know how often they pull master.

Indeed I forgot to push. Concentrate, Arnout!

Regards,
Arnout