From aacf9c6ad6220d0f127b0b3f2f0dc5819b866e82 Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Mon, 28 Sep 2026 20:24:54 +0200 Subject: [PATCH] package/bubblewrap: fix build failure if kernel uses localversion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 ("package/bubblewrap: security bump to version 0.12.0") Fixes: https://autobuild.buildroot.org/results/e7513e4730000e46b13bb9cf25955ebd3ec5fb71/ Signed-off-by: Fiona Klute Acked-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit a2b5b7371b4ae5460bbaf0ca8c2cfb523f865556) Signed-off-by: Raphaël Mélotte --- 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 \