[Buildroot] [PATCH next 0/2] fix name clash between libite and LiTE

[Buildroot] [PATCH next 0/2] fix name clash between libite and LiTE

[Joachim Wiberg]

Hi,

this patch series updates libite and watchdogd to correct the
unfortunate name clash between libite and the DirectFB LiTE
project's header files.

http://autobuild.buildroot.net/results/185c753af2aa159b494b13f78b0826dddbe4aed6

Note: if applying this series in fragments, please update watchdogd
      first, otherwise the build will fail due to the relocation of
      the libite headers.

Best regards
 /Joachim

Joachim Wiberg (2):
  package/watchdogd: bump to version 3.5
  package/libite: bump to version 2.5.1

 package/libite/libite.hash       | 2 +-
 package/libite/libite.mk         | 3 ++-
 package/watchdogd/watchdogd.hash | 2 +-
 package/watchdogd/watchdogd.mk   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH next 1/2] package/watchdogd: bump to version 3.5

[Joachim Wiberg]

This addresses the autobuilder failure for master as per 2021-11-27.
The root cause was a name clash in a dependency, the libite library,
clashing with the DirectFB LiTE library header files.  Hence, this
update alone does not fix [1], libite also needs to be updated.  To
provide a smooth transition though, watchdogd should be updated first.

[1]: http://autobuild.buildroot.net/results/185c753af2aa159b494b13f78b0826dddbe4aed6

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 package/watchdogd/watchdogd.hash | 2 +-
 package/watchdogd/watchdogd.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/watchdogd/watchdogd.hash b/package/watchdogd/watchdogd.hash
index 7c1acf0820..09a34d6b47 100644
--- a/package/watchdogd/watchdogd.hash
+++ b/package/watchdogd/watchdogd.hash
@@ -1,5 +1,5 @@
 # Upstream .sha256 from GitHub
-sha256 f36fdea9b323534a704c4c23d9af8050480bca4bdad89cdb50d26fcac316d172  watchdogd-3.4.tar.gz
+sha256 33ec4edc8cb4ada7a4d8324a27d897d33aae5e83257ed64d3d37508825c11237  watchdogd-3.5.tar.gz
 
 # Locally calculated
 sha256 fd685e20931174308c45a26418a7ce34d66704c4e4b92ab1d8299deb255cd676  LICENSE
diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk
index 34b17aa169..b666b56433 100644
--- a/package/watchdogd/watchdogd.mk
+++ b/package/watchdogd/watchdogd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WATCHDOGD_VERSION = 3.4
+WATCHDOGD_VERSION = 3.5
 WATCHDOGD_SITE = https://github.com/troglobit/watchdogd/releases/download/$(WATCHDOGD_VERSION)
 WATCHDOGD_LICENSE = ISC
 WATCHDOGD_LICENSE_FILES = LICENSE
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH next 1/2] package/watchdogd: bump to version 3.5

[Thomas Petazzoni]

On Thu,  2 Dec 2021 02:39:01 +0100
Joachim Wiberg <troglobit@gmail.com> wrote:

> This addresses the autobuilder failure for master as per 2021-11-27.
> The root cause was a name clash in a dependency, the libite library,
> clashing with the DirectFB LiTE library header files.  Hence, this
> update alone does not fix [1], libite also needs to be updated.  To
> provide a smooth transition though, watchdogd should be updated first.
> 
> [1]: http://autobuild.buildroot.net/results/185c753af2aa159b494b13f78b0826dddbe4aed6
> 
> Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
> ---
>  package/watchdogd/watchdogd.hash | 2 +-
>  package/watchdogd/watchdogd.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Thanks, I've applied both to next, as indicated in the patch title.
However, in the commit log, you seem to indicate that it's fixing a
build issue in master. Could you confirm?

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH next 1/2] package/watchdogd: bump to version 3.5

[Joachim Wiberg]

On 12/4/21 9:04 PM, Thomas Petazzoni wrote:
> On Thu,  2 Dec 2021 02:39:01 +0100
> Joachim Wiberg <troglobit@gmail.com> wrote:
>> This addresses the autobuilder failure for master as per 2021-11-27.
>> The root cause was a name clash in a dependency, the libite library,
>> clashing with the DirectFB LiTE library header files.  
> Thanks, I've applied both to next, as indicated in the patch title.
> However, in the commit log, you seem to indicate that it's fixing a
> build issue in master. Could you confirm?

Very unfortunate name clash between include files in two packages.

http://autobuild.buildroot.net/results/185c753af2aa159b494b13f78b0826dddbe4aed6


However, I think it's highly unlikely they'll be enabled at the same
time. My recommendation is to go for next and let 2021.11 out the door.

Best regards
 /Joachim

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH next 1/2] package/watchdogd: bump to version 3.5

[Thomas Petazzoni]

On Sat, 4 Dec 2021 21:23:23 +0100
Joachim Wiberg <troglobit@gmail.com> wrote:

> Very unfortunate name clash between include files in two packages.

Yes, I had followed this.

> http://autobuild.buildroot.net/results/185c753af2aa159b494b13f78b0826dddbe4aed6
> 
> However, I think it's highly unlikely they'll be enabled at the same
> time. My recommendation is to go for next and let 2021.11 out the door.

But if the build issue exists in master, we need to fix it in master,
or the issue will keep popping up again and again in the autobuilders.

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH next 1/2] package/watchdogd: bump to version 3.5

[Yann E. MORIN]

Thomas, All,

On 2021-12-04 21:23 +0100, Joachim Wiberg spake thusly:
> On 12/4/21 9:04 PM, Thomas Petazzoni wrote:
> > On Thu,  2 Dec 2021 02:39:01 +0100
> > Joachim Wiberg <troglobit@gmail.com> wrote:
> >> This addresses the autobuilder failure for master as per 2021-11-27.
> >> The root cause was a name clash in a dependency, the libite library,
> >> clashing with the DirectFB LiTE library header files.  
> > Thanks, I've applied both to next, as indicated in the patch title.
> > However, in the commit log, you seem to indicate that it's fixing a
> > build issue in master. Could you confirm?

We've discussed this on IRC with Joachim, and it was my expectation that
the patches would be aimed at master, because they *do* fix an actual
build failure in master.

The reasoning for accepting the bump in master was that libite is only
ever used by watchdogd in Buldroot. Both packages are maintained
upstream and in Buildroot by Joachim, which is pretty fast at addressing
build issues.

> Very unfortunate name clash between include files in two packages.
> http://autobuild.buildroot.net/results/185c753af2aa159b494b13f78b0826dddbe4aed6
> 
> However, I think it's highly unlikely they'll be enabled at the same
> time. My recommendation is to go for next and let 2021.11 out the door.

Even if that were true, it will still happen in our CI and thus cause
build failures, which creates noise and may hide other, more intersting
failures. Besides, once a package is in the tree, people are going to
use it.

DirectFB is often used in embedded, and watchdogd is a process
supervisor for embedded, and so it is not too far-fetched to see that
the two could be easily used on the same system. For real. We want to
avoid name-clashing for those.

So I would say that we should also apply them to master.

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 mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH next 1/2] package/watchdogd: bump to version 3.5

[Joachim Wiberg]

[-- Attachment #1.1.1: Type: text/plain, Size: 1584 bytes --]

Hi everyone!

On 12/4/21 9:59 PM, Yann E. MORIN wrote:
> On 2021-12-04 21:23 +0100, Joachim Wiberg spake thusly:
>> On 12/4/21 9:04 PM, Thomas Petazzoni wrote:
>>> On Thu,  2 Dec 2021 02:39:01 +0100
>>> Joachim Wiberg <troglobit@gmail.com> wrote:
>>>> This addresses the autobuilder failure for master as per 2021-11-27.
>>>> The root cause was a name clash in a dependency, the libite library,
>>>> clashing with the DirectFB LiTE library header files.  
>>> Thanks, I've applied both to next, as indicated in the patch title.
>>> However, in the commit log, you seem to indicate that it's fixing a
>>> build issue in master. Could you confirm?
> We've discussed this on IRC with Joachim, and it was my expectation that
> the patches would be aimed at master, because they *do* fix an actual
> build failure in master.
> [snip]
> So I would say that we should also apply them to master.

Also, on 12/4/21 9:49 PM, Thomas Petazzoni wrote:
> On Sat, 4 Dec 2021 Joachim Wiberg <troglobit@gmail.com> wrote:
>> However, I think it's highly unlikely they'll be enabled at the same
>> time. My recommendation is for next and let 2021.11 out the door.
> But if the build issue exists in master, we need to fix it in master,
> or the issue will keep popping up again and again in the autobuilders.

I'm sorry for the misunderstanding on my part.  I simply didn't realize
how seriously you viewed the issue, and also did not want to needlessly
block the release.

I leave release critical decisions up to your discretion, obviously.

Best regards
 /Joachim


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH next 2/2] package/libite: bump to version 2.5.1

[Joachim Wiberg]

This bump is mainly to fix the header file nameclash problem with LiTE,
in package/lite.  See the libite project's README for how to adapt to
this change, and the ChangeLog for details.  In short, libite now use
the /usr/include/libite/*.h prefix.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 package/libite/libite.hash | 2 +-
 package/libite/libite.mk   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/libite/libite.hash b/package/libite/libite.hash
index 6f461f9b76..1dec65bd6b 100644
--- a/package/libite/libite.hash
+++ b/package/libite/libite.hash
@@ -1,5 +1,5 @@
 # Upstream .sha256 from GitHub
-sha256  8fad6b8a1e7e0d6b546863104dfe25dfe0bb2d2a9b98ec8e155d23392ef58514  libite-2.4.1.tar.xz
+sha256  5278fa0ca933727c78f4e05082cea58256d9302afac30bad0c3760cf2a18ef8f  libite-2.5.1.tar.xz
 
 # Locally calculated
 sha256  20db0601195f708d68ff7907907b3cd3b25808efa8332e064b11f00c839a5d2f  LICENSE
diff --git a/package/libite/libite.mk b/package/libite/libite.mk
index 7ccf642e50..185ffe77de 100644
--- a/package/libite/libite.mk
+++ b/package/libite/libite.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-LIBITE_VERSION = 2.4.1
+LIBITE_VERSION = 2.5.1
 LIBITE_SOURCE = libite-$(LIBITE_VERSION).tar.xz
 LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VERSION)
 LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause
 LIBITE_LICENSE_FILES = LICENSE src/chomp.c src/pidfile.c
 LIBITE_INSTALL_STAGING = YES
+LIBITE_CONF_OPTS = --without-symlink
 
 $(eval $(autotools-package))
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH next 0/2] fix name clash between libite and LiTE

[Yann E. MORIN]

Joachim, All,

On 2021-12-02 02:39 +0100, Joachim Wiberg spake thusly:
> this patch series updates libite and watchdogd to correct the
> unfortunate name clash between libite and the DirectFB LiTE
> project's header files.
> 
> http://autobuild.buildroot.net/results/185c753af2aa159b494b13f78b0826dddbe4aed6
> 
> Note: if applying this series in fragments, please update watchdogd
>       first, otherwise the build will fail due to the relocation of
>       the libite headers.

Series cherry-picked from next into master, now. Thanks for the fast
round-trip in fixing this! 👍

Regards,
Yann E. MORIN.

> Best regards
>  /Joachim
> 
> Joachim Wiberg (2):
>   package/watchdogd: bump to version 3.5
>   package/libite: bump to version 2.5.1
> 
>  package/libite/libite.hash       | 2 +-
>  package/libite/libite.mk         | 3 ++-
>  package/watchdogd/watchdogd.hash | 2 +-
>  package/watchdogd/watchdogd.mk   | 2 +-
>  4 files changed, 5 insertions(+), 4 deletions(-)
> 
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  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 mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot