Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/bubblewrap: fix build failure if kernel uses localversion
@ 2026-09-28 18:24 Fiona Klute via buildroot
  2026-09-28 18:41 ` Adrian Perez de Castro
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Fiona Klute via buildroot @ 2026-09-28 18:24 UTC (permalink / raw)
  To: buildroot; +Cc: Adrian Perez de Castro, Fiona Klute

Bubblewrap expects the value of the assume_kernel option, if set, to
be exactly three numbers separated by dots, nothing else [1]. If that
requirement is not met configuring the build fails.

Buildroot sets assume_kernel to $(LINUX_VERSION_PROBED) since the
version bump to 0.12.0). However, the expansion of
LINUX_VERSION_PROBED may contain additional suffixes, e.g. if
CONFIG_LOCALVERSION is set, or localversion* files are present (like
in CIP kernels). So filter the version string to ignore any suffixes.

[1] https://github.com/containers/bubblewrap/blob/v0.13.0/meson.build#L94-L104

Fixes: 4cb6193d2eca39b1bd79ff4867c842f507f692b8
Fixes: https://autobuild.buildroot.org/results/e7513e4730000e46b13bb9cf25955ebd3ec5fb71/

Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
---
 package/bubblewrap/bubblewrap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk
index dcc3c23d7c..a58d7fd143 100644
--- a/package/bubblewrap/bubblewrap.mk
+++ b/package/bubblewrap/bubblewrap.mk
@@ -18,7 +18,7 @@ define BUBBLEWRAP_LINUX_CONFIG_FIXUPS
 endef
 
 BUBBLEWRAP_CONF_OPTS = \
-	-Dassume_kernel=$(LINUX_VERSION_PROBED) \
+	-Dassume_kernel=$(shell echo $(LINUX_VERSION_PROBED) | grep -o '^[0-9]\+\.[0-9]\+\.[0-9]\+') \
 	-Dzsh_completion=disabled \
 	-Dman=disabled \
 	-Dpython=$(HOST_DIR)/bin/python \
-- 
2.55.0

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/bubblewrap: fix build failure if kernel uses localversion
  2026-09-28 18:24 [Buildroot] [PATCH 1/1] package/bubblewrap: fix build failure if kernel uses localversion Fiona Klute via buildroot
@ 2026-09-28 18:41 ` Adrian Perez de Castro
  2026-09-28 18:58 ` Fiona Klute via buildroot
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Adrian Perez de Castro @ 2026-09-28 18:41 UTC (permalink / raw)
  To: Fiona Klute via buildroot; +Cc: Fiona Klute


[-- Attachment #1.1: Type: text/plain, Size: 2001 bytes --]

Hello Fiona, all,

You beat me to this one, thanks a lot! These days I can only work on Buildroot
on my spare time, hence me being slow to get things done. I'm happy to do
reviews, tho!

So therefore...

On Mon, 28 Sep 2026 20:24:54 +0200 Fiona Klute via buildroot <buildroot@buildroot.org> wrote:

> Bubblewrap expects the value of the assume_kernel option, if set, to
> be exactly three numbers separated by dots, nothing else [1]. If that
> requirement is not met configuring the build fails.
> 
> Buildroot sets assume_kernel to $(LINUX_VERSION_PROBED) since the
> version bump to 0.12.0). However, the expansion of
> LINUX_VERSION_PROBED may contain additional suffixes, e.g. if
> CONFIG_LOCALVERSION is set, or localversion* files are present (like
> in CIP kernels). So filter the version string to ignore any suffixes.
> 
> [1] https://github.com/containers/bubblewrap/blob/v0.13.0/meson.build#L94-L104
> 
> Fixes: 4cb6193d2eca39b1bd79ff4867c842f507f692b8
> Fixes: https://autobuild.buildroot.org/results/e7513e4730000e46b13bb9cf25955ebd3ec5fb71/
> 
> Signed-off-by: Fiona Klute <fiona.klute@gmx.de>

Acked-by: Adrian Perez de Castro <aperez@igalia.com>

> ---
>  package/bubblewrap/bubblewrap.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk
> index dcc3c23d7c..a58d7fd143 100644
> --- a/package/bubblewrap/bubblewrap.mk
> +++ b/package/bubblewrap/bubblewrap.mk
> @@ -18,7 +18,7 @@ define BUBBLEWRAP_LINUX_CONFIG_FIXUPS
>  endef
>  
>  BUBBLEWRAP_CONF_OPTS = \
> -	-Dassume_kernel=$(LINUX_VERSION_PROBED) \
> +	-Dassume_kernel=$(shell echo $(LINUX_VERSION_PROBED) | grep -o '^[0-9]\+\.[0-9]\+\.[0-9]\+') \
>  	-Dzsh_completion=disabled \
>  	-Dman=disabled \
>  	-Dpython=$(HOST_DIR)/bin/python \
> -- 
> 2.55.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
> 

Cheers,
—Adrián

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

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

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/bubblewrap: fix build failure if kernel uses localversion
  2026-09-28 18:24 [Buildroot] [PATCH 1/1] package/bubblewrap: fix build failure if kernel uses localversion Fiona Klute via buildroot
  2026-09-28 18:41 ` Adrian Perez de Castro
@ 2026-09-28 18:58 ` Fiona Klute via buildroot
  2026-09-28 21:20 ` Thomas Petazzoni via buildroot
  2026-10-10  9:23 ` Thomas Perale via buildroot
  3 siblings, 0 replies; 5+ messages in thread
From: Fiona Klute via buildroot @ 2026-09-28 18:58 UTC (permalink / raw)
  To: buildroot; +Cc: Adrian Perez de Castro

Am 28.09.26 um 20:24 schrieb Fiona Klute via buildroot:
> Bubblewrap expects the value of the assume_kernel option, if set, to
> be exactly three numbers separated by dots, nothing else [1]. If that
> requirement is not met configuring the build fails.
> 
> Buildroot sets assume_kernel to $(LINUX_VERSION_PROBED) since the
> version bump to 0.12.0). However, the expansion of

Whoops, I just noticed there's a typo here, the closing parenthesis 
before period. Maybe that can be fixed with applying? :-)

> LINUX_VERSION_PROBED may contain additional suffixes, e.g. if
> CONFIG_LOCALVERSION is set, or localversion* files are present (like
> in CIP kernels). So filter the version string to ignore any suffixes.
> 
> [1] https://github.com/containers/bubblewrap/blob/v0.13.0/meson.build#L94-L104
> 
> Fixes: 4cb6193d2eca39b1bd79ff4867c842f507f692b8
> Fixes: https://autobuild.buildroot.org/results/e7513e4730000e46b13bb9cf25955ebd3ec5fb71/
> 
> Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
> ---
>   package/bubblewrap/bubblewrap.mk | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk
> index dcc3c23d7c..a58d7fd143 100644
> --- a/package/bubblewrap/bubblewrap.mk
> +++ b/package/bubblewrap/bubblewrap.mk
> @@ -18,7 +18,7 @@ define BUBBLEWRAP_LINUX_CONFIG_FIXUPS
>   endef
>   
>   BUBBLEWRAP_CONF_OPTS = \
> -	-Dassume_kernel=$(LINUX_VERSION_PROBED) \
> +	-Dassume_kernel=$(shell echo $(LINUX_VERSION_PROBED) | grep -o '^[0-9]\+\.[0-9]\+\.[0-9]\+') \
>   	-Dzsh_completion=disabled \
>   	-Dman=disabled \
>   	-Dpython=$(HOST_DIR)/bin/python \
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/bubblewrap: fix build failure if kernel uses localversion
  2026-09-28 18:24 [Buildroot] [PATCH 1/1] package/bubblewrap: fix build failure if kernel uses localversion Fiona Klute via buildroot
  2026-09-28 18:41 ` Adrian Perez de Castro
  2026-09-28 18:58 ` Fiona Klute via buildroot
@ 2026-09-28 21:20 ` Thomas Petazzoni via buildroot
  2026-10-10  9:23 ` Thomas Perale via buildroot
  3 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni via buildroot @ 2026-09-28 21:20 UTC (permalink / raw)
  To: Fiona Klute; +Cc: buildroot, Adrian Perez de Castro

On Mon, Sep 28, 2026 at 08:24:54PM +0200, Fiona Klute via buildroot wrote:
> Bubblewrap expects the value of the assume_kernel option, if set, to
> be exactly three numbers separated by dots, nothing else [1]. If that
> requirement is not met configuring the build fails.
> 
> Buildroot sets assume_kernel to $(LINUX_VERSION_PROBED) since the
> version bump to 0.12.0). However, the expansion of
> LINUX_VERSION_PROBED may contain additional suffixes, e.g. if
> CONFIG_LOCALVERSION is set, or localversion* files are present (like
> in CIP kernels). So filter the version string to ignore any suffixes.
> 
> [1] https://github.com/containers/bubblewrap/blob/v0.13.0/meson.build#L94-L104
> 
> Fixes: 4cb6193d2eca39b1bd79ff4867c842f507f692b8
> Fixes: https://autobuild.buildroot.org/results/e7513e4730000e46b13bb9cf25955ebd3ec5fb71/
> 
> Signed-off-by: Fiona Klute <fiona.klute@gmx.de>

Applied to master, thanks!

Best regards,

Thomas Petazzoni
-- 
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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/bubblewrap: fix build failure if kernel uses localversion
  2026-09-28 18:24 [Buildroot] [PATCH 1/1] package/bubblewrap: fix build failure if kernel uses localversion Fiona Klute via buildroot
                   ` (2 preceding siblings ...)
  2026-09-28 21:20 ` Thomas Petazzoni via buildroot
@ 2026-10-10  9:23 ` Thomas Perale via buildroot
  3 siblings, 0 replies; 5+ messages in thread
From: Thomas Perale via buildroot @ 2026-10-10  9:23 UTC (permalink / raw)
  To: Fiona Klute; +Cc: Thomas Perale, buildroot

In reply of:
> Bubblewrap expects the value of the assume_kernel option, if set, to
> be exactly three numbers separated by dots, nothing else [1]. If that
> requirement is not met configuring the build fails.
> 
> Buildroot sets assume_kernel to $(LINUX_VERSION_PROBED) since the
> version bump to 0.12.0). However, the expansion of
> LINUX_VERSION_PROBED may contain additional suffixes, e.g. if
> CONFIG_LOCALVERSION is set, or localversion* files are present (like
> in CIP kernels). So filter the version string to ignore any suffixes.
> 
> [1] https://github.com/containers/bubblewrap/blob/v0.13.0/meson.build#L94-L104
> 
> Fixes: 4cb6193d2eca39b1bd79ff4867c842f507f692b8
> Fixes: https://autobuild.buildroot.org/results/e7513e4730000e46b13bb9cf25955ebd3ec5fb71/
> 
> Signed-off-by: Fiona Klute <fiona.klute@gmx.de>

Applied to 2025.02.x & 2026.08.x. Thanks

> ---
>  package/bubblewrap/bubblewrap.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk
> index dcc3c23d7c..a58d7fd143 100644
> --- a/package/bubblewrap/bubblewrap.mk
> +++ b/package/bubblewrap/bubblewrap.mk
> @@ -18,7 +18,7 @@ define BUBBLEWRAP_LINUX_CONFIG_FIXUPS
>  endef
>  
>  BUBBLEWRAP_CONF_OPTS = \
> -	-Dassume_kernel=$(LINUX_VERSION_PROBED) \
> +	-Dassume_kernel=$(shell echo $(LINUX_VERSION_PROBED) | grep -o '^[0-9]\+\.[0-9]\+\.[0-9]\+') \
>  	-Dzsh_completion=disabled \
>  	-Dman=disabled \
>  	-Dpython=$(HOST_DIR)/bin/python \
> -- 
> 2.55.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2026-10-10  9:23 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-28 18:24 [Buildroot] [PATCH 1/1] package/bubblewrap: fix build failure if kernel uses localversion Fiona Klute via buildroot
2026-09-28 18:41 ` Adrian Perez de Castro
2026-09-28 18:58 ` Fiona Klute via buildroot
2026-09-28 21:20 ` Thomas Petazzoni via buildroot
2026-10-10  9:23 ` Thomas Perale via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox