[Buildroot] [PATCH 1/2] package/libcgroup: bump to version 2.0.3

[Buildroot] [PATCH 1/2] package/libcgroup: bump to version 2.0.3

[Oleg Lyovin via buildroot]

https://github.com/libcgroup/libcgroup/releases/tag/v2.0.3

Also remove redundant LIBCGROUP_SOURCE definition.

Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
---
 package/libcgroup/libcgroup.hash | 4 ++--
 package/libcgroup/libcgroup.mk   | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/libcgroup/libcgroup.hash b/package/libcgroup/libcgroup.hash
index 70671212ef..65b98d94e2 100644
--- a/package/libcgroup/libcgroup.hash
+++ b/package/libcgroup/libcgroup.hash
@@ -1,5 +1,5 @@
-# From https://github.com/libcgroup/libcgroup/releases/download/v0.42.2/libcgroup-0.42.2.tar.bz2.sha256
-sha256  18939381324d418e11be4f5fdca37b01652c18917bfaf1f6b0c505f157e18d07  libcgroup-0.42.2.tar.bz2
+# From https://github.com/libcgroup/libcgroup/releases/download/v2.0.3/libcgroup-2.0.3.tar.gz.sha256
+sha256  b29b5704de3d0fadf199fe4e17eeeaecba7f0dd1b85569c96eec37c7672e3026  libcgroup-2.0.3.tar.gz
 
 # Hash for license file
 sha256  a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861  COPYING
diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
index 156b066162..fb0b646c51 100644
--- a/package/libcgroup/libcgroup.mk
+++ b/package/libcgroup/libcgroup.mk
@@ -4,8 +4,7 @@
 #
 ################################################################################
 
-LIBCGROUP_VERSION = 0.42.2
-LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2
+LIBCGROUP_VERSION = 2.0.3
 LIBCGROUP_SITE = https://github.com/libcgroup/libcgroup/releases/download/v$(LIBCGROUP_VERSION)
 LIBCGROUP_LICENSE = LGPL-2.1
 LIBCGROUP_LICENSE_FILES = COPYING
-- 
2.34.1

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

[Buildroot] [PATCH 2/2] package/libcgroup: fix build with musl

[Oleg Lyovin via buildroot]

libcgroup depends on fts API which is missing in musl libc
and provided by musl-fts package.

This patch makes libcgroup dependent on musl-fts for 
non-glibc configurations.

Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
---
 package/libcgroup/Config.in    | 7 ++++---
 package/libcgroup/libcgroup.mk | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in
index 03efa71e6b..75c9accacc 100644
--- a/package/libcgroup/Config.in
+++ b/package/libcgroup/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_LIBCGROUP
 	bool "libcgroup"
 	depends on BR2_INSTALL_LIBSTDCPP
 	# libcgroup uses <fts.h> which is not included by default in uClibc
-	depends on BR2_TOOLCHAIN_USES_GLIBC
+	depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL
+	select BR2_PACKAGE_MUSL_FTS if BR2_TOOLCHAIN_USES_MUSL
 	help
 	  libcgroup is a library that abstracts the control
 	  group file system in Linux.
@@ -18,5 +19,5 @@ config BR2_PACKAGE_LIBCGROUP_TOOLS
 
 endif
 
-comment "libcgroup needs a glibc toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC
+comment "libcgroup needs a glibc/musl toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP || !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
index fb0b646c51..d67710ec1e 100644
--- a/package/libcgroup/libcgroup.mk
+++ b/package/libcgroup/libcgroup.mk
@@ -36,4 +36,9 @@ else
 LIBCGROUP_CONF_OPTS += --disable-pam
 endif
 
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)
+LIBCGROUP_DEPENDENCIES += musl-fts
+LIBCGROUP_CONF_ENV += LDFLAGS=-lfts
+endif
+
 $(eval $(autotools-package))
-- 
2.34.1

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

Re: [Buildroot] [PATCH 2/2] package/libcgroup: fix build with musl

[Arnout Vandecappelle via buildroot]

  Hi Oleg,

  Thank you for your patch! I have a few comments for improvement.

  First of all, in the subject line, "fix build with musl" suggest that it 
currently fails to build in mainline. That's not the case, because musl is 
excluded. So a better subject line would be "allow to build with musl".

On 25/06/2023 14:48, Oleg Lyovin via buildroot wrote:
> libcgroup depends on fts API which is missing in musl libc
> and provided by musl-fts package.
> 
> This patch makes libcgroup dependent on musl-fts for
> non-glibc configurations.
> 
> Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
> ---
>   package/libcgroup/Config.in    | 7 ++++---
>   package/libcgroup/libcgroup.mk | 5 +++++
>   2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in
> index 03efa71e6b..75c9accacc 100644
> --- a/package/libcgroup/Config.in
> +++ b/package/libcgroup/Config.in
> @@ -2,7 +2,8 @@ config BR2_PACKAGE_LIBCGROUP
>   	bool "libcgroup"
>   	depends on BR2_INSTALL_LIBSTDCPP
>   	# libcgroup uses <fts.h> which is not included by default in uClibc
> -	depends on BR2_TOOLCHAIN_USES_GLIBC
> +	depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL
> +	select BR2_PACKAGE_MUSL_FTS if BR2_TOOLCHAIN_USES_MUSL

  If fts really is the only problem, then we don't need a libc exclusion at all, 
because musl-fts works for uClibc as well. It's enough to put

select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC

  If there is a different reason why uClibc doesn't work, then the comment above 
should be updated and the dependency should be

depends on !BR2_TOOLCHAIN_UCLIBC

  Can you test with uClibc and update the patch accordingly? You can use the 
test-pkg script to try out a number of configurations.


  I've marked this patch as Changes Requested in patchwork.

  Regards,
  Arnout

>   	help
>   	  libcgroup is a library that abstracts the control
>   	  group file system in Linux.
> @@ -18,5 +19,5 @@ config BR2_PACKAGE_LIBCGROUP_TOOLS
>   
>   endif
>   
> -comment "libcgroup needs a glibc toolchain w/ C++"
> -	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC
> +comment "libcgroup needs a glibc/musl toolchain w/ C++"
> +	depends on !BR2_INSTALL_LIBSTDCPP || !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
> diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
> index fb0b646c51..d67710ec1e 100644
> --- a/package/libcgroup/libcgroup.mk
> +++ b/package/libcgroup/libcgroup.mk
> @@ -36,4 +36,9 @@ else
>   LIBCGROUP_CONF_OPTS += --disable-pam
>   endif
>   
> +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)
> +LIBCGROUP_DEPENDENCIES += musl-fts
> +LIBCGROUP_CONF_ENV += LDFLAGS=-lfts
> +endif
> +
>   $(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/libcgroup: fix build with musl

[Yann E. MORIN]

Oleg, All,

On 2023-06-25 15:48 +0300, Oleg Lyovin via buildroot spake thusly:
> libcgroup depends on fts API which is missing in musl libc
> and provided by musl-fts package.
> 
> This patch makes libcgroup dependent on musl-fts for 
> non-glibc configurations.
> 
> Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
> ---
[--SNIP--]
> diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
> index fb0b646c51..d67710ec1e 100644
> --- a/package/libcgroup/libcgroup.mk
> +++ b/package/libcgroup/libcgroup.mk
> @@ -36,4 +36,9 @@ else
>  LIBCGROUP_CONF_OPTS += --disable-pam
>  endif
>  
> +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)
> +LIBCGROUP_DEPENDENCIES += musl-fts
> +LIBCGROUP_CONF_ENV += LDFLAGS=-lfts

I think it would be better to use LIBS rather than LDFLAGS. Could you
check that works too, and report here? If it works, I can change when
applying; if it does not work, I can apply without changing. ;-)

Regards,
Yann E. MORIN.

> +endif
> +
>  $(eval $(autotools-package))
> -- 
> 2.34.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

Re: [Buildroot] [PATCH 1/2] package/libcgroup: bump to version 2.0.3

[Arnout Vandecappelle via buildroot]

On 25/06/2023 14:48, Oleg Lyovin via buildroot wrote:
> https://github.com/libcgroup/libcgroup/releases/tag/v2.0.3
> 
> Also remove redundant LIBCGROUP_SOURCE definition.
> 
> Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   package/libcgroup/libcgroup.hash | 4 ++--
>   package/libcgroup/libcgroup.mk   | 3 +--
>   2 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/package/libcgroup/libcgroup.hash b/package/libcgroup/libcgroup.hash
> index 70671212ef..65b98d94e2 100644
> --- a/package/libcgroup/libcgroup.hash
> +++ b/package/libcgroup/libcgroup.hash
> @@ -1,5 +1,5 @@
> -# From https://github.com/libcgroup/libcgroup/releases/download/v0.42.2/libcgroup-0.42.2.tar.bz2.sha256
> -sha256  18939381324d418e11be4f5fdca37b01652c18917bfaf1f6b0c505f157e18d07  libcgroup-0.42.2.tar.bz2
> +# From https://github.com/libcgroup/libcgroup/releases/download/v2.0.3/libcgroup-2.0.3.tar.gz.sha256
> +sha256  b29b5704de3d0fadf199fe4e17eeeaecba7f0dd1b85569c96eec37c7672e3026  libcgroup-2.0.3.tar.gz
>   
>   # Hash for license file
>   sha256  a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861  COPYING
> diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
> index 156b066162..fb0b646c51 100644
> --- a/package/libcgroup/libcgroup.mk
> +++ b/package/libcgroup/libcgroup.mk
> @@ -4,8 +4,7 @@
>   #
>   ################################################################################
>   
> -LIBCGROUP_VERSION = 0.42.2
> -LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2
> +LIBCGROUP_VERSION = 2.0.3
>   LIBCGROUP_SITE = https://github.com/libcgroup/libcgroup/releases/download/v$(LIBCGROUP_VERSION)
>   LIBCGROUP_LICENSE = LGPL-2.1
>   LIBCGROUP_LICENSE_FILES = COPYING
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/libcgroup: bump to version 2.0.3

[Yann E. MORIN]

Oleg, All,

On 2023-06-25 15:48 +0300, Oleg Lyovin via buildroot spake thusly:
> https://github.com/libcgroup/libcgroup/releases/tag/v2.0.3
> 
> Also remove redundant LIBCGROUP_SOURCE definition.

it is not redundant: it downloads the bz2-compressed archive instead of
the default gz-compressed one.

I'm OK for switching (the package is small), but the commit log is
incorrect.

Regards,
Yann E. MORIN.

> Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
> ---
>  package/libcgroup/libcgroup.hash | 4 ++--
>  package/libcgroup/libcgroup.mk   | 3 +--
>  2 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/package/libcgroup/libcgroup.hash b/package/libcgroup/libcgroup.hash
> index 70671212ef..65b98d94e2 100644
> --- a/package/libcgroup/libcgroup.hash
> +++ b/package/libcgroup/libcgroup.hash
> @@ -1,5 +1,5 @@
> -# From https://github.com/libcgroup/libcgroup/releases/download/v0.42.2/libcgroup-0.42.2.tar.bz2.sha256
> -sha256  18939381324d418e11be4f5fdca37b01652c18917bfaf1f6b0c505f157e18d07  libcgroup-0.42.2.tar.bz2
> +# From https://github.com/libcgroup/libcgroup/releases/download/v2.0.3/libcgroup-2.0.3.tar.gz.sha256
> +sha256  b29b5704de3d0fadf199fe4e17eeeaecba7f0dd1b85569c96eec37c7672e3026  libcgroup-2.0.3.tar.gz
>  
>  # Hash for license file
>  sha256  a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861  COPYING
> diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
> index 156b066162..fb0b646c51 100644
> --- a/package/libcgroup/libcgroup.mk
> +++ b/package/libcgroup/libcgroup.mk
> @@ -4,8 +4,7 @@
>  #
>  ################################################################################
>  
> -LIBCGROUP_VERSION = 0.42.2
> -LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2
> +LIBCGROUP_VERSION = 2.0.3
>  LIBCGROUP_SITE = https://github.com/libcgroup/libcgroup/releases/download/v$(LIBCGROUP_VERSION)
>  LIBCGROUP_LICENSE = LGPL-2.1
>  LIBCGROUP_LICENSE_FILES = COPYING
> -- 
> 2.34.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

[Buildroot] [PATCH v2] package/libcgroup: allow to build with musl

[Oleg Lyovin via buildroot]

libcgroup depends on fts API which is missing in musl libc
and provided by musl-fts package.

This patch makes libcgroup dependent on musl-fts for
non-glibc configurations.

Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>

---
Changes v1 -> v2:
  - remove glibc dependency: checked that libcgroup can be built in all
    the configurations: glibc, musl, uClibc, but requires musl-fts
    for the last two.
    (suggested by Arnout)
  - remove LDFLAGS modification: it seems that autoconf
    automatically searches for a library that provides 'fts_open'.
    (suggested by Yann)
  - changed commit-msg (suggsted by Arnout)
    and rebased onto 'master' branch

glibc, musl and uClibc builds are approved by 'test-pkg' script:
      bootlin-armv5-uclibc [1/3]: OK
      bootlin-armv7-glibc [2/3]: OK
      bootlin-x86-64-musl [3/3]: OK

Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
---
 package/libcgroup/Config.in    | 7 +++----
 package/libcgroup/libcgroup.mk | 4 ++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in
index 03efa71e6b..546b5f3560 100644
--- a/package/libcgroup/Config.in
+++ b/package/libcgroup/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_LIBCGROUP
 	bool "libcgroup"
 	depends on BR2_INSTALL_LIBSTDCPP
-	# libcgroup uses <fts.h> which is not included by default in uClibc
-	depends on BR2_TOOLCHAIN_USES_GLIBC
+	select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  libcgroup is a library that abstracts the control
 	  group file system in Linux.
@@ -18,5 +17,5 @@ config BR2_PACKAGE_LIBCGROUP_TOOLS
 
 endif
 
-comment "libcgroup needs a glibc toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC
+comment "libcgroup needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
\ No newline at end of file
diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
index fb0b646c51..e3de48c561 100644
--- a/package/libcgroup/libcgroup.mk
+++ b/package/libcgroup/libcgroup.mk
@@ -36,4 +36,8 @@ else
 LIBCGROUP_CONF_OPTS += --disable-pam
 endif
 
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)
+LIBCGROUP_DEPENDENCIES += musl-fts
+endif
+
 $(eval $(autotools-package))
-- 
2.34.1

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

Re: [Buildroot] [PATCH v2] package/libcgroup: allow to build with musl

[Arnout Vandecappelle via buildroot]

On 25/06/2023 18:51, Oleg Lyovin via buildroot wrote:
> libcgroup depends on fts API which is missing in musl libc
> and provided by musl-fts package.
> 
> This patch makes libcgroup dependent on musl-fts for
> non-glibc configurations.
> 
> Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>

  Applied to master, thanks. The subject line now should be "allow to build with 
musl and uClibc", so I changed that :-)

  Regards,
  Arnout

> 
> ---
> Changes v1 -> v2:
>    - remove glibc dependency: checked that libcgroup can be built in all
>      the configurations: glibc, musl, uClibc, but requires musl-fts
>      for the last two.
>      (suggested by Arnout)
>    - remove LDFLAGS modification: it seems that autoconf
>      automatically searches for a library that provides 'fts_open'.
>      (suggested by Yann)
>    - changed commit-msg (suggsted by Arnout)
>      and rebased onto 'master' branch
> 
> glibc, musl and uClibc builds are approved by 'test-pkg' script:
>        bootlin-armv5-uclibc [1/3]: OK
>        bootlin-armv7-glibc [2/3]: OK
>        bootlin-x86-64-musl [3/3]: OK
> 
> Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
> ---
>   package/libcgroup/Config.in    | 7 +++----
>   package/libcgroup/libcgroup.mk | 4 ++++
>   2 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in
> index 03efa71e6b..546b5f3560 100644
> --- a/package/libcgroup/Config.in
> +++ b/package/libcgroup/Config.in
> @@ -1,8 +1,7 @@
>   config BR2_PACKAGE_LIBCGROUP
>   	bool "libcgroup"
>   	depends on BR2_INSTALL_LIBSTDCPP
> -	# libcgroup uses <fts.h> which is not included by default in uClibc
> -	depends on BR2_TOOLCHAIN_USES_GLIBC
> +	select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
>   	help
>   	  libcgroup is a library that abstracts the control
>   	  group file system in Linux.
> @@ -18,5 +17,5 @@ config BR2_PACKAGE_LIBCGROUP_TOOLS
>   
>   endif
>   
> -comment "libcgroup needs a glibc toolchain w/ C++"
> -	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC
> +comment "libcgroup needs a toolchain w/ C++"
> +	depends on !BR2_INSTALL_LIBSTDCPP
> \ No newline at end of file
> diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
> index fb0b646c51..e3de48c561 100644
> --- a/package/libcgroup/libcgroup.mk
> +++ b/package/libcgroup/libcgroup.mk
> @@ -36,4 +36,8 @@ else
>   LIBCGROUP_CONF_OPTS += --disable-pam
>   endif
>   
> +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)
> +LIBCGROUP_DEPENDENCIES += musl-fts
> +endif
> +
>   $(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot